<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> fb61c5a (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> f0a057d (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> f0a057d (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 3b03895 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b904d7ae (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 58c2c0f1 (Featire specs) ======= ======= >>>>>>> c033601 (Rebased) ======= >>>>>>> 4d1f738 (Manifest_cache true) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 4d1f738 (Manifest_cache true) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= ======= >>>>>>> 1772e92 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f0a057d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1622d61 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 9afd7e66 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1772e92 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 1772e92 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> e54deeb (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> f92a45b (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> f0a057d (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> 1d59aaa (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) ======= <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> 4d1f738 (Manifest_cache true) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= ======= >>>>>>> 1772e92 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f0a057d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1622d61 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f506ffd0 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1772e92 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 1772e92 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> e54deeb (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 4a2f2ad8 (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= >>>>>>> 94841b5 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 715fac2 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> 4d1f738 (Manifest_cache true) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= ======= >>>>>>> 1772e92 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f0a057d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 08e21b3 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7cf77f7b (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) Code coverage for Bookstore
loading
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> e5890c2 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= ======= ======= >>>>>>> f92a45b (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 0e864a5 (Manifest_cache true) ======= >>>>>>> fb61c5a (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 1cce66c (Manifest_cache true) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) ======= ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> 852864e (Add login registration pages) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> add330c (Manifest_cache true) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> 551f3c1 (Add login registration pages) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 15bff2e (Manifest_cache true) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> ccec311 (Add login registration pages) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> 6c71f00 (Manifest_cache true) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 8c3e531 (Add login registration pages) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 851b4c0 (Fix) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> b15044a (Manifest_cache true) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6a9fede (Add login registration pages)
Generated 2022-10-06T18:57:15+03:00
>>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) ======= ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 0b43b18 (Manifest_cache true) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs)
Generated 2022-10-06T17:07:21+03:00
>>>>>>> b832d45 (Featire specs) >>>>>>> 86d584a (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> e5890c2 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) ======= ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= ======= >>>>>>> 2722d07 (Manifest_cache true)
Generated 2022-10-06T18:57:15+03:00
>>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD
Generated 2022-10-06T18:57:15+03:00
>>>>>>> c4adab0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> b15044a (Manifest_cache true) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6a9fede (Add login registration pages)
Generated 2022-10-06T18:57:15+03:00
>>>>>>> c4adab0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages)
Generated 2022-10-06T17:07:21+03:00
>>>>>>> b832d45 (Featire specs) >>>>>>> 86d584a (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) ======= ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= ======= >>>>>>> 2722d07 (Manifest_cache true)
Generated 2022-10-06T18:57:15+03:00
>>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD
Generated 2022-10-06T18:57:15+03:00
>>>>>>> c4adab0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> b15044a (Manifest_cache true) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6a9fede (Add login registration pages)
Generated 2022-10-06T18:57:15+03:00
>>>>>>> c4adab0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages)
Generated 2022-10-06T17:07:21+03:00
>>>>>>> b832d45 (Featire specs) >>>>>>> 86d584a (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> 78717cc (Manifest_cache true) ======= >>>>>>> 98beee2 (Manifest_cache true) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 385b8df (Manifest_cache true) ======= ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bae2b7de (Add login registration pages) >>>>>>> 7bc7f9f (Manifest_cache true) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) >>>>>>> 156ffe6 (Add login registration pages) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 84d0df6 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 450f4e3 (Manifest_cache true) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= >>>>>>> 7bc7f9f (Manifest_cache true) >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 156ffe6 (Add login registration pages) >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 56fd9d41 (Add login registration pages)
Generated 2022-10-06T17:07:21+03:00
>>>>>>> b832d45 (Featire specs) >>>>>>> 379a979 (Featire specs) >>>>>>> 490b01d6 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> cacbab9 (Add login registration pages)
Generated 2022-10-06T17:07:21+03:00
>>>>>>> b832d45 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> cacbab9 (Add login registration pages)
Generated 2022-10-06T17:07:21+03:00
>>>>>>> b832d45 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> 03c0867 (Add login registration pages) >>>>>>> 8d4ec55 (Add login registration pages) >>>>>>> 73dcd461 (Add login registration pages) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 88d49ad (Add login registration pages) ======= ======= <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 8d4ec55 (Add login registration pages) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> c7a726c5 (Rebased) ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= ======= ======= >>>>>>> 03c0867 (Add login registration pages) >>>>>>> 8d4ec55 (Add login registration pages) >>>>>>> 73dcd461 (Add login registration pages)
Generated 2022-09-06T10:36:10+03:00
======= <<<<<<< HEAD
Generated 2022-09-06T11:37:55+03:00
=======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs)
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 752f0c0 (Featire specs) =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> bd8bda4 (Manifest_cache true) =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> fb61c5a (Featire specs) ======= >>>>>>> 1cce66c (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) >>>>>>> 0e864a5 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 251144b4 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 1d6a89b5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) >>>>>>> e5890c2 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 86229876 (Manifest_cache true) ======= >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1d6a89b5 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> d4235040 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= >>>>>>> fd310ed (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86229876 (Manifest_cache true) ======= ======= >>>>>>> 715fac2 (Featire specs) ======= <<<<<<< HEAD >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= ======= >>>>>>> 0b43b18 (Manifest_cache true) ======= >>>>>>> 1cce66c (Manifest_cache true) >>>>>>> d365be68 (Manifest_cache true)
Generated 2022-09-06T10:36:10+03:00
>>>>>>> aa7b40c (Manifest_cache true) =======
Generated 2022-09-06T17:39:47+03:00
>>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 6b6d1c2d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 416166f (Featire specs) >>>>>>> a2206025 (Featire specs) ======= >>>>>>> fb61c5a (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> 183b6c5 (Manifest_cache true) =======
Generated 2022-09-06T11:37:55+03:00
>>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
Generated 2022-10-06T17:07:21+03:00
>>>>>>> aca90e3 (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= >>>>>>> 84d0df6 (Manifest_cache true) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> 852864e (Add login registration pages) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 42e9c2e (Manifest_cache true) >>>>>>> 16ebb0ff (Manifest_cache true) >>>>>>> 5c33a07 (Featire specs) ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> 183b6c5 (Manifest_cache true) =======
Generated 2022-09-06T11:37:55+03:00
>>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 2fef4a0 (Add login registration pages) >>>>>>> 0561be1d (Add login registration pages) ======= ======= ======= >>>>>>> 8d4ec55 (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 551f3c1 (Add login registration pages) <<<<<<< HEAD >>>>>>> 06e5e41 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8f1baf1c (Add login registration pages) ======= ======= ======= >>>>>>> 03c0867 (Add login registration pages) >>>>>>> 8d4ec55 (Add login registration pages) >>>>>>> 73dcd461 (Add login registration pages) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) =======
Generated 2022-09-06T17:39:47+03:00
>>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> 21873de0 (Featire specs) ======= >>>>>>> 73dcd461 (Add login registration pages) ======= >>>>>>> 2612be03 (Featire specs) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD >>>>>>> 88d49ad (Add login registration pages) ======= =======
Generated 2022-10-06T17:07:21+03:00
>>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> 8d4ec55 (Add login registration pages) ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 22ee41c (Add login registration pages) =======
Generated 2022-10-06T17:07:21+03:00
>>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 22ee41c (Add login registration pages) =======
Generated 2022-10-06T17:07:21+03:00
>>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 22ee41c (Add login registration pages) ======= ======= ======= ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 22ee41c (Add login registration pages) =======
Generated 2022-10-06T17:07:21+03:00
>>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> efd6af09 (Featire specs)
Generated 2022-10-06T17:07:21+03:00
>>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs)
Generated 2022-10-06T17:07:21+03:00
======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) >>>>>>> bd30d038 (Manifest_cache true)
Generated 2022-10-06T18:57:15+03:00
>>>>>>> 59d75f9 (Featire specs) =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 78717cc (Manifest_cache true) ======= ======= >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) =======
Generated 2022-09-06T11:37:55+03:00
=======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 98beee2 (Manifest_cache true) ======= ======= >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> bd30d038 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 385b8df (Manifest_cache true) ======= ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7bc7f9f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= ======= >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 84d0df6 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= =======
Generated 2022-09-06T17:39:47+03:00
>>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 37e48018 (Featire specs) ======= ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 450f4e3 (Manifest_cache true) ======= ======= =======
Generated 2022-09-06T11:37:55+03:00
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
Generated 2022-09-06T17:39:47+03:00
>>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= =======
Generated 2022-10-06T18:33:49+03:00
>>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= =======
Generated 2022-10-06T18:57:15+03:00
>>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) >>>>>>> a304bcf (Manifest_cache true) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= =======
Generated 2022-09-06T17:39:47+03:00
>>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57a2e05 (Add login registration pages) ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) >>>>>>> 9c0d812 (Featire specs) ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= =======
Generated 2022-09-06T11:37:55+03:00
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e60833c (Add login registration pages) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= =======
Generated 2022-09-06T17:39:47+03:00
>>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
Generated 2022-10-06T18:33:49+03:00
>>>>>>> bf554f4 (Rebased) =======
Generated 2022-10-06T18:57:15+03:00
>>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= ======= =======
Generated 2022-10-06T18:33:49+03:00
>>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true)
Generated 2022-10-06T18:57:15+03:00
=======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
Generated 2022-09-06T11:37:55+03:00
=======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 304cd28a (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= =======
Generated 2022-09-06T17:39:47+03:00
>>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= ======= ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= ======= =======
Generated 2022-09-06T11:37:55+03:00
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
Generated 2022-09-06T17:39:47+03:00
>>>>>>> e1f4d17 (Add login registration pages) >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> ed8ea634 (Add login registration pages) ======= ======= ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= ======= =======
Generated 2022-09-06T11:37:55+03:00
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
Generated 2022-09-06T17:39:47+03:00
>>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD >>>>>>> 2be0d057 (Add login registration pages) ======= ======= =======
Generated 2022-10-07T13:29:03+03:00
>>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= ======= =======
Generated 2022-10-07T13:38:31+03:00
>>>>>>> 446d79a (Fix) >>>>>>> 366b257 (Fix) <<<<<<< HEAD >>>>>>> 23c4703e (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 7bc7f9f (Manifest_cache true) >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 7bc7f9f (Manifest_cache true) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> bae2b7de (Add login registration pages) ======= ======= ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 56fd9d41 (Add login registration pages) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= ======= =======
Generated 2022-09-06T17:39:47+03:00
>>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= =======
Generated 2022-10-06T18:33:49+03:00
>>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= ======= =======
Generated 2022-10-06T18:57:15+03:00
>>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) >>>>>>> a304bcf (Manifest_cache true) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= =======
Generated 2022-09-06T17:39:47+03:00
>>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57a2e05 (Add login registration pages) ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 9c0d812 (Featire specs) ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= =======
Generated 2022-09-06T11:37:55+03:00
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= =======
Generated 2022-09-06T17:39:47+03:00
>>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
Generated 2022-10-06T18:33:49+03:00
>>>>>>> bf554f4 (Rebased) =======
Generated 2022-10-06T18:57:15+03:00
>>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= ======= =======
Generated 2022-10-06T18:33:49+03:00
>>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true)
Generated 2022-10-06T18:57:15+03:00
=======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
Generated 2022-09-06T11:37:55+03:00
=======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> bd30d038 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> d4235040 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= =======
Generated 2022-09-06T17:39:47+03:00
>>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> 0561be1d (Add login registration pages) ======= ======= ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= ======= =======
Generated 2022-09-06T11:37:55+03:00
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
Generated 2022-09-06T17:39:47+03:00
>>>>>>> e1f4d17 (Add login registration pages) >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> 512d1d87 (Add login registration pages) ======= ======= ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4fac471d (Manifest_cache true) ======= ======= ======= =======
Generated 2022-09-06T11:37:55+03:00
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
Generated 2022-09-06T17:39:47+03:00
>>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD >>>>>>> 4976a174 (Add login registration pages) ======= ======= =======
Generated 2022-10-07T13:29:03+03:00
>>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= =======
Generated 2022-10-07T13:38:31+03:00
>>>>>>> 446d79a (Fix) >>>>>>> 366b257 (Fix) >>>>>>> d68e8240 (Fix) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs)
Generated 2022-10-06T17:07:21+03:00
======= ======= >>>>>>> 96aecde (Manifest_cache true)
Generated 2022-10-06T18:57:15+03:00
>>>>>>> 59d75f9 (Featire specs) =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> d0dc1f1 (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> 659083f (Featire specs) <<<<<<< HEAD ======= ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) ======= =======
Generated 2022-09-06T11:37:55+03:00
=======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3e9f99d (Featire specs) >>>>>>> 6fa625b (Manifest_cache true) ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9ec6862 (Add login registration pages) ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= =======
Generated 2022-09-06T17:39:47+03:00
>>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57a2e05 (Add login registration pages) ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= =======
Generated 2022-09-06T11:37:55+03:00
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> ccec311 (Add login registration pages) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= =======
Generated 2022-09-06T17:39:47+03:00
>>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD =======
Generated 2022-10-06T18:33:49+03:00
>>>>>>> bf554f4 (Rebased) =======
Generated 2022-10-06T18:57:15+03:00
>>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0e864a5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> cc390719 (Manifest_cache true) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> c871248 (Add login registration pages) <<<<<<< HEAD >>>>>>> e011b0df (Add login registration pages) ======= ======= ======= =======
Generated 2022-10-06T18:33:49+03:00
>>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true)
Generated 2022-10-06T18:57:15+03:00
=======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3be4d14 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1b8f36d8 (Manifest_cache true) ======= ======= ======= ======= =======
Generated 2022-09-06T11:37:55+03:00
=======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> a71befd (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8a3779d4 (Manifest_cache true) ======= ======= ======= ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 551c6ab (Manifest_cache true) <<<<<<< HEAD >>>>>>> 56531f25 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> fd310ed (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86229876 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD >>>>>>> 852864e (Add login registration pages) <<<<<<< HEAD >>>>>>> 1d11874 (Add login registration pages) <<<<<<< HEAD >>>>>>> ff4c2fe0 (Add login registration pages) ======= ======= ======= ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 42e9c2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> 16ebb0ff (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= =======
Generated 2022-09-06T17:39:47+03:00
>>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 551f3c1 (Add login registration pages) <<<<<<< HEAD >>>>>>> 06e5e41 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8f1baf1c (Add login registration pages) ======= ======= ======= ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> c0159bf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d0f5cbf (Manifest_cache true) ======= ======= ======= ======= =======
Generated 2022-09-06T11:37:55+03:00
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= ======= ======= ======= =======
Generated 2022-09-06T17:39:47+03:00
>>>>>>> e1f4d17 (Add login registration pages) >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> ccec311 (Add login registration pages) <<<<<<< HEAD >>>>>>> 385136b (Add login registration pages) <<<<<<< HEAD >>>>>>> dda81aa9 (Add login registration pages) ======= ======= ======= ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) <<<<<<< HEAD >>>>>>> ca274ec (Manifest_cache true) <<<<<<< HEAD >>>>>>> a56ba36d (Manifest_cache true) ======= ======= ======= ======= =======
Generated 2022-09-06T11:37:55+03:00
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= =======
Generated 2022-09-06T17:39:47+03:00
>>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> 8c3e531 (Add login registration pages) <<<<<<< HEAD >>>>>>> 1c33e01 (Add login registration pages) <<<<<<< HEAD >>>>>>> 40a3d25f (Add login registration pages) ======= ======= ======= =======
Generated 2022-10-07T13:29:03+03:00
>>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= =======
Generated 2022-10-07T13:38:31+03:00
>>>>>>> 446d79a (Fix) >>>>>>> 851b4c0 (Fix) <<<<<<< HEAD >>>>>>> e75c983 (Fix) <<<<<<< HEAD >>>>>>> 22d61969 (Fix) ======= ======= ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= ======= ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 03c0867 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8d4ec55 (Add login registration pages) <<<<<<< HEAD >>>>>>> 73dcd461 (Add login registration pages) ======= ======= =======
Generated 2022-10-06T17:07:21+03:00
=======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> d0dc1f1 (Featire specs) >>>>>>> a636fda (Featire specs) >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 0b43b18 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1cce66c (Manifest_cache true) <<<<<<< HEAD >>>>>>> d365be68 (Manifest_cache true) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)

All Files ( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 8887ba5b (Fix) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 0c57e4e (Fix) ======= <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 557c1b8 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 0ed7f7c (Featire specs) ======= ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 0e864a5 (Manifest_cache true) ======= >>>>>>> fb61c5a (Featire specs) ======= >>>>>>> 8d4ec55 (Add login registration pages) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 1cce66c (Manifest_cache true) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 715fac2 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> b15044a (Manifest_cache true) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6a9fede (Add login registration pages) 95.79% >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> 2ee03d3 (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) ======= ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 0b43b18 (Manifest_cache true) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) 95.71% >>>>>>> b832d45 (Featire specs) >>>>>>> 86d584a (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d4235040 (Manifest_cache true) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> bd30d038 (Manifest_cache true) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> 824ea7c9 (Manifest_cache true) ======= >>>>>>> d34a0770 (Manifest_cache true) ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 1d6a89b5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> 78717cc (Manifest_cache true) ======= >>>>>>> 98beee2 (Manifest_cache true) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 385b8df (Manifest_cache true) ======= ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bae2b7de (Add login registration pages) >>>>>>> 7bc7f9f (Manifest_cache true) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) >>>>>>> 156ffe6 (Add login registration pages) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 84d0df6 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 450f4e3 (Manifest_cache true) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= >>>>>>> 7bc7f9f (Manifest_cache true) >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 156ffe6 (Add login registration pages) >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 56fd9d41 (Add login registration pages) 95.71% >>>>>>> b832d45 (Featire specs) >>>>>>> 379a979 (Featire specs) >>>>>>> 490b01d6 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 366b257 (Fix) ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 6a9fede (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) 95.79% >>>>>>> f182ac7 (Add login registration pages) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) 95.71% >>>>>>> b832d45 (Featire specs) >>>>>>> 86d584a (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 366b257 (Fix) ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 6a9fede (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) 95.79% >>>>>>> f182ac7 (Add login registration pages) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) 95.71% >>>>>>> b832d45 (Featire specs) >>>>>>> 86d584a (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> cacbab9 (Add login registration pages) 95.71% >>>>>>> b832d45 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD >>>>>>> 88d49ad (Add login registration pages) ======= ======= <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> 03c0867 (Add login registration pages) >>>>>>> 8d4ec55 (Add login registration pages) >>>>>>> 73dcd461 (Add login registration pages) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> c7a726c5 (Rebased) ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> 73dcd461 (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> 8d4ec55 (Add login registration pages) ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= ======= ======= >>>>>>> 03c0867 (Add login registration pages) >>>>>>> 8d4ec55 (Add login registration pages) >>>>>>> 73dcd461 (Add login registration pages) 90.68% ======= <<<<<<< HEAD 99.2% ======= 90.68% >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) 99.11% >>>>>>> 752f0c0 (Featire specs) ======= 90.68% >>>>>>> bd8bda4 (Manifest_cache true) ======= 99.11% >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 251144b4 (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 1d6a89b5 (Manifest_cache true) ======= >>>>>>> 0e864a5 (Manifest_cache true) ======= >>>>>>> fb61c5a (Featire specs) ======= >>>>>>> 1cce66c (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1d6a89b5 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 0e864a5 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> cc390719 (Manifest_cache true) ======= >>>>>>> 715fac2 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> 0b43b18 (Manifest_cache true) ======= >>>>>>> d365be68 (Manifest_cache true) 90.68% >>>>>>> aa7b40c (Manifest_cache true) ======= 99.25% >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 6b6d1c2d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 416166f (Featire specs) >>>>>>> a2206025 (Featire specs) ======= >>>>>>> fb61c5a (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) 99.11% >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) ======= 90.68% >>>>>>> 183b6c5 (Manifest_cache true) ======= 99.2% >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 95.71% >>>>>>> aca90e3 (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= >>>>>>> 84d0df6 (Manifest_cache true) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> 852864e (Add login registration pages) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= 99.11% >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 42e9c2e (Manifest_cache true) >>>>>>> 16ebb0ff (Manifest_cache true) >>>>>>> 5c33a07 (Featire specs) ======= ======= 90.68% >>>>>>> 183b6c5 (Manifest_cache true) ======= 99.2% >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 2fef4a0 (Add login registration pages) >>>>>>> 0561be1d (Add login registration pages) ======= ======= ======= >>>>>>> 8d4ec55 (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 551f3c1 (Add login registration pages) <<<<<<< HEAD >>>>>>> 06e5e41 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8f1baf1c (Add login registration pages) ======= ======= ======= >>>>>>> 03c0867 (Add login registration pages) >>>>>>> 8d4ec55 (Add login registration pages) >>>>>>> 73dcd461 (Add login registration pages) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= 99.25% >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> 21873de0 (Featire specs) ======= >>>>>>> 73dcd461 (Add login registration pages) ======= >>>>>>> 2612be03 (Featire specs) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD >>>>>>> 88d49ad (Add login registration pages) ======= ======= 95.71% >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> 8d4ec55 (Add login registration pages) ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 22ee41c (Add login registration pages) ======= 95.71% >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 659083f (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 22ee41c (Add login registration pages) ======= 95.71% >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) >>>>>>> 22ee41c (Add login registration pages) ======= 95.71% >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) <<<<<<< HEAD ======= >>>>>>> 0ed7f7c (Featire specs) >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> b3f2049 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> aa4361fd (Featire specs) 95.71% ======= 99.11% >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= ======= 90.68% >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) >>>>>>> 78717cc (Manifest_cache true) ======= ======= >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= 99.2% ======= 90.68% >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) >>>>>>> 98beee2 (Manifest_cache true) ======= ======= >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= 99.11% >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= ======= ======= 90.68% >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 385b8df (Manifest_cache true) ======= ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= ======= 90.68% >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7bc7f9f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= ======= >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= ======= ======= 99.11% >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= ======= 90.68% >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 84d0df6 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= ======= 99.25% >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 37e48018 (Featire specs) ======= ======= ======= 99.11% >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= ======= 90.68% >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 450f4e3 (Manifest_cache true) ======= ======= ======= 99.2% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= 99.25% >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= ======= 69.46% >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= ======= 95.79% >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= 90.68% >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= ======= 90.68% >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= ======= 99.11% >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 90.68% >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= 99.25% >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57a2e05 (Add login registration pages) ======= ======= 99.11% >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) >>>>>>> 9c0d812 (Featire specs) ======= ======= 90.68% >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= ======= 99.2% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e60833c (Add login registration pages) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= ======= 99.25% >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= 69.46% >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD 95.79% <<<<<<< HEAD >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 99.11% >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) 95.79% ======= 99.11% >>>>>>> d0dc1f1 (Featire specs) ======= 90.68% >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 99.2% ======= 90.68% >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 99.11% >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 90.68% >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 99.11% >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 90.68% >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 304cd28a (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= ======= 99.11% >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) ======= ======= 90.68% >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= ======= 99.25% >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= ======= ======= ======= 99.11% >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= ======= 90.68% >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= ======= ======= 99.2% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= 99.25% >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> ed8ea634 (Add login registration pages) ======= ======= ======= ======= 99.11% >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= ======= 90.68% >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= ======= ======= 99.2% >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= 99.25% >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD >>>>>>> 2be0d057 (Add login registration pages) ======= ======= ======= 95.74% >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= ======= ======= 95.44% >>>>>>> 446d79a (Fix) >>>>>>> 366b257 (Fix) <<<<<<< HEAD >>>>>>> 23c4703e (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 7bc7f9f (Manifest_cache true) >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 7bc7f9f (Manifest_cache true) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> bae2b7de (Add login registration pages) ======= ======= ======= ======= 99.11% >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 56fd9d41 (Add login registration pages) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= ======= ======= 99.25% >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= ======= 69.46% >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= ======= ======= 95.79% >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= 90.68% >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= ======= 90.68% >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= ======= 99.11% >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 90.68% >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= 99.25% >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57a2e05 (Add login registration pages) ======= ======= 99.11% >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 9c0d812 (Featire specs) ======= ======= 90.68% >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= ======= 99.2% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= ======= 99.25% >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= 69.46% >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD 95.79% <<<<<<< HEAD >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 99.11% >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) 95.79% ======= 99.11% >>>>>>> d0dc1f1 (Featire specs) ======= 90.68% >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 99.2% ======= 90.68% >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 99.11% >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 90.68% >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> bd30d038 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 99.11% >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 90.68% >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> d4235040 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= ======= 99.11% >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) ======= ======= 90.68% >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= ======= 99.25% >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> 0561be1d (Add login registration pages) ======= ======= ======= ======= 99.11% >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= ======= 90.68% >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= ======= ======= 99.2% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= 99.25% >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> 512d1d87 (Add login registration pages) ======= ======= ======= ======= 99.11% >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= ======= 90.68% >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4fac471d (Manifest_cache true) ======= ======= ======= ======= 99.2% >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= 99.25% >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD >>>>>>> 4976a174 (Add login registration pages) ======= ======= ======= 95.74% >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= ======= 95.44% >>>>>>> 446d79a (Fix) >>>>>>> 366b257 (Fix) >>>>>>> d68e8240 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= ======= ======= 90.68% >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= ======= 90.68% >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9ec6862 (Add login registration pages) ======= ======= 99.11% >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= 90.68% >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= 99.25% >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57a2e05 (Add login registration pages) ======= ======= 99.11% >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) ======= ======= 90.68% >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= ======= 99.2% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> ccec311 (Add login registration pages) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= ======= 99.25% >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49e8a6c (Rebased) ======= 69.46% >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= <<<<<<< HEAD 95.79% <<<<<<< HEAD >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0e864a5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> cc390719 (Manifest_cache true) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> c871248 (Add login registration pages) <<<<<<< HEAD >>>>>>> e011b0df (Add login registration pages) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= ======= ======= 99.11% >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) 95.79% ======= 99.11% >>>>>>> d0dc1f1 (Featire specs) ======= 90.68% >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3be4d14 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1b8f36d8 (Manifest_cache true) ======= ======= ======= ======= ======= 99.2% ======= 90.68% >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> a71befd (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8a3779d4 (Manifest_cache true) ======= ======= ======= ======= ======= 99.11% >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= ======= ======= 90.68% >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 551c6ab (Manifest_cache true) <<<<<<< HEAD >>>>>>> 56531f25 (Manifest_cache true) ======= ======= ======= ======= ======= 99.11% >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= ======= 90.68% >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> fd310ed (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86229876 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD >>>>>>> 852864e (Add login registration pages) <<<<<<< HEAD >>>>>>> 1d11874 (Add login registration pages) <<<<<<< HEAD >>>>>>> ff4c2fe0 (Add login registration pages) ======= ======= ======= ======= ======= 99.11% >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= ======= 90.68% >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 42e9c2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> 16ebb0ff (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= ======= 99.25% >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 551f3c1 (Add login registration pages) <<<<<<< HEAD >>>>>>> 06e5e41 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8f1baf1c (Add login registration pages) ======= ======= ======= ======= ======= 99.11% >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= ======= 90.68% >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> c0159bf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d0f5cbf (Manifest_cache true) ======= ======= ======= ======= ======= 99.2% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= ======= ======= ======= ======= 99.25% >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> ccec311 (Add login registration pages) <<<<<<< HEAD >>>>>>> 385136b (Add login registration pages) <<<<<<< HEAD >>>>>>> dda81aa9 (Add login registration pages) ======= ======= ======= ======= ======= 99.11% >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= ======= ======= 90.68% >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) <<<<<<< HEAD >>>>>>> ca274ec (Manifest_cache true) <<<<<<< HEAD >>>>>>> a56ba36d (Manifest_cache true) ======= ======= ======= ======= ======= 99.2% >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= ======= 99.25% >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> 8c3e531 (Add login registration pages) <<<<<<< HEAD >>>>>>> 1c33e01 (Add login registration pages) <<<<<<< HEAD >>>>>>> 40a3d25f (Add login registration pages) ======= ======= ======= ======= 95.74% >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= ======= 95.44% >>>>>>> 446d79a (Fix) >>>>>>> 851b4c0 (Fix) <<<<<<< HEAD >>>>>>> e75c983 (Fix) <<<<<<< HEAD >>>>>>> 22d61969 (Fix) ======= ======= ======= ======= 99.11% >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= ======= ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 03c0867 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8d4ec55 (Add login registration pages) <<<<<<< HEAD >>>>>>> 73dcd461 (Add login registration pages) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 0b43b18 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1cce66c (Manifest_cache true) <<<<<<< HEAD >>>>>>> d365be68 (Manifest_cache true) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) covered at <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 8887ba5b (Fix) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 0c57e4e (Fix) ======= <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 557c1b8 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 0ed7f7c (Featire specs) ======= ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 0e864a5 (Manifest_cache true) ======= >>>>>>> fb61c5a (Featire specs) ======= >>>>>>> 8d4ec55 (Add login registration pages) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 1cce66c (Manifest_cache true) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 715fac2 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> b15044a (Manifest_cache true) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6a9fede (Add login registration pages) 3.03 >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 2ee03d3 (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) ======= ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 0b43b18 (Manifest_cache true) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) 2.92 >>>>>>> b832d45 (Featire specs) >>>>>>> 86d584a (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD 3.03 >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> d4235040 (Manifest_cache true) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> bd30d038 (Manifest_cache true) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> 824ea7c9 (Manifest_cache true) ======= >>>>>>> d34a0770 (Manifest_cache true) ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD 3.03 >>>>>>> 2722d07 (Manifest_cache true) ======= ======= >>>>>>> 1d6a89b5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> 78717cc (Manifest_cache true) ======= >>>>>>> 98beee2 (Manifest_cache true) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 385b8df (Manifest_cache true) ======= ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bae2b7de (Add login registration pages) >>>>>>> 7bc7f9f (Manifest_cache true) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) >>>>>>> 156ffe6 (Add login registration pages) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 84d0df6 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 450f4e3 (Manifest_cache true) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= >>>>>>> 7bc7f9f (Manifest_cache true) >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 156ffe6 (Add login registration pages) >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 56fd9d41 (Add login registration pages) 2.92 >>>>>>> b832d45 (Featire specs) >>>>>>> 379a979 (Featire specs) >>>>>>> 490b01d6 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 366b257 (Fix) ======= ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 6a9fede (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) 3.03 >>>>>>> 2722d07 (Manifest_cache true) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) 2.92 >>>>>>> b832d45 (Featire specs) >>>>>>> 86d584a (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 366b257 (Fix) ======= ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 6a9fede (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) 3.03 >>>>>>> 2722d07 (Manifest_cache true) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) 2.92 >>>>>>> b832d45 (Featire specs) >>>>>>> 86d584a (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> cacbab9 (Add login registration pages) 2.92 >>>>>>> b832d45 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD >>>>>>> 88d49ad (Add login registration pages) ======= ======= <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> 03c0867 (Add login registration pages) >>>>>>> 8d4ec55 (Add login registration pages) >>>>>>> 73dcd461 (Add login registration pages) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> c7a726c5 (Rebased) ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> 73dcd461 (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> 8d4ec55 (Add login registration pages) ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= ======= ======= >>>>>>> 03c0867 (Add login registration pages) >>>>>>> 8d4ec55 (Add login registration pages) >>>>>>> 73dcd461 (Add login registration pages) 1.04 ======= <<<<<<< HEAD 4.05 ======= 1.04 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) 3.92 >>>>>>> 752f0c0 (Featire specs) ======= 1.04 >>>>>>> bd8bda4 (Manifest_cache true) ======= 3.92 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> 251144b4 (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> 1d6a89b5 (Manifest_cache true) ======= >>>>>>> fb61c5a (Featire specs) ======= <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> 1cce66c (Manifest_cache true) ======= >>>>>>> d365be68 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) >>>>>>> e5890c2 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 1d6a89b5 (Manifest_cache true) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> d4235040 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) >>>>>>> 0e864a5 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> cc390719 (Manifest_cache true) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 86229876 (Manifest_cache true) ======= >>>>>>> 715fac2 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> 0b43b18 (Manifest_cache true) ======= >>>>>>> d365be68 (Manifest_cache true) 1.04 >>>>>>> aa7b40c (Manifest_cache true) ======= 3.9 >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 6b6d1c2d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 416166f (Featire specs) >>>>>>> a2206025 (Featire specs) ======= >>>>>>> fb61c5a (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) 3.92 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) ======= 1.04 >>>>>>> 183b6c5 (Manifest_cache true) ======= 4.05 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 2.92 >>>>>>> aca90e3 (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= >>>>>>> 84d0df6 (Manifest_cache true) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> 852864e (Add login registration pages) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= 3.92 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 42e9c2e (Manifest_cache true) >>>>>>> 16ebb0ff (Manifest_cache true) >>>>>>> 5c33a07 (Featire specs) ======= ======= 1.04 >>>>>>> 183b6c5 (Manifest_cache true) ======= 4.05 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 2fef4a0 (Add login registration pages) >>>>>>> 0561be1d (Add login registration pages) ======= ======= ======= >>>>>>> 8d4ec55 (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 551f3c1 (Add login registration pages) <<<<<<< HEAD >>>>>>> 06e5e41 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8f1baf1c (Add login registration pages) ======= ======= ======= >>>>>>> 03c0867 (Add login registration pages) >>>>>>> 8d4ec55 (Add login registration pages) >>>>>>> 73dcd461 (Add login registration pages) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= 3.9 >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> 21873de0 (Featire specs) ======= >>>>>>> 73dcd461 (Add login registration pages) ======= >>>>>>> 2612be03 (Featire specs) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD >>>>>>> 88d49ad (Add login registration pages) ======= ======= 2.92 >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> 8d4ec55 (Add login registration pages) ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 22ee41c (Add login registration pages) ======= 2.92 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 659083f (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 22ee41c (Add login registration pages) ======= 2.92 >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) >>>>>>> 22ee41c (Add login registration pages) ======= 2.92 >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) <<<<<<< HEAD ======= >>>>>>> 0ed7f7c (Featire specs) >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> b3f2049 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> aa4361fd (Featire specs) 2.92 ======= 3.92 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= ======= 1.04 >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) >>>>>>> 78717cc (Manifest_cache true) ======= ======= >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= 4.05 ======= 1.04 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) >>>>>>> 98beee2 (Manifest_cache true) ======= ======= >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= 3.92 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= ======= ======= 1.04 >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 385b8df (Manifest_cache true) ======= ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= ======= 1.04 >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7bc7f9f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= ======= >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= ======= ======= 3.92 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= ======= 1.04 >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 84d0df6 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= ======= 3.9 >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 37e48018 (Featire specs) ======= ======= ======= 3.92 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= ======= 1.04 >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 450f4e3 (Manifest_cache true) ======= ======= ======= 4.05 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= 3.9 >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= ======= 0.7 >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= ======= 3.03 >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= 1.04 >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= ======= 1.04 >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= ======= 3.92 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 1.04 >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= 3.9 >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57a2e05 (Add login registration pages) ======= ======= 3.92 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) >>>>>>> 9c0d812 (Featire specs) ======= ======= 1.04 >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= ======= 4.05 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e60833c (Add login registration pages) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= ======= 3.9 >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= 0.7 >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD 3.03 <<<<<<< HEAD >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 3.92 >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) 3.03 ======= 3.92 >>>>>>> d0dc1f1 (Featire specs) ======= 1.04 >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 4.05 ======= 1.04 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 3.92 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 1.04 >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 3.92 >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 1.04 >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 304cd28a (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= ======= 3.92 >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) ======= ======= 1.04 >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= ======= 3.9 >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= ======= ======= ======= 3.92 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= ======= 1.04 >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= ======= ======= 4.05 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= 3.9 >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> ed8ea634 (Add login registration pages) ======= ======= ======= ======= 3.92 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= ======= 1.04 >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= ======= ======= 4.05 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= 3.9 >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD >>>>>>> 2be0d057 (Add login registration pages) ======= ======= ======= 3.36 >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= ======= ======= 3.34 >>>>>>> 446d79a (Fix) >>>>>>> 366b257 (Fix) <<<<<<< HEAD >>>>>>> 23c4703e (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 7bc7f9f (Manifest_cache true) >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 7bc7f9f (Manifest_cache true) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> bae2b7de (Add login registration pages) ======= ======= ======= ======= 3.92 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 56fd9d41 (Add login registration pages) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= ======= ======= 3.9 >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= ======= 0.7 >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= ======= ======= 3.03 >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= 1.04 >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= ======= 1.04 >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= ======= 3.92 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 1.04 >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= 3.9 >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57a2e05 (Add login registration pages) ======= ======= 3.92 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 9c0d812 (Featire specs) ======= ======= 1.04 >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= ======= 4.05 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= ======= 3.9 >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= 0.7 >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD 3.03 <<<<<<< HEAD >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 3.92 >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) 3.03 ======= 3.92 >>>>>>> d0dc1f1 (Featire specs) ======= 1.04 >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 4.05 ======= 1.04 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 3.92 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 1.04 >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> bd30d038 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 3.92 >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 1.04 >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> d4235040 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= ======= 3.92 >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) ======= ======= 1.04 >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= ======= 3.9 >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> 0561be1d (Add login registration pages) ======= ======= ======= ======= 3.92 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= ======= 1.04 >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= ======= ======= 4.05 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= 3.9 >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> 512d1d87 (Add login registration pages) ======= ======= ======= ======= 3.92 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= ======= 1.04 >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4fac471d (Manifest_cache true) ======= ======= ======= ======= 4.05 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= 3.9 >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD >>>>>>> 4976a174 (Add login registration pages) ======= ======= ======= 3.36 >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= ======= 3.34 >>>>>>> 446d79a (Fix) >>>>>>> 366b257 (Fix) >>>>>>> d68e8240 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= ======= ======= 1.04 >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= ======= 1.04 >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9ec6862 (Add login registration pages) ======= ======= 3.92 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= 1.04 >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= 3.9 >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57a2e05 (Add login registration pages) ======= ======= 3.92 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) ======= ======= 1.04 >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= ======= 4.05 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> ccec311 (Add login registration pages) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= ======= 3.9 >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49e8a6c (Rebased) ======= 0.7 >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= <<<<<<< HEAD 3.03 <<<<<<< HEAD >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0e864a5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> cc390719 (Manifest_cache true) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> c871248 (Add login registration pages) <<<<<<< HEAD >>>>>>> e011b0df (Add login registration pages) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= ======= ======= 3.92 >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) 3.03 ======= 3.92 >>>>>>> d0dc1f1 (Featire specs) ======= 1.04 >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3be4d14 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1b8f36d8 (Manifest_cache true) ======= ======= ======= ======= ======= 4.05 ======= 1.04 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> a71befd (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8a3779d4 (Manifest_cache true) ======= ======= ======= ======= ======= 3.92 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= ======= ======= 1.04 >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 551c6ab (Manifest_cache true) <<<<<<< HEAD >>>>>>> 56531f25 (Manifest_cache true) ======= ======= ======= ======= ======= 3.92 >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= ======= 1.04 >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> fd310ed (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86229876 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD >>>>>>> 852864e (Add login registration pages) <<<<<<< HEAD >>>>>>> 1d11874 (Add login registration pages) <<<<<<< HEAD >>>>>>> ff4c2fe0 (Add login registration pages) ======= ======= ======= ======= ======= 3.92 >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= ======= 1.04 >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 42e9c2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> 16ebb0ff (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= ======= 3.9 >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 551f3c1 (Add login registration pages) <<<<<<< HEAD >>>>>>> 06e5e41 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8f1baf1c (Add login registration pages) ======= ======= ======= ======= ======= 3.92 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= ======= 1.04 >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> c0159bf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d0f5cbf (Manifest_cache true) ======= ======= ======= ======= ======= 4.05 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= ======= ======= ======= ======= 3.9 >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> ccec311 (Add login registration pages) <<<<<<< HEAD >>>>>>> 385136b (Add login registration pages) <<<<<<< HEAD >>>>>>> dda81aa9 (Add login registration pages) ======= ======= ======= ======= ======= 3.92 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= ======= ======= 1.04 >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) <<<<<<< HEAD >>>>>>> ca274ec (Manifest_cache true) <<<<<<< HEAD >>>>>>> a56ba36d (Manifest_cache true) ======= ======= ======= ======= ======= 4.05 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= ======= 3.9 >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> 8c3e531 (Add login registration pages) <<<<<<< HEAD >>>>>>> 1c33e01 (Add login registration pages) <<<<<<< HEAD >>>>>>> 40a3d25f (Add login registration pages) ======= ======= ======= ======= 3.36 >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= ======= 3.34 >>>>>>> 446d79a (Fix) >>>>>>> 851b4c0 (Fix) <<<<<<< HEAD >>>>>>> e75c983 (Fix) <<<<<<< HEAD >>>>>>> 22d61969 (Fix) ======= ======= ======= ======= 3.92 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= ======= ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 03c0867 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8d4ec55 (Add login registration pages) <<<<<<< HEAD >>>>>>> 73dcd461 (Add login registration pages) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 0b43b18 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1cce66c (Manifest_cache true) <<<<<<< HEAD >>>>>>> d365be68 (Manifest_cache true) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) hits/line )

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> 78717cc (Manifest_cache true) ======= >>>>>>> 98beee2 (Manifest_cache true) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 385b8df (Manifest_cache true) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> 7bc7f9f (Manifest_cache true) ======= >>>>>>> 156ffe6 (Add login registration pages) ======= >>>>>>> adc21e0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= >>>>>>> 156ffe6 (Add login registration pages) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= >>>>>>> adc21e0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= >>>>>>> 84d0df6 (Manifest_cache true) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 793a6ed (Add login registration pages) ======= >>>>>>> 4d90e3d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 450f4e3 (Manifest_cache true) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= >>>>>>> c5efe8e (Add login registration pages) ======= >>>>>>> aa3618b (Rebased) ======= >>>>>>> 160fb15 (Fix) ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> f92a45b (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> fb61c5a (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 1cce66c (Manifest_cache true) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 0b43b18 (Manifest_cache true) ======= >>>>>>> 2ee03d3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5506bd0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= >>>>>>> c5efe8e (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= >>>>>>> aa3618b (Rebased) ======= <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 160fb15 (Fix) ======= <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= >>>>>>> 29e1af94 (Add login registration pages) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 0341d6de (Manifest_cache true) ======= >>>>>>> 21793167 (Manifest_cache true) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> d245196f (Manifest_cache true) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 304cd28a (Manifest_cache true) ======= >>>>>>> 7afa007b (Manifest_cache true) ======= >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2be0d057 (Add login registration pages) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b719333 (Manifest_cache true) ======= >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 31507b8 (Add login registration pages) >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> bc6bc8d2 (Rebased) ======= ======= >>>>>>> 557c1b8 (Fix) >>>>>>> 8288136d (Fix) ======= >>>>>>> d52f9efe (Featire specs) ======= ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> d34a0770 (Manifest_cache true) ======= >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= >>>>>>> 77d62af (Featire specs) >>>>>>> ae07231a (Featire specs) ======= >>>>>>> bd30d038 (Manifest_cache true) ======= ======= >>>>>>> bf05825 (Featire specs) >>>>>>> c12b71de (Featire specs) ======= >>>>>>> d4235040 (Manifest_cache true) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c871248 (Add login registration pages) <<<<<<< HEAD >>>>>>> e011b0df (Add login registration pages) ======= ======= >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= >>>>>>> 3be4d14 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1b8f36d8 (Manifest_cache true) ======= ======= >>>>>>> a71befd (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8a3779d4 (Manifest_cache true) ======= ======= >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= >>>>>>> 551c6ab (Manifest_cache true) <<<<<<< HEAD >>>>>>> 56531f25 (Manifest_cache true) ======= ======= >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= >>>>>>> fd310ed (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86229876 (Manifest_cache true) ======= ======= >>>>>>> 1d11874 (Add login registration pages) <<<<<<< HEAD >>>>>>> ff4c2fe0 (Add login registration pages) ======= ======= >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= >>>>>>> 42e9c2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> 16ebb0ff (Manifest_cache true) ======= ======= >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 06e5e41 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8f1baf1c (Add login registration pages) ======= ======= >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= >>>>>>> c0159bf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d0f5cbf (Manifest_cache true) ======= ======= >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 385136b (Add login registration pages) <<<<<<< HEAD >>>>>>> dda81aa9 (Add login registration pages) ======= ======= >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= >>>>>>> ca274ec (Manifest_cache true) <<<<<<< HEAD >>>>>>> a56ba36d (Manifest_cache true) ======= ======= >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 1c33e01 (Add login registration pages) <<<<<<< HEAD >>>>>>> 40a3d25f (Add login registration pages) ======= ======= >>>>>>> 9e081dc (Fix) >>>>>>> 1049b80c (Fix) >>>>>>> b28889f (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> 852864e (Add login registration pages) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> add330c (Manifest_cache true) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> 551f3c1 (Add login registration pages) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 15bff2e (Manifest_cache true) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> ccec311 (Add login registration pages) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> 6c71f00 (Manifest_cache true) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 8c3e531 (Add login registration pages) ======= >>>>>>> 1d59aaa (Fix) ======= <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= <<<<<<< HEAD >>>>>>> e18eb87 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 659083f (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 0e864a5 (Manifest_cache true) ======= >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= ======= ======= >>>>>>> b28889f (Fix) ======= <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 03c0867 (Add login registration pages) >>>>>>> 8d4ec55 (Add login registration pages) >>>>>>> 73dcd461 (Add login registration pages) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 88d49ad (Add login registration pages) ======= ======= <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> f92a45b (Featire specs) ======= >>>>>>> 8d4ec55 (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> c7a726c5 (Rebased) ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= ======= ======= >>>>>>> 03c0867 (Add login registration pages) >>>>>>> 8d4ec55 (Add login registration pages) >>>>>>> 73dcd461 (Add login registration pages) 34 files in total. ======= <<<<<<< HEAD 47 files in total. >>>>>>> 7375d4b (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) >>>>>>> 84809242 (Featire specs) 92 files in total. >>>>>>> aca90e3 (Rebased) <<<<<<< HEAD ======= ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) 92 files in total. >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> b9cc4e9 (Manifest_cache true) 92 files in total. >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 37e48018 (Featire specs) 92 files in total. ======= 47 files in total. >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> 98beee2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= 92 files in total. >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 6a9fede (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0ed7f7c (Featire specs) >>>>>>> ecb02dbf (Featire specs) 92 files in total. ======= 47 files in total. >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> ecb02dbf (Featire specs) >>>>>>> 98beee2 (Manifest_cache true) ======= 92 files in total. >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> 1cce66c (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c871248 (Add login registration pages) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 51bc18c (Featire specs) >>>>>>> 7d58507 (Add login registration pages) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 551c6ab (Manifest_cache true) >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 973ba8c (Featire specs) >>>>>>> d782a28 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd310ed (Manifest_cache true) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 6a9fede (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> 0e864a5 (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= >>>>>>> 7d58507 (Add login registration pages) >>>>>>> c871248 (Add login registration pages) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) >>>>>>> 551c6ab (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> fd310ed (Manifest_cache true) ======= ======= ======= >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD >>>>>>> 852864e (Add login registration pages) <<<<<<< HEAD >>>>>>> 1d11874 (Add login registration pages) ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) ======= ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 42e9c2e (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 551f3c1 (Add login registration pages) <<<<<<< HEAD >>>>>>> 06e5e41 (Add login registration pages) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> c0159bf (Manifest_cache true) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> ccec311 (Add login registration pages) <<<<<<< HEAD >>>>>>> 385136b (Add login registration pages) ======= ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) ======= ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) <<<<<<< HEAD >>>>>>> ca274ec (Manifest_cache true) ======= ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 6a9fede (Add login registration pages) >>>>>>> 8c3e531 (Add login registration pages) <<<<<<< HEAD >>>>>>> 1c33e01 (Add login registration pages) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) ======= ======= >>>>>>> 0b43b18 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1cce66c (Manifest_cache true) ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) 92 files in total. ======= 47 files in total. >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= 92 files in total. >>>>>>> c033601 (Rebased) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> b3f2049 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) >>>>>>> ecb02dbf (Featire specs)
1118 relevant lines, 1070 lines covered and 48 lines missed. ( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) 90.68% ======= 99.2% ======= 34 files in total. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= 47 files in total. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= ======= 52 files in total. >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 88d49ad (Add login registration pages) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> fd3f47ab (Featire specs) 47 files in total. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 52 files in total. >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs)
400 relevant lines, 397 lines covered and ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 84809242 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) 47 files in total. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 52 files in total. >>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) 377 relevant lines, 374 lines covered and <<<<<<< HEAD 3 lines missed. ( <<<<<<< HEAD ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= 400 relevant lines, 397 lines covered and >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= 400 relevant lines, 397 lines covered and >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 7375d4b (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) 47 files in total. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 52 files in total. >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) 377 relevant lines, 374 lines covered and >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= 400 relevant lines, 397 lines covered and <<<<<<< HEAD >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= 400 relevant lines, 397 lines covered and >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 7375d4b (Manifest_cache true) ======= >>>>>>> 6da9530 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= 47 files in total. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 52 files in total. >>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD <<<<<<< HEAD 377 relevant lines, 374 lines covered and >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= 400 relevant lines, 397 lines covered and <<<<<<< HEAD >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> 0561be1d (Add login registration pages) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= 400 relevant lines, 397 lines covered and >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> 7375d4b (Manifest_cache true) ======= 47 files in total. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 52 files in total. >>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD 377 relevant lines, 374 lines covered and >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= 400 relevant lines, 397 lines covered and >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 7375d4b (Manifest_cache true) ======= 47 files in total. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 52 files in total. >>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD 377 relevant lines, 374 lines covered and >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= 400 relevant lines, 397 lines covered and >>>>>>> 57da3ff (Add login registration pages) >>>>>>> 551f3c1 (Add login registration pages) >>>>>>> 06e5e41 (Add login registration pages) >>>>>>> 8f1baf1c (Add login registration pages) 3 lines missed. ( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> fd3f47ab (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 06e5e41 (Add login registration pages) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> 0561be1d (Add login registration pages) ======= ======= >>>>>>> 8f1baf1c (Add login registration pages) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> 06e5e41 (Add login registration pages) >>>>>>> 8f1baf1c (Add login registration pages) 99.11% >>>>>>> d0dc1f1 (Featire specs) ======= 90.68% >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) >>>>>>> 495b04d (Fix book_spec decrease quantity and price) >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) 90.68% >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD 41 files in total. ======= 34 files in total. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= 47 files in total. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= 52 files in total. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 31507b8 (Add login registration pages)
400 relevant lines, 397 lines covered and ======= <<<<<<< HEAD >>>>>>> 7375d4b (Manifest_cache true) ======= 47 files in total. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> b8c2784f (Fix book_spec decrease quantity and price)
377 relevant lines, 374 lines covered and <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= ======= ======= 52 files in total. >>>>>>> e1f4d17 (Add login registration pages)
400 relevant lines, 397 lines covered and >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> dda81aa9 (Add login registration pages) ======= =======
400 relevant lines, 397 lines covered and >>>>>>> 03c0867 (Add login registration pages) >>>>>>> 73dcd461 (Add login registration pages) 3 lines missed. ( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 73dcd461 (Add login registration pages) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> a624084 (Add login registration pages) >>>>>>> dda81aa9 (Add login registration pages) 99.11% >>>>>>> 752f0c0 (Featire specs) ======= ======= ======= <<<<<<< HEAD 99.11% >>>>>>> d0dc1f1 (Featire specs) ======= 90.68% >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) 90.68% <<<<<<< HEAD ======= ======= 90.68% >>>>>>> 824bb2b (Featire specs) >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= 41 files in total. ======= 34 files in total. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= >>>>>>> 0f8241bb (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= 47 files in total. <<<<<<< HEAD >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= 52 files in total. >>>>>>> e1f4d17 (Add login registration pages)
400 relevant lines, 397 lines covered and =======
377 relevant lines, 374 lines covered and >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= ======= 52 files in total. >>>>>>> e1f4d17 (Add login registration pages)
400 relevant lines, 397 lines covered and >>>>>>> a624084 (Add login registration pages) 3 lines missed. ( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= 47 files in total. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= 47 files in total. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= 52 files in total. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 31507b8 (Add login registration pages) >>>>>>> a8b17c32 (Add login registration pages)
400 relevant lines, 397 lines covered and 3 lines missed. ( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD 99.11% >>>>>>> 752f0c0 (Featire specs) >>>>>>> a8b17c32 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= ======= 90.68% >>>>>>> 824bb2b (Featire specs) >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> a624084 (Add login registration pages) >>>>>>> e60833c (Add login registration pages) ======= 34 files in total. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) 47 files in total. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= 52 files in total. >>>>>>> e1f4d17 (Add login registration pages)
400 relevant lines, 397 lines covered and =======
377 relevant lines, 374 lines covered and >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= ======= 52 files in total. >>>>>>> e1f4d17 (Add login registration pages)
400 relevant lines, 397 lines covered and >>>>>>> a624084 (Add login registration pages) 3 lines missed. ( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> 512d1d87 (Add login registration pages) ======= ======= ======= 47 files in total. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= 52 files in total. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> c871248 (Add login registration pages) >>>>>>> e011b0df (Add login registration pages)
400 relevant lines, 397 lines covered and 3 lines missed. ( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> a624084 (Add login registration pages) >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> 512d1d87 (Add login registration pages) ======= ======= ======= ======= 47 files in total. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) ======= 52 files in total. >>>>>>> 26b462d (Add login registration pages) >>>>>>> 1c33e01 (Add login registration pages)
400 relevant lines, 397 lines covered and 3 lines missed. ( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> c871248 (Add login registration pages) >>>>>>> e011b0df (Add login registration pages) 99.11% >>>>>>> 752f0c0 (Featire specs) ======= 90.68% <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) >>>>>>> bd8bda4 (Manifest_cache true) ======= 41 files in total. ======= 34 files in total. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= 47 files in total. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= 52 files in total. >>>>>>> 26b462d (Add login registration pages)
400 relevant lines, 397 lines covered and =======
377 relevant lines, 374 lines covered and >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= 52 files in total. >>>>>>> 26b462d (Add login registration pages)
400 relevant lines, 397 lines covered and >>>>>>> 4976a174 (Add login registration pages) 3 lines missed. ( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4976a174 (Add login registration pages) ======= ======= ======= ======= 47 files in total. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
377 relevant lines, 374 lines covered and 3 lines missed. ( <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> 1c33e01 (Add login registration pages) >>>>>>> 40a3d25f (Add login registration pages) 99.11% >>>>>>> 4e81ea2 (Featire specs) ======= 90.68% >>>>>>> aa7b40c (Manifest_cache true) ======= 52 files in total.
400 relevant lines, 397 lines covered and 3 lines missed. ( 99.25% >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> afa56d1 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 416166f (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bae2b7de (Add login registration pages) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= 41 files in total. <<<<<<< HEAD ======= ======= 41 files in total. >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> ff4c2fe0 (Add login registration pages) ======= >>>>>>> 4a2f2ad8 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= 41 files in total. >>>>>>> e3e66f3 (Featire specs) ======= ======= 41 files in total. >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) ======= 41 files in total. >>>>>>> e3e66f3 (Featire specs) ======= 34 files in total. >>>>>>> 183b6c5 (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= 90.68% >>>>>>> 183b6c5 (Manifest_cache true) ======= 99.2% >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 95.71% >>>>>>> aca90e3 (Rebased) =======
338 relevant lines, 335 lines covered and 3 lines missed. ( 99.11% >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) ======= 41 files in total.
338 relevant lines, 335 lines covered and 3 lines missed. ( 99.11% >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) ======= 41 files in total.
338 relevant lines, 335 lines covered and 3 lines missed. ( 99.11% >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 416166f (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 6da9530 (Featire specs) ======= ======= 90.68% >>>>>>> 183b6c5 (Manifest_cache true) ======= 99.2% >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 2fef4a0 (Add login registration pages) >>>>>>> 0561be1d (Add login registration pages) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 551f3c1 (Add login registration pages) >>>>>>> 06e5e41 (Add login registration pages) >>>>>>> 8f1baf1c (Add login registration pages) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= 99.25% >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> 21873de0 (Featire specs) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD >>>>>>> 88d49ad (Add login registration pages) ======= ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6fa625b (Manifest_cache true) 95.71% <<<<<<< HEAD >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 9a49b7b (Rebased) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= 41 files in total. ======= 34 files in total. >>>>>>> 02a399d (Manifest_cache true) ======= 99.2% ======= 34 files in total. >>>>>>> 7375d4b (Manifest_cache true) ======= 92 files in total. >>>>>>> aca90e3 (Rebased) >>>>>>> c7a726c5 (Rebased)
1118 relevant lines, 1070 lines covered and 48 lines missed. ( <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD 90.68% ======= 99.2% ======= 34 files in total. ======= 47 files in total. >>>>>>> c336a21 (Fix book_spec decrease quantity and price)
377 relevant lines, 374 lines covered and 3 lines missed. ( >>>>>>> c7a726c5 (Rebased) <<<<<<< HEAD 99.11% >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= 90.68% >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 78717cc (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= 90.68% >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 98beee2 (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= 41 files in total. ======= 34 files in total. >>>>>>> bd8bda4 (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> ae409ca (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= 90.68% >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 385b8df (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= 41 files in total. ======= 34 files in total. >>>>>>> aa7b40c (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 379a979 (Featire specs) ======= ======= ======= 90.68% >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7bc7f9f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= ======= >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= ======= 90.68% >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 84d0df6 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= ======= 99.25% >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 37e48018 (Featire specs) ======= ======= ======= 41 files in total.
338 relevant lines, 335 lines covered and 3 lines missed. ( 99.11% >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= ======= 90.68% >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 450f4e3 (Manifest_cache true) ======= ======= ======= 99.2% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= 99.25% >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= ======= 49 files in total.
370 relevant lines, 257 lines covered and 113 lines missed. ( 69.46% >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= ======= 92 files in total.
1141 relevant lines, 1093 lines covered and 48 lines missed. ( 95.79% >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= <<<<<<< HEAD ======= >>>>>>> ed32b84 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 72b9cab (Featire specs) >>>>>>> 21873de0 (Featire specs) >>>>>>> 22ee41c (Add login registration pages) ======= 95.71% <<<<<<< HEAD >>>>>>> c033601 (Rebased) ======= ======= 41 files in total.
338 relevant lines, 335 lines covered and 3 lines missed. ( 99.11% >>>>>>> d0dc1f1 (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) <<<<<<< HEAD ======= >>>>>>> 659083f (Featire specs) ======= ======= ======= 90.68% >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) ======= ======= ======= >>>>>>> 03c0867 (Add login registration pages) 90.68% >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= ======= >>>>>>> 51bc18c (Featire specs) >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> ae07231a (Featire specs) >>>>>>> 6fa625b (Manifest_cache true) ======= ======= 41 files in total.
338 relevant lines, 335 lines covered and 3 lines missed. ( 99.11% >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= ======= ======= 90.68% >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) ======= ======= ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> bd8bda4 (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 752f0c0 (Featire specs) ======= 90.68% <<<<<<< HEAD ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> bd8bda4 (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 752f0c0 (Featire specs) ======= 90.68% >>>>>>> 9bfbd88 (Featire specs) >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= 41 files in total. ======= 34 files in total. >>>>>>> aa7b40c (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 90.68% >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 90.68% >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= 99.25% >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57a2e05 (Add login registration pages) ======= ======= 41 files in total. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= 34 files in total. >>>>>>> fd6db03 (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) ======= ======= 90.68% >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= ======= 99.2% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e60833c (Add login registration pages) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= ======= 99.25% >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= 49 files in total.
370 relevant lines, 257 lines covered and 113 lines missed. ( 69.46% >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) 92 files in total. ======= 47 files in total. >>>>>>> 7375d4b (Manifest_cache true)
1141 relevant lines, 1093 lines covered and 48 lines missed. ( <<<<<<< HEAD 95.79% <<<<<<< HEAD >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= ======= 90.68% >>>>>>> aa7b40c (Manifest_cache true) ======= 52 files in total.
400 relevant lines, 397 lines covered and 3 lines missed. ( 99.25% >>>>>>> 1214e1f (Add login registration pages) ======= 41 files in total. <<<<<<< HEAD ======= 34 files in total. <<<<<<< HEAD >>>>>>> aa7b40c (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 41 files in total. ======= 34 files in total. <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 02a399d (Manifest_cache true) ======= 99.2% ======= 34 files in total. >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD <<<<<<< HEAD 99.11% <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= 90.68% >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= ======= ======= 41 files in total. <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= 34 files in total. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% <<<<<<< HEAD >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= 90.68% >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 90.68% >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> bd8bda4 (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 90.68% >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> aa7b40c (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 90.68% >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 304cd28a (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> 183b6c5 (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) ======= ======= 90.68% >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= ======= 99.25% >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= ======= ======= ======= 41 files in total. ======= 34 files in total. <<<<<<< HEAD >>>>>>> fd6db03 (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= ======= 90.68% >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 450f4e3 (Manifest_cache true) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= ======= 99.2% <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= 99.25% >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> ed8ea634 (Add login registration pages) ======= ======= ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> 998f08d (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= ======= 90.68% >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= ======= ======= 99.2% >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= 99.25% >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD >>>>>>> 2be0d057 (Add login registration pages) ======= ======= ======= 112 files in total.
1338 relevant lines, 1277 lines covered and 61 lines missed. ( <<<<<<< HEAD 95.74% >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= ======= ======= 95.44% >>>>>>> 446d79a (Fix) >>>>>>> 366b257 (Fix) <<<<<<< HEAD >>>>>>> 23c4703e (Fix) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 95.71% >>>>>>> aca90e3 (Rebased) <<<<<<< HEAD >>>>>>> c7a726c5 (Rebased) ======= ======= ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> c59d1a99 (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= ======= 90.68% >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7bc7f9f (Manifest_cache true) <<<<<<< HEAD >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= ======= >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> bae2b7de (Add login registration pages) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= ======= ======= 99.25% >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= ======= 49 files in total.
370 relevant lines, 257 lines covered and 113 lines missed. ( 69.46% >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= ======= ======= 92 files in total.
1141 relevant lines, 1093 lines covered and 48 lines missed. ( 95.79% >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> fdab719f (Fix) >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= ======= ======= 90.68% >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) ======= ======= ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> bd8bda4 (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 752f0c0 (Featire specs) ======= 90.68% >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= 41 files in total. ======= 34 files in total. >>>>>>> aa7b40c (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 90.68% >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 90.68% >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= 99.25% >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57a2e05 (Add login registration pages) ======= ======= 41 files in total. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= 34 files in total. >>>>>>> fd6db03 (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) ======= ======= 90.68% >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= ======= 99.2% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e60833c (Add login registration pages) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= ======= 99.25% >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= 49 files in total.
370 relevant lines, 257 lines covered and 113 lines missed. ( 69.46% >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) 92 files in total. ======= 47 files in total. >>>>>>> 7375d4b (Manifest_cache true)
1141 relevant lines, 1093 lines covered and 48 lines missed. ( <<<<<<< HEAD 95.79% <<<<<<< HEAD >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= ======= 90.68% >>>>>>> aa7b40c (Manifest_cache true) ======= 52 files in total.
400 relevant lines, 397 lines covered and 3 lines missed. ( 99.25% >>>>>>> 1214e1f (Add login registration pages) ======= 41 files in total. ======= 34 files in total. <<<<<<< HEAD >>>>>>> aa7b40c (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 41 files in total. ======= 34 files in total. <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 02a399d (Manifest_cache true) ======= 99.2% ======= 34 files in total. >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD <<<<<<< HEAD 99.11% <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= 90.68% >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= ======= ======= 41 files in total. <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= 34 files in total. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% <<<<<<< HEAD >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= 90.68% >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 90.68% >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> bd8bda4 (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 90.68% >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> bd30d038 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> aa7b40c (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 90.68% >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> d4235040 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> 183b6c5 (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) ======= ======= 90.68% >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= ======= 99.25% >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> 0561be1d (Add login registration pages) ======= ======= ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> fd6db03 (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% <<<<<<< HEAD >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 0ed7f7c (Featire specs) ======= ======= ======= 90.68% <<<<<<< HEAD >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= ======= ======= 99.2% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= 99.25% >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> 512d1d87 (Add login registration pages) ======= ======= ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> 998f08d (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= ======= 90.68% >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4fac471d (Manifest_cache true) ======= ======= ======= ======= 99.2% >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= 99.25% >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD >>>>>>> 4976a174 (Add login registration pages) ======= ======= ======= 112 files in total.
1338 relevant lines, 1277 lines covered and 61 lines missed. ( <<<<<<< HEAD 95.74% >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= ======= 95.44% >>>>>>> 446d79a (Fix) >>>>>>> 366b257 (Fix) >>>>>>> d68e8240 (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) ======= ======= 90.68% >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> f92a45b (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) >>>>>>> 6fa625b (Manifest_cache true) ======= ======= 41 files in total.
338 relevant lines, 335 lines covered and 3 lines missed. ( 99.11% >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= ======= ======= 90.68% >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) ======= ======= ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> bd8bda4 (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 752f0c0 (Featire specs) ======= 90.68% >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= 41 files in total. ======= 34 files in total. >>>>>>> aa7b40c (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= 90.68% >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= ======= 90.68% >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= 99.25% >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57a2e05 (Add login registration pages) ======= ======= 41 files in total. <<<<<<< HEAD ======= 34 files in total. >>>>>>> fd6db03 (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) ======= ======= 90.68% >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= ======= 99.2% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> ccec311 (Add login registration pages) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= ======= 99.25% >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49e8a6c (Rebased) ======= 49 files in total.
370 relevant lines, 257 lines covered and 113 lines missed. ( 69.46% >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) 92 files in total. ======= 47 files in total. >>>>>>> 7375d4b (Manifest_cache true)
1141 relevant lines, 1093 lines covered and 48 lines missed. ( <<<<<<< HEAD 95.79% <<<<<<< HEAD >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= ======= 90.68% >>>>>>> aa7b40c (Manifest_cache true) ======= 52 files in total.
400 relevant lines, 397 lines covered and 3 lines missed. ( 99.25% >>>>>>> 1214e1f (Add login registration pages) ======= 41 files in total. ======= 34 files in total. <<<<<<< HEAD >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 02a399d (Manifest_cache true) ======= 99.2% ======= 34 files in total. >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD <<<<<<< HEAD 99.11% <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= 90.68% >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0e864a5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> cc390719 (Manifest_cache true) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= ======= ======= 41 files in total. <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= 34 files in total. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% <<<<<<< HEAD >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> c871248 (Add login registration pages) <<<<<<< HEAD >>>>>>> e011b0df (Add login registration pages) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= ======= 90.68% >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3be4d14 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1b8f36d8 (Manifest_cache true) ======= ======= ======= ======= ======= 90.68% >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> a71befd (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8a3779d4 (Manifest_cache true) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> 715fac2 (Featire specs) ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> bd8bda4 (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= ======= ======= 90.68% >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 551c6ab (Manifest_cache true) <<<<<<< HEAD >>>>>>> 56531f25 (Manifest_cache true) ======= ======= ======= ======= ======= ======= 90.68% >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 715fac2 (Featire specs) ======= 41 files in total. ======= 34 files in total. >>>>>>> aa7b40c (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= ======= 90.68% >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> fd310ed (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86229876 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD >>>>>>> 852864e (Add login registration pages) <<<<<<< HEAD >>>>>>> 1d11874 (Add login registration pages) <<<<<<< HEAD >>>>>>> ff4c2fe0 (Add login registration pages) ======= ======= ======= ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> 183b6c5 (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= ======= 90.68% >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 42e9c2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> 16ebb0ff (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= ======= 99.25% >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 57da3ff (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) ======= ======= >>>>>>> 6fa625b (Manifest_cache true) 95.71% >>>>>>> 5506bd0 (Featire specs) <<<<<<< HEAD >>>>>>> 551f3c1 (Add login registration pages) <<<<<<< HEAD >>>>>>> 06e5e41 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8f1baf1c (Add login registration pages) ======= ======= ======= ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> fd6db03 (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= ======= 90.68% >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> c0159bf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d0f5cbf (Manifest_cache true) ======= ======= ======= ======= ======= 99.2% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= ======= ======= ======= ======= 99.25% >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> ccec311 (Add login registration pages) <<<<<<< HEAD >>>>>>> 385136b (Add login registration pages) <<<<<<< HEAD >>>>>>> dda81aa9 (Add login registration pages) ======= ======= ======= ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> 998f08d (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= ======= ======= 90.68% >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) <<<<<<< HEAD >>>>>>> ca274ec (Manifest_cache true) <<<<<<< HEAD >>>>>>> a56ba36d (Manifest_cache true) ======= ======= ======= ======= ======= 99.2% >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= ======= 99.25% >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> 8c3e531 (Add login registration pages) <<<<<<< HEAD >>>>>>> 1c33e01 (Add login registration pages) <<<<<<< HEAD >>>>>>> 40a3d25f (Add login registration pages) ======= ======= ======= ======= 112 files in total.
1338 relevant lines, 1277 lines covered and 61 lines missed. ( <<<<<<< HEAD 95.74% >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= ======= 95.44% >>>>>>> 446d79a (Fix) >>>>>>> 851b4c0 (Fix) <<<<<<< HEAD >>>>>>> e75c983 (Fix) <<<<<<< HEAD >>>>>>> 22d61969 (Fix) ======= ======= ======= ======= 90.68% >>>>>>> aa7b40c (Manifest_cache true) ======= 52 files in total.
400 relevant lines, 397 lines covered and 3 lines missed. ( 99.25% >>>>>>> 1214e1f (Add login registration pages) ======= 41 files in total.
338 relevant lines, 335 lines covered and 3 lines missed. ( 99.11% >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= ======= ======= ======= ======= 90.68% >>>>>>> 183b6c5 (Manifest_cache true) ======= 99.2% >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= ======= 99.25% >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD >>>>>>> 03c0867 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8d4ec55 (Add login registration pages) <<<<<<< HEAD >>>>>>> 73dcd461 (Add login registration pages) ======= ======= ======= ======= 95.71% <<<<<<< HEAD >>>>>>> c033601 (Rebased) ======= ======= 41 files in total.
338 relevant lines, 335 lines covered and 3 lines missed. ( 99.11% >>>>>>> d0dc1f1 (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= ======= 90.68% >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) ======= ======= 90.68% >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) ======= ======= 41 files in total. <<<<<<< HEAD ======= ======= 34 files in total. >>>>>>> bd8bda4 (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) ======= ======= 90.68% >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 0b43b18 (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= 90.68% >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0b43b18 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1cce66c (Manifest_cache true) <<<<<<< HEAD >>>>>>> d365be68 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= ======= ======= 90.68% >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= 99.25% >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57a2e05 (Add login registration pages) ======= ======= 41 files in total.
338 relevant lines, 335 lines covered and 3 lines missed. ( 99.11% >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) )
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 1b8f36d8 (Manifest_cache true) ======= >>>>>>> 8a3779d4 (Manifest_cache true) ======= >>>>>>> 7b22ad7e (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> cc390719 (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> a2206025 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= >>>>>>> add330c (Manifest_cache true) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 15bff2e (Manifest_cache true) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> 6c71f00 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1d59aaa (Fix) ======= <<<<<<< HEAD >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 0b43b18 (Manifest_cache true) ======= >>>>>>> 2ee03d3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 715fac2 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> ebcdce06 (Featire specs) ======= <<<<<<< HEAD ======= ======= ======= ======= ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> bd30d038 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> d4235040 (Manifest_cache true) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> b3f2049 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0e864a5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> cc390719 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3be4d14 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1b8f36d8 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> a71befd (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8a3779d4 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 551c6ab (Manifest_cache true) <<<<<<< HEAD >>>>>>> 56531f25 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> fd310ed (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86229876 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 42e9c2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> 16ebb0ff (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> c0159bf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d0f5cbf (Manifest_cache true) ======= ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) <<<<<<< HEAD >>>>>>> ca274ec (Manifest_cache true) <<<<<<< HEAD >>>>>>> a56ba36d (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 0b43b18 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1cce66c (Manifest_cache true) <<<<<<< HEAD >>>>>>> d365be68 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a71befd (Manifest_cache true) ======= >>>>>>> 9e081dc (Fix) ======= ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> a71befd (Manifest_cache true) ======= ======= >>>>>>> 1d59aaa (Fix) >>>>>>> 9e081dc (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> 49f2e24 (Featire specs) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c0159bf (Manifest_cache true) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= ======= ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5506bd0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5506bd0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4552227 (Featire specs) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 03c0867 (Add login registration pages) ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 5506bd0 (Featire specs) <<<<<<< HEAD >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 15bff2e (Manifest_cache true) >>>>>>> c0159bf (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6da9530 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= >>>>>>> c871248 (Add login registration pages) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 0c57e4e (Fix) ======= ======= ======= >>>>>>> 15bff2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> a9e66e9 (Featire specs) >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> c0159bf (Manifest_cache true) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= >>>>>>> c871248 (Add login registration pages) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD ======= >>>>>>> da3a9a3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 15bff2e (Manifest_cache true) ======= >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) ======= <<<<<<< HEAD >>>>>>> 0c57e4e (Fix) >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> a636fda (Featire specs) >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0b43b18 (Manifest_cache true) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 0c57e4e (Fix) ======= <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= ======= ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) ======= ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> ebcdce06 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD ======= ======= ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> ebcdce06 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= <<<<<<< HEAD ======= >>>>>>> aca90e3 (Rebased) <<<<<<< HEAD >>>>>>> c7a726c5 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> fd6db03 (Manifest_cache true) ======= >>>>>>> c7a726c5 (Rebased) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> aca90e3 (Rebased) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD ======= >>>>>>> b28889f (Fix) ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 490b01d6 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> fd3f47ab (Featire specs) <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f7852d17 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= ======= ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 11792758 (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4fac471d (Manifest_cache true) ======= ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= ======= ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= ======= <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 551f3c1 (Add login registration pages) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c033601 (Rebased) >>>>>>> 49e8a6c (Rebased) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> a9e66e9 (Featire specs) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 0ed7f7c (Featire specs) ======= <<<<<<< HEAD >>>>>>> e18eb87 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= ======= <<<<<<< HEAD >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= <<<<<<< HEAD ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= ======= >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> ef483b6d (Fix) ======= <<<<<<< HEAD ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> 4552227 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= >>>>>>> 4552227 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0561be1d (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c033601 (Rebased) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 37e48018 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> e59c273d (Manifest_cache true) ======= ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> a636fda (Featire specs) ======= >>>>>>> bf554f4 (Rebased) ======= <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) >>>>>>> 11792758 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= ======= ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> c033601 (Rebased) >>>>>>> 49e8a6c (Rebased) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= >>>>>>> 2a25e4c (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 563720e (Featire specs) ======= <<<<<<< HEAD ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) ======= ======= >>>>>>> 2ee03d3 (Featire specs) >>>>>>> afa56d1 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c033601 (Rebased) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) ======= ======= >>>>>>> 2ee03d3 (Featire specs) >>>>>>> afa56d1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) >>>>>>> 495b04d (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> a636fda (Featire specs) ======= >>>>>>> bf554f4 (Rebased) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 49e8a6c (Rebased) >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) >>>>>>> a636fda (Featire specs) ======= >>>>>>> bf554f4 (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 366b257 (Fix) <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= ======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> e59c273d (Manifest_cache true) <<<<<<< HEAD >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> fd6db03 (Manifest_cache true) ======= >>>>>>> 31d15e66 (Fix) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 75fa7e1b (Rebased) ======= <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= >>>>>>> f6e20266 (Add login registration pages) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) >>>>>>> c033601 (Rebased) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) >>>>>>> a636fda (Featire specs) ======= >>>>>>> bf554f4 (Rebased) ======= <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8249ff3c (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= ======= ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> c033601 (Rebased) >>>>>>> 49e8a6c (Rebased) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) ======= <<<<<<< HEAD >>>>>>> c033601 (Rebased) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> fc3774fd (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) >>>>>>> a636fda (Featire specs) ======= >>>>>>> bf554f4 (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> 11792758 (Rebased) <<<<<<< HEAD ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 366b257 (Fix) <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c7a726c5 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 67ab5299 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> c59d1a99 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) ======= ======= >>>>>>> 0341d6de (Manifest_cache true) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> d245196f (Manifest_cache true) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 304cd28a (Manifest_cache true) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> bae2b7de (Add login registration pages) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> d9d85ca6 (Fix) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD ======= >>>>>>> ae884b47 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae2a012 (Manifest_cache true) ======= >>>>>>> ae884b47 (Fix) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 21793167 (Manifest_cache true) ======= >>>>>>> d9d85ca6 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae2a012 (Manifest_cache true) ======= ======= >>>>>>> 21793167 (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 67ab5299 (Fix) ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9e081dc (Fix) ======= <<<<<<< HEAD >>>>>>> ae2a012 (Manifest_cache true) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 446d79a (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bae2b7de (Add login registration pages) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> ef483b6d (Fix) ======= >>>>>>> d68e8240 (Fix) ======= ======= >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 446d79a (Fix) >>>>>>> e75c983 (Fix) >>>>>>> 22d61969 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> d68e8240 (Fix) ======= >>>>>>> 1049b80c (Fix) ======= >>>>>>> 22d61969 (Fix) ======= ======= >>>>>>> e75c983 (Fix) >>>>>>> 1d59aaa (Fix) >>>>>>> 9e081dc (Fix) >>>>>>> 7375d4b (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a5d032d (Fix) ======= ======= >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 557c1b8 (Fix) ======= <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= >>>>>>> 557c1b8 (Fix) >>>>>>> 8288136d (Fix) ======= >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 7375d4b (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> ae2a012 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 5b7749a (Fix) ======= ======= >>>>>>> 446d79a (Fix) >>>>>>> 366b257 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 5b7749a (Fix) ======= ======= >>>>>>> 446d79a (Fix) >>>>>>> 366b257 (Fix) ======= ======= <<<<<<< HEAD >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> 7375d4b (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> ae2a012 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 5b7749a (Fix) ======= ======= >>>>>>> 446d79a (Fix) >>>>>>> 366b257 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= ======= >>>>>>> 446d79a (Fix) >>>>>>> 366b257 (Fix) <<<<<<< HEAD >>>>>>> d68e8240 (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> a71befd (Manifest_cache true) <<<<<<< HEAD >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> ae2a012 (Manifest_cache true) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 7c4ea7f (Fix) ======= >>>>>>> 446d79a (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> a71befd (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8a3779d4 (Manifest_cache true) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= ======= >>>>>>> 446d79a (Fix) >>>>>>> 851b4c0 (Fix) >>>>>>> e75c983 (Fix) >>>>>>> 22d61969 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> 8887ba5b (Fix) ======= >>>>>>> 1049b80c (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> ae2a012 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> ae2a012 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD ======= >>>>>>> ef483b6d (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> ae2a012 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> ae2a012 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 9e081dc (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> ae2a012 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) >>>>>>> 9e081dc (Fix) >>>>>>> 1049b80c (Fix) <<<<<<< HEAD ======= ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 490b01d6 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 99dad91f (Fix) >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> e18eb87 (Fix) >>>>>>> 99dad91f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> aca90e3 (Rebased) ======= <<<<<<< HEAD ======= ======= >>>>>>> 824bb2b (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> f92a45b (Featire specs) ======= >>>>>>> 4f4ea3f9 (Featire specs) <<<<<<< HEAD ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD ======= ======= >>>>>>> fdab719f (Fix) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84809242 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 416166f (Featire specs) >>>>>>> a2206025 (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> e18eb87 (Fix) >>>>>>> 99dad91f (Fix) >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 8887ba5b (Fix) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e18eb87 (Fix) ======= <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= >>>>>>> e055dd0 (Rebased) ======= <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 8887ba5b (Fix) <<<<<<< HEAD ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 31d15e66 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> 53db2224 (Featire specs) >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 8887ba5b (Fix) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 932dbec (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> 932dbec (Featire specs) >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) >>>>>>> 53db2224 (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 0676508 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> a2206025 (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> bdc24a1a (Rebased) >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> 8887ba5b (Fix) >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> 53db2224 (Featire specs) >>>>>>> 557c1b8 (Fix) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c7a726c5 (Rebased) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> a5d032d (Fix) >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 311e9fa (Rebased) >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 557c1b8 (Fix) >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 8887ba5b (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 0ed7f7c (Featire specs) ======= ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= >>>>>>> ef483b6d (Fix) ======= ======= ======= >>>>>>> e18eb87 (Fix) ======= ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 99dad91f (Fix) ======= ======= >>>>>>> e055dd0 (Rebased) >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 31d15e66 (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ef483b6d (Fix) >>>>>>> 6e923b9d (Featire specs) ======= >>>>>>> c7a726c5 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= >>>>>>> 31d15e66 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= >>>>>>> aca90e3 (Rebased) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 160fb15 (Fix) ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD ======= >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 51bc18c (Featire specs) >>>>>>> 7b22ad7e (Featire specs) ======= ======= >>>>>>> 4a2f2ad8 (Featire specs) ======= >>>>>>> 21873de0 (Featire specs) ======= >>>>>>> 1049b80c (Fix) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= >>>>>>> 9e081dc (Fix) >>>>>>> 1049b80c (Fix) <<<<<<< HEAD >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= ======= <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 1d59aaa (Fix) >>>>>>> 9e081dc (Fix) >>>>>>> 1049b80c (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0f8241bb (Featire specs) ======= <<<<<<< HEAD ======= ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> bc6bc8d2 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> 8887ba5b (Fix) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix) <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> 8887ba5b (Fix) ======= ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> f92a45b (Featire specs) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 4e81ea2 (Featire specs) ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) >>>>>>> 08edf50 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> 8887ba5b (Fix) >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix) <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 99dad91f (Fix) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 99dad91f (Fix) >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 99dad91f (Fix) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> e18eb87 (Fix) >>>>>>> 99dad91f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix) ======= >>>>>>> e18eb87 (Fix) >>>>>>> 99dad91f (Fix) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> f92a45b (Featire specs) >>>>>>> e6fc67c7 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 7a08014b (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> fb61c5a (Featire specs) ======= >>>>>>> 73f364d8 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> bf554f4 (Rebased) ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> e055dd0 (Rebased) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> bf554f4 (Rebased) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= ======= >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix) >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> e055dd0 (Rebased) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 11792758 (Rebased) ======= >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> a5d032d (Fix) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix) >>>>>>> c033601 (Rebased) >>>>>>> 75fa7e1b (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> c7a726c5 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 1049b80c (Fix) ======= >>>>>>> f3d746cb (Featire specs) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> f92a45b (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> 216fe41 (Featire specs) ======= ======= >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) >>>>>>> 216fe41 (Featire specs) >>>>>>> f3d746cb (Featire specs) >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> 4a2f2ad8 (Featire specs) ======= >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) >>>>>>> afa56d1 (Featire specs) >>>>>>> e1ecabbe (Featire specs) >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> f92a45b (Featire specs) ======= >>>>>>> c033601 (Rebased) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) >>>>>>> d34a0770 (Manifest_cache true) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d34a0770 (Manifest_cache true) ======= >>>>>>> ae07231a (Featire specs) >>>>>>> b9cc4e9 (Manifest_cache true) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> ae07231a (Featire specs) >>>>>>> d2e6b3c (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= ======= ======= >>>>>>> 216fe41 (Featire specs) >>>>>>> 9620751 (Featire specs) ======= ======= >>>>>>> 2a25e4c (Featire specs) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) ======= ======= >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> 3be4d14 (Manifest_cache true) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> ae07231a (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 96aecde (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> bd30d038 (Manifest_cache true) >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c12b71de (Featire specs) >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c8cdb08 (Manifest_cache true) >>>>>>> bd30d038 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) ======= ======= ======= <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 304cd28a (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= ======= >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) ======= ======= ======= <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> bd30d038 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> d4235040 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= ======= >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4fac471d (Manifest_cache true) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> 659083f (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= ======= >>>>>>> 3e9f99d (Featire specs) >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= ======= >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 0b43b18 (Manifest_cache true) >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0e864a5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> cc390719 (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= >>>>>>> add330c (Manifest_cache true) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= ======= >>>>>>> 3b03895 (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 15bff2e (Manifest_cache true) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3be4d14 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1b8f36d8 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 551c6ab (Manifest_cache true) <<<<<<< HEAD >>>>>>> 56531f25 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> fd310ed (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86229876 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 42e9c2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> 16ebb0ff (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> c0159bf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d0f5cbf (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) <<<<<<< HEAD >>>>>>> ca274ec (Manifest_cache true) <<<<<<< HEAD >>>>>>> a56ba36d (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0b43b18 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1cce66c (Manifest_cache true) <<<<<<< HEAD >>>>>>> d365be68 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> b97bb382 (Featire specs) ======= >>>>>>> 4a2f2ad8 (Featire specs) ======= >>>>>>> 21873de0 (Featire specs) ======= >>>>>>> 392646b5 (Featire specs) ======= >>>>>>> 1049b80c (Fix) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> 0676508 (Featire specs) >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> 15c51b7 (Featire specs) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> b97bb382 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> d52f9efe (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 2612be03 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 973ba8c (Featire specs) >>>>>>> b97bb382 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> b97bb382 (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= >>>>>>> 34509eee (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> 8887ba5b (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 31d15e66 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 31d15e66 (Fix) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 8288136d (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) ======= ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0c57e4e (Fix) >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 8887ba5b (Fix) ======= >>>>>>> e055dd0 (Rebased) >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 0c57e4e (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> c7a726c5 (Rebased) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 8887ba5b (Fix) ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> bc6bc8d2 (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 6b6d1c2d (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 1049b80c (Fix) ======= ======= >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> 9e081dc (Fix) >>>>>>> 1049b80c (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> d8dd3b4a (Featire specs) ======= <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> 4552227 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= ======= >>>>>>> 2ee03d3 (Featire specs) >>>>>>> afa56d1 (Featire specs) ======= ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> 4552227 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) ======= <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) ======= <<<<<<< HEAD >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) >>>>>>> b28889f (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 852864e (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 551f3c1 (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> ccec311 (Add login registration pages) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> 6c71f00 (Manifest_cache true) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 8c3e531 (Add login registration pages) ======= >>>>>>> 1d59aaa (Fix) ======= ======= >>>>>>> 03c0867 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 5a2009f1 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) >>>>>>> 84809242 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 6da9530 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 73dcd461 (Add login registration pages) ======= <<<<<<< HEAD ======= ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> f8e5c9db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= ======= >>>>>>> 0ed7f7c (Featire specs) >>>>>>> ecb02dbf (Featire specs) >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> e989024d (Add login registration pages) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) >>>>>>> bae2b7de (Add login registration pages) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> aca90e3 (Rebased) <<<<<<< HEAD ======= ======= >>>>>>> c7a726c5 (Rebased) ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= <<<<<<< HEAD ======= ======= >>>>>>> aca90e3 (Rebased) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> c033601 (Rebased) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD ======= >>>>>>> c7a726c5 (Rebased) <<<<<<< HEAD ======= ======= >>>>>>> e1f4d17 (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a5d032d (Fix) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) ======= ======= ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 31507b8 (Add login registration pages) >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD >>>>>>> aca90e3 (Rebased) >>>>>>> fd3f47ab (Featire specs) ======= <<<<<<< HEAD >>>>>>> aca90e3 (Rebased) >>>>>>> f7852d17 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> e1f4d17 (Add login registration pages) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> c033601 (Rebased) >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> bae2b7de (Add login registration pages) <<<<<<< HEAD ======= ======= >>>>>>> e1f4d17 (Add login registration pages) ======= >>>>>>> 26b462d (Add login registration pages) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> 7c4ea7f (Fix) ======= <<<<<<< HEAD >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> e1f4d17 (Add login registration pages) ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 26b462d (Add login registration pages) ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 98beee2 (Manifest_cache true) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 88d49ad (Add login registration pages) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) ======= >>>>>>> 26b462d (Add login registration pages) <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD ======= ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> bf137e4 (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7d58507 (Add login registration pages) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> e1f4d17 (Add login registration pages) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) >>>>>>> 6066f925 (Add login registration pages) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 98beee2 (Manifest_cache true) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD >>>>>>> 88d49ad (Add login registration pages) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 88d49ad (Add login registration pages) >>>>>>> 84809242 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9bfbd88 (Featire specs) ======= ======= >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> a5d032d (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> ef483b6d (Fix) <<<<<<< HEAD ======= ======= >>>>>>> e1f4d17 (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a5d032d (Fix) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) ======= ======= ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> b3f2049 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0e864a5 (Manifest_cache true) ======= ======= ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) ======= ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) >>>>>>> c871248 (Add login registration pages) ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) ======= ======= >>>>>>> 0b43b18 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1cce66c (Manifest_cache true) ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= ======= ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> f416f45 (Add login registration pages) ======= <<<<<<< HEAD ======= ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) ======= >>>>>>> 26b462d (Add login registration pages) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> 7c4ea7f (Fix) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= ======= ======= ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD ======= ======= >>>>>>> e1f4d17 (Add login registration pages) ======= >>>>>>> 03c0867 (Add login registration pages) ======= ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> b15044a (Manifest_cache true) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6a9fede (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> e1f4d17 (Add login registration pages) ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) ======= >>>>>>> 26b462d (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 03c0867 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) ======= >>>>>>> 26b462d (Add login registration pages) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 03c0867 (Add login registration pages) <<<<<<< HEAD ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) ======= >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) ======= >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= >>>>>>> a71befd (Manifest_cache true) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> c871248 (Add login registration pages) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) ======= >>>>>>> 26b462d (Add login registration pages) ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e18eb87 (Fix) >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> 26b462d (Add login registration pages) ======= >>>>>>> e18eb87 (Fix) >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD ======= ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> bf137e4 (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7d58507 (Add login registration pages) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD ======= ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7d58507 (Add login registration pages) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> a5d032d (Fix) <<<<<<< HEAD ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 98beee2 (Manifest_cache true) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 88d49ad (Add login registration pages) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9bfbd88 (Featire specs) ======= ======= >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> a5d032d (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> a5d032d (Fix) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> e1f4d17 (Add login registration pages) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 72b9cab (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> 15c51b7 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 8d4ec55 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) ======= ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> a5d032d (Fix) >>>>>>> b28889f (Fix) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) ======= >>>>>>> a71befd (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 73dcd461 (Add login registration pages) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> 03c0867 (Add login registration pages) >>>>>>> 8d4ec55 (Add login registration pages) >>>>>>> 73dcd461 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 0c57e4e (Fix) ======= <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> e18eb87 (Fix) ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> e18eb87 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> a5d032d (Fix) >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> e055dd0 (Rebased) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 8887ba5b (Fix) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) >>>>>>> aca90e3 (Rebased) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e1f4d17 (Add login registration pages) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 160fb15 (Fix) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> c033601 (Rebased) >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c033601 (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> efd6af09 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= ======= >>>>>>> 610b6138 (Featire specs) >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 88d49ad (Add login registration pages) ======= ======= <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> aca90e3 (Rebased) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 659083f (Featire specs) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> 5e31aeb (Featire specs) >>>>>>> c033601 (Rebased) >>>>>>> 9a49b7b (Rebased) ======= ======= >>>>>>> 160fb15 (Fix) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d52f9efe (Featire specs) ======= ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> d52f9efe (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> c033601 (Rebased) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c033601 (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d52f9efe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> ae07231a (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c12b71de (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) >>>>>>> c12b71de (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 659083f (Featire specs) >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c033601 (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> b97bb382 (Featire specs) ======= >>>>>>> 4a2f2ad8 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 932dbec (Featire specs) >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> bf05825 (Featire specs) >>>>>>> c12b71de (Featire specs) ======= >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> ae409ca (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 37e48018 (Featire specs) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 4d90e3d (Featire specs) >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 416166f (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 3723aad (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 0c57e4e (Fix) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= >>>>>>> 5e31aeb (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> 51bc18c (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> e54deeb (Featire specs) ======= <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 8181d13 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) >>>>>>> 72b9cab (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) >>>>>>> 15c51b7 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) >>>>>>> 7c4ea7f (Fix) ======= >>>>>>> 4d90e3d (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 31d15e66 (Fix) ======= ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 3723aad (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> e54deeb (Featire specs) ======= <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) >>>>>>> 36356d3 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) >>>>>>> 7c4ea7f (Fix) ======= ======= >>>>>>> 0ed7f7c (Featire specs) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0ed7f7c (Featire specs) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> e18eb87 (Fix) ======= ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 51bc18c (Featire specs) ======= ======= >>>>>>> 8181d13 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) ======= ======= ======= >>>>>>> 1d59aaa (Fix) >>>>>>> 9e081dc (Fix) >>>>>>> 7c4ea7f (Fix) ======= ======= >>>>>>> 3e9f99d (Featire specs) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 2a25e4c (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> 0676508 (Featire specs) ======= ======= ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 3be4d14 (Manifest_cache true) ======= >>>>>>> 51bc18c (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 3cf8dd4 (Featire specs) ======= ======= >>>>>>> 49f2e24 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 2ee03d3 (Featire specs) >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 15c51b7 (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 416166f (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) ======= <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b719333 (Manifest_cache true) ======= >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= ======= ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b719333 (Manifest_cache true) ======= >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= ======= ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> b832d45 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) >>>>>>> 89d7dcd2 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 9440753 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 9440753 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= >>>>>>> 715fac2 (Featire specs) ======= <<<<<<< HEAD >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> aa4361fd (Featire specs) >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> df37394 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> f92a45b (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 715fac2 (Featire specs) >>>>>>> fb61c5a (Featire specs) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fb61c5a (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bd30d038 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) >>>>>>> a304bcf (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> bd30d038 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> d4235040 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> 9440753 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 255dd8d (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> e5890c2 (Manifest_cache true) >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 255dd8d (Manifest_cache true) ======= >>>>>>> d4235040 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) >>>>>>> 551c6ab (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0b43b18 (Manifest_cache true) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 6da9530 (Featire specs) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 78717cc (Manifest_cache true) ======= ======= ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 98beee2 (Manifest_cache true) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 385b8df (Manifest_cache true) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7bc7f9f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 7bc7f9f (Manifest_cache true) >>>>>>> 610b6138 (Featire specs) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 84d0df6 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 450f4e3 (Manifest_cache true) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= ======= ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> 563720e (Featire specs) ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> c033601 (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> a71befd (Manifest_cache true) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> a71befd (Manifest_cache true) ======= >>>>>>> 51bc18c (Featire specs) ======= ======= >>>>>>> 3e9f99d (Featire specs) >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> 6fa625b (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> b3f2049 (Featire specs) ======= ======= >>>>>>> e18eb87 (Fix) >>>>>>> c8cdb08 (Manifest_cache true) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1cce66c (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 0e864a5 (Manifest_cache true) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) >>>>>>> afa56d1 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) >>>>>>> 00f8b58 (Manifest_cache true) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 15c51b7 (Featire specs) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> e18eb87 (Fix) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 3be4d14 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> e055dd0 (Rebased) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 96aecde (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 304cd28a (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= ======= >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 7bc7f9f (Manifest_cache true) >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> 563720e (Featire specs) ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> c033601 (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> bd30d038 (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 96aecde (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> d4235040 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= ======= >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4fac471d (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> c033601 (Rebased) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> b3f2049 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> 0e864a5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> cc390719 (Manifest_cache true) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= ======= ======= >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3be4d14 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1b8f36d8 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> a71befd (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8a3779d4 (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 551c6ab (Manifest_cache true) <<<<<<< HEAD >>>>>>> 56531f25 (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> fd310ed (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86229876 (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 42e9c2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> 16ebb0ff (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> c0159bf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d0f5cbf (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) <<<<<<< HEAD >>>>>>> ca274ec (Manifest_cache true) <<<<<<< HEAD >>>>>>> a56ba36d (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 0b43b18 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1cce66c (Manifest_cache true) <<<<<<< HEAD >>>>>>> d365be68 (Manifest_cache true) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 75fa7e1b (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> b97bb382 (Featire specs) ======= >>>>>>> 4a2f2ad8 (Featire specs) ======= >>>>>>> 21873de0 (Featire specs) ======= >>>>>>> 392646b5 (Featire specs) ======= >>>>>>> 1049b80c (Fix) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> 15c51b7 (Featire specs) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 1049b80c (Fix) ======= >>>>>>> f3d746cb (Featire specs) ======= <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= <<<<<<< HEAD ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> e055dd0 (Rebased) ======= ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= >>>>>>> 6e923b9d (Featire specs) ======= >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> 34509eee (Featire specs) ======= >>>>>>> e989024d (Add login registration pages) ======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 29e1af94 (Add login registration pages) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f6e20266 (Add login registration pages) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ed8ea634 (Add login registration pages) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 2be0d057 (Add login registration pages) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> e011b0df (Add login registration pages) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> b97bb382 (Featire specs) ======= >>>>>>> ff4c2fe0 (Add login registration pages) ======= >>>>>>> 4a2f2ad8 (Featire specs) ======= >>>>>>> 8f1baf1c (Add login registration pages) ======= >>>>>>> 21873de0 (Featire specs) ======= >>>>>>> dda81aa9 (Add login registration pages) ======= >>>>>>> 392646b5 (Featire specs) ======= >>>>>>> 40a3d25f (Add login registration pages) ======= >>>>>>> 1049b80c (Fix) ======= >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> 73dcd461 (Add login registration pages) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> aca90e3 (Rebased) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> 156ffe6 (Add login registration pages) ======= >>>>>>> adc21e0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) ======= >>>>>>> 793a6ed (Add login registration pages) ======= >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> c5efe8e (Add login registration pages) ======= >>>>>>> aa3618b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> c871248 (Add login registration pages) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 1d11874 (Add login registration pages) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 06e5e41 (Add login registration pages) ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> 385136b (Add login registration pages) ======= >>>>>>> 15c51b7 (Featire specs) ======= >>>>>>> 1c33e01 (Add login registration pages) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> fb61c5a (Featire specs) ======= >>>>>>> 8d4ec55 (Add login registration pages) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> f92a45b (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 03c0867 (Add login registration pages) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) ======= >>>>>>> aa3618b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 37e48018 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> c033601 (Rebased) ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD >>>>>>> 2be0d057 (Add login registration pages) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> bae2b7de (Add login registration pages) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 11792758 (Rebased) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD >>>>>>> 4976a174 (Add login registration pages) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> c871248 (Add login registration pages) <<<<<<< HEAD >>>>>>> e011b0df (Add login registration pages) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD >>>>>>> 852864e (Add login registration pages) <<<<<<< HEAD >>>>>>> 1d11874 (Add login registration pages) <<<<<<< HEAD >>>>>>> ff4c2fe0 (Add login registration pages) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 551f3c1 (Add login registration pages) <<<<<<< HEAD >>>>>>> 06e5e41 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8f1baf1c (Add login registration pages) ======= ======= ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> ccec311 (Add login registration pages) <<<<<<< HEAD >>>>>>> 385136b (Add login registration pages) <<<<<<< HEAD >>>>>>> dda81aa9 (Add login registration pages) ======= ======= ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= ======= >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> 8c3e531 (Add login registration pages) <<<<<<< HEAD >>>>>>> 1c33e01 (Add login registration pages) <<<<<<< HEAD >>>>>>> 40a3d25f (Add login registration pages) ======= ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) >>>>>>> 1049b80c (Fix) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> e011b0df (Add login registration pages) ======= >>>>>>> 8f1baf1c (Add login registration pages) >>>>>>> 9a49b7b (Rebased) ======= ======= ======= >>>>>>> c871248 (Add login registration pages) ======= >>>>>>> 06e5e41 (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 26b462d (Add login registration pages) ======= >>>>>>> 9a49b7b (Rebased) ======= ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 4976a174 (Add login registration pages) ======= ======= >>>>>>> dda81aa9 (Add login registration pages) ======= >>>>>>> 40a3d25f (Add login registration pages) ======= >>>>>>> 26b462d (Add login registration pages) ======= ======= >>>>>>> 385136b (Add login registration pages) ======= >>>>>>> 1c33e01 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> c871248 (Add login registration pages) <<<<<<< HEAD >>>>>>> e011b0df (Add login registration pages) ======= ======= ======= ======= >>>>>>> 852864e (Add login registration pages) <<<<<<< HEAD >>>>>>> 1d11874 (Add login registration pages) <<<<<<< HEAD >>>>>>> ff4c2fe0 (Add login registration pages) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 551f3c1 (Add login registration pages) <<<<<<< HEAD >>>>>>> 06e5e41 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8f1baf1c (Add login registration pages) ======= ======= ======= >>>>>>> ccec311 (Add login registration pages) <<<<<<< HEAD >>>>>>> 385136b (Add login registration pages) <<<<<<< HEAD >>>>>>> dda81aa9 (Add login registration pages) ======= ======= ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 8c3e531 (Add login registration pages) <<<<<<< HEAD >>>>>>> 1c33e01 (Add login registration pages) <<<<<<< HEAD >>>>>>> 40a3d25f (Add login registration pages) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> 715fac2 (Featire specs) >>>>>>> fb61c5a (Featire specs) >>>>>>> 73f364d8 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> e011b0df (Add login registration pages) ======= >>>>>>> ff4c2fe0 (Add login registration pages) ======= >>>>>>> 8f1baf1c (Add login registration pages) ======= >>>>>>> dda81aa9 (Add login registration pages) ======= ======= >>>>>>> 73f364d8 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> fb61c5a (Featire specs) >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ccec311 (Add login registration pages) ======= >>>>>>> 8c3e531 (Add login registration pages) >>>>>>> 1c33e01 (Add login registration pages) >>>>>>> 40a3d25f (Add login registration pages) >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= >>>>>>> aa3618b (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 512d1d87 (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> a624084 (Add login registration pages) >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> a8b17c32 (Add login registration pages) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> bc6bc8d2 (Rebased) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> ae07231a (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c12b71de (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) >>>>>>> c12b71de (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 512d1d87 (Add login registration pages) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> 40a3d25f (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 512d1d87 (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 7d58507 (Add login registration pages) >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 512d1d87 (Add login registration pages) ======= ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 03c0867 (Add login registration pages) >>>>>>> 8d4ec55 (Add login registration pages) >>>>>>> 73dcd461 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> e6fc67c7 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e60833c (Add login registration pages) ======= ======= >>>>>>> 1d11874 (Add login registration pages) ======= >>>>>>> 06e5e41 (Add login registration pages) ======= >>>>>>> 385136b (Add login registration pages) >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c871248 (Add login registration pages) ======= ======= >>>>>>> ccec311 (Add login registration pages) >>>>>>> 385136b (Add login registration pages) >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 385136b (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ed8ea634 (Add login registration pages) ======= ======= >>>>>>> 4976a174 (Add login registration pages) ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2be0d057 (Add login registration pages) ======= ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= ======= >>>>>>> aca90e3 (Rebased) >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 156ffe6 (Add login registration pages) >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= >>>>>>> aa3618b (Rebased) >>>>>>> 11792758 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> a8b17c32 (Add login registration pages) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e60833c (Add login registration pages) >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> 0561be1d (Add login registration pages) ======= ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> e60833c (Add login registration pages) >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= >>>>>>> 7d58507 (Add login registration pages) >>>>>>> c871248 (Add login registration pages) <<<<<<< HEAD >>>>>>> e011b0df (Add login registration pages) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 852864e (Add login registration pages) <<<<<<< HEAD >>>>>>> 1d11874 (Add login registration pages) <<<<<<< HEAD >>>>>>> ff4c2fe0 (Add login registration pages) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 551f3c1 (Add login registration pages) <<<<<<< HEAD >>>>>>> 06e5e41 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8f1baf1c (Add login registration pages) ======= ======= ======= >>>>>>> ccec311 (Add login registration pages) <<<<<<< HEAD >>>>>>> 385136b (Add login registration pages) <<<<<<< HEAD >>>>>>> dda81aa9 (Add login registration pages) ======= ======= ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 8c3e531 (Add login registration pages) <<<<<<< HEAD >>>>>>> 1c33e01 (Add login registration pages) <<<<<<< HEAD >>>>>>> 40a3d25f (Add login registration pages) ======= ======= ======= >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 715fac2 (Featire specs) >>>>>>> fb61c5a (Featire specs) >>>>>>> 73f364d8 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> e989024d (Add login registration pages) ======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> 29e1af94 (Add login registration pages) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f6e20266 (Add login registration pages) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ed8ea634 (Add login registration pages) ======= >>>>>>> 2be0d057 (Add login registration pages) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> e011b0df (Add login registration pages) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> ff4c2fe0 (Add login registration pages) ======= >>>>>>> 8f1baf1c (Add login registration pages) ======= >>>>>>> dda81aa9 (Add login registration pages) ======= >>>>>>> 40a3d25f (Add login registration pages) ======= >>>>>>> 1049b80c (Fix) ======= >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> 73dcd461 (Add login registration pages) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> aca90e3 (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> 156ffe6 (Add login registration pages) ======= <<<<<<< HEAD ======= >>>>>>> c5efe8e (Add login registration pages) ======= >>>>>>> aa3618b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> c871248 (Add login registration pages) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 1d11874 (Add login registration pages) ======= >>>>>>> 06e5e41 (Add login registration pages) ======= >>>>>>> 385136b (Add login registration pages) ======= >>>>>>> 1c33e01 (Add login registration pages) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> fb61c5a (Featire specs) ======= >>>>>>> 8d4ec55 (Add login registration pages) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> f92a45b (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> bae2b7de (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= >>>>>>> 793a6ed (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> c5efe8e (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= >>>>>>> aa3618b (Rebased) ======= <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> c51bf93 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> e60833c (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> ed8ea634 (Add login registration pages) ======= >>>>>>> f416f45 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 2be0d057 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> d9d85ca6 (Fix) >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> 0f8241bb (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 88d49ad (Add login registration pages) ======= ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) >>>>>>> c033601 (Rebased) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> c033601 (Rebased) >>>>>>> e3e66f3 (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> ae409ca (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 379a979 (Featire specs) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> 56fd9d41 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 37e48018 (Featire specs) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> aa3618b (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> aa4361fd (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0ed7f7c (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> cacbab9 (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f182ac7 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> 57da3ff (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> a624084 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 6a9fede (Add login registration pages) ======= >>>>>>> f416f45 (Add login registration pages) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> 57a2e05 (Add login registration pages) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> ed8ea634 (Add login registration pages) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD >>>>>>> 2be0d057 (Add login registration pages) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 610b6138 (Featire specs) >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> bae2b7de (Add login registration pages) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 56fd9d41 (Add login registration pages) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> aa3618b (Rebased) >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> cacbab9 (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f182ac7 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> 57da3ff (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> a624084 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 6a9fede (Add login registration pages) ======= >>>>>>> f416f45 (Add login registration pages) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> 57a2e05 (Add login registration pages) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> 0561be1d (Add login registration pages) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> 512d1d87 (Add login registration pages) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD >>>>>>> 4976a174 (Add login registration pages) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 0676508 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 6a9fede (Add login registration pages) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 57a2e05 (Add login registration pages) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> c871248 (Add login registration pages) <<<<<<< HEAD >>>>>>> e011b0df (Add login registration pages) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD >>>>>>> 852864e (Add login registration pages) <<<<<<< HEAD >>>>>>> 1d11874 (Add login registration pages) <<<<<<< HEAD >>>>>>> ff4c2fe0 (Add login registration pages) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 551f3c1 (Add login registration pages) <<<<<<< HEAD >>>>>>> 06e5e41 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8f1baf1c (Add login registration pages) ======= ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> ccec311 (Add login registration pages) <<<<<<< HEAD >>>>>>> 385136b (Add login registration pages) <<<<<<< HEAD >>>>>>> dda81aa9 (Add login registration pages) ======= ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> 8c3e531 (Add login registration pages) <<<<<<< HEAD >>>>>>> 1c33e01 (Add login registration pages) <<<<<<< HEAD >>>>>>> 40a3d25f (Add login registration pages) ======= ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= ======= >>>>>>> 03c0867 (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 03c0867 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8d4ec55 (Add login registration pages) <<<<<<< HEAD >>>>>>> 73dcd461 (Add login registration pages) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 75fa7e1b (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> b97bb382 (Featire specs) ======= >>>>>>> 4a2f2ad8 (Featire specs) ======= >>>>>>> 21873de0 (Featire specs) ======= >>>>>>> 392646b5 (Featire specs) ======= >>>>>>> 1049b80c (Fix) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> 15c51b7 (Featire specs) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 1049b80c (Fix) ======= >>>>>>> f3d746cb (Featire specs) ======= ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) ======= ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= >>>>>>> 6e923b9d (Featire specs) ======= >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> 34509eee (Featire specs) ======= >>>>>>> e989024d (Add login registration pages) ======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 29e1af94 (Add login registration pages) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= <<<<<<< HEAD ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> f92a45b (Featire specs) ======= ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> c871248 (Add login registration pages) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 1d11874 (Add login registration pages) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 06e5e41 (Add login registration pages) ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> 385136b (Add login registration pages) ======= >>>>>>> 15c51b7 (Featire specs) ======= >>>>>>> 1c33e01 (Add login registration pages) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> fb61c5a (Featire specs) ======= >>>>>>> 8d4ec55 (Add login registration pages) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 03c0867 (Add login registration pages) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) >>>>>>> aca90e3 (Rebased) ======= ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 6a9fede (Add login registration pages) ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> c033601 (Rebased) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD >>>>>>> 852864e (Add login registration pages) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 551f3c1 (Add login registration pages) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> ccec311 (Add login registration pages) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> 8c3e531 (Add login registration pages) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 2a25e4c (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> c033601 (Rebased) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) ======= ======= >>>>>>> 551f3c1 (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> ccec311 (Add login registration pages) ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 8c3e531 (Add login registration pages) ======= ======= <<<<<<< HEAD >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 03c0867 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 551f3c1 (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> ccec311 (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 8c3e531 (Add login registration pages) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0561be1d (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= <<<<<<< HEAD >>>>>>> ff4c2fe0 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> c5efe8e (Add login registration pages) ======= >>>>>>> aa3618b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) >>>>>>> aca90e3 (Rebased) ======= ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 6a9fede (Add login registration pages) ======= >>>>>>> 7c4ea7f (Fix) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 11792758 (Rebased) >>>>>>> c033601 (Rebased) >>>>>>> e3e66f3 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> ebcdce06 (Featire specs) ======= <<<<<<< HEAD >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> e1f4d17 (Add login registration pages) ======= ======= >>>>>>> 311e9fa (Rebased) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 31507b8 (Add login registration pages) >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> aca90e3 (Rebased) >>>>>>> c7a726c5 (Rebased) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> c5efe8e (Add login registration pages) ======= >>>>>>> aa3618b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> bae2b7de (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= >>>>>>> adc21e0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= >>>>>>> 793a6ed (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> 4d90e3d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> c5efe8e (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= >>>>>>> aa3618b (Rebased) ======= <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= >>>>>>> c51bf93 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> bf554f4 (Rebased) ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> bae2b7de (Add login registration pages) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 610b6138 (Featire specs) >>>>>>> c033601 (Rebased) >>>>>>> 6066f925 (Add login registration pages) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 11792758 (Rebased) >>>>>>> 9a49b7b (Rebased) ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD ======= ======= >>>>>>> 311e9fa (Rebased) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 1d11874 (Add login registration pages) >>>>>>> ff4c2fe0 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> c7a726c5 (Rebased) ======= ======= ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= >>>>>>> aa3618b (Rebased) >>>>>>> 11792758 (Rebased) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 1d11874 (Add login registration pages) >>>>>>> ff4c2fe0 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> e989024d (Add login registration pages) ======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 29e1af94 (Add login registration pages) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 11792758 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bae2b7de (Add login registration pages) >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> bae2b7de (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= >>>>>>> 1d11874 (Add login registration pages) ======= >>>>>>> 9e081dc (Fix) >>>>>>> 1049b80c (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> aca90e3 (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> 156ffe6 (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= >>>>>>> aa3618b (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> aa3618b (Rebased) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> ef483b6d (Fix) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> f6e20266 (Add login registration pages) ======= >>>>>>> 0561be1d (Add login registration pages) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 88d49ad (Add login registration pages) ======= ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c033601 (Rebased) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) ======= >>>>>>> c033601 (Rebased) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> c033601 (Rebased) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 379a979 (Featire specs) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 37e48018 (Featire specs) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> aa3618b (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> bc6bc8d2 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) >>>>>>> e055dd0 (Rebased) ======= <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 5507b42 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 852864e (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> ff4c2fe0 (Add login registration pages) ======= >>>>>>> 1d59aaa (Fix) ======= <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 551f3c1 (Add login registration pages) >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 21873de0 (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> 22ee41c (Add login registration pages) ======= >>>>>>> c033601 (Rebased) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> 852864e (Add login registration pages) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= ======= >>>>>>> 51bc18c (Featire specs) >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> ae07231a (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) >>>>>>> 852864e (Add login registration pages) >>>>>>> 1d11874 (Add login registration pages) ======= ======= <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 9ec6862 (Add login registration pages) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57a2e05 (Add login registration pages) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> f182ac7 (Add login registration pages) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> ed8ea634 (Add login registration pages) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD >>>>>>> 2be0d057 (Add login registration pages) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 610b6138 (Featire specs) >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> bae2b7de (Add login registration pages) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 56fd9d41 (Add login registration pages) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> aa3618b (Rebased) >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 9ec6862 (Add login registration pages) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57a2e05 (Add login registration pages) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> f182ac7 (Add login registration pages) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> 0561be1d (Add login registration pages) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> 512d1d87 (Add login registration pages) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD >>>>>>> 4976a174 (Add login registration pages) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> 659083f (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) >>>>>>> a636fda (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 0676508 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57a2e05 (Add login registration pages) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> c871248 (Add login registration pages) <<<<<<< HEAD >>>>>>> e011b0df (Add login registration pages) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD >>>>>>> 852864e (Add login registration pages) <<<<<<< HEAD >>>>>>> 1d11874 (Add login registration pages) <<<<<<< HEAD >>>>>>> ff4c2fe0 (Add login registration pages) ======= ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 551f3c1 (Add login registration pages) <<<<<<< HEAD >>>>>>> 06e5e41 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8f1baf1c (Add login registration pages) ======= ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> ccec311 (Add login registration pages) <<<<<<< HEAD >>>>>>> 385136b (Add login registration pages) <<<<<<< HEAD >>>>>>> dda81aa9 (Add login registration pages) ======= ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> 8c3e531 (Add login registration pages) <<<<<<< HEAD >>>>>>> 1c33e01 (Add login registration pages) <<<<<<< HEAD >>>>>>> 40a3d25f (Add login registration pages) ======= ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= ======= >>>>>>> 03c0867 (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 03c0867 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8d4ec55 (Add login registration pages) <<<<<<< HEAD >>>>>>> 73dcd461 (Add login registration pages) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= >>>>>>> 6e923b9d (Featire specs) ======= >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> 34509eee (Featire specs) ======= >>>>>>> e989024d (Add login registration pages) ======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 29e1af94 (Add login registration pages) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f6e20266 (Add login registration pages) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ed8ea634 (Add login registration pages) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 2be0d057 (Add login registration pages) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> e011b0df (Add login registration pages) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> b97bb382 (Featire specs) ======= >>>>>>> ff4c2fe0 (Add login registration pages) ======= >>>>>>> 4a2f2ad8 (Featire specs) ======= >>>>>>> 8f1baf1c (Add login registration pages) ======= >>>>>>> 21873de0 (Featire specs) ======= >>>>>>> dda81aa9 (Add login registration pages) ======= >>>>>>> 392646b5 (Featire specs) ======= >>>>>>> 40a3d25f (Add login registration pages) ======= >>>>>>> 1049b80c (Fix) ======= >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> 73dcd461 (Add login registration pages) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0561be1d (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> aca90e3 (Rebased) ======= <<<<<<< HEAD ======= ======= >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= >>>>>>> aa3618b (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> c871248 (Add login registration pages) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 1d11874 (Add login registration pages) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 06e5e41 (Add login registration pages) ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> 385136b (Add login registration pages) ======= >>>>>>> 15c51b7 (Featire specs) ======= >>>>>>> 1c33e01 (Add login registration pages) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> fb61c5a (Featire specs) ======= >>>>>>> 8d4ec55 (Add login registration pages) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> 0561be1d (Add login registration pages) ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= ======= ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 6a9fede (Add login registration pages) ======= ======= ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> 512d1d87 (Add login registration pages) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 6a9fede (Add login registration pages) >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> bae2b7de (Add login registration pages) ======= ======= >>>>>>> adc21e0 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 4d90e3d (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> c5efe8e (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= >>>>>>> aa3618b (Rebased) >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) >>>>>>> c871248 (Add login registration pages) <<<<<<< HEAD >>>>>>> e011b0df (Add login registration pages) ======= ======= ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 852864e (Add login registration pages) <<<<<<< HEAD >>>>>>> 1d11874 (Add login registration pages) <<<<<<< HEAD >>>>>>> ff4c2fe0 (Add login registration pages) ======= ======= ======= <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> ccec311 (Add login registration pages) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= >>>>>>> 6a9fede (Add login registration pages) >>>>>>> 8c3e531 (Add login registration pages) ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> 551f3c1 (Add login registration pages) <<<<<<< HEAD >>>>>>> 06e5e41 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8f1baf1c (Add login registration pages) ======= ======= ======= >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= ======= ======= >>>>>>> 03c0867 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8d4ec55 (Add login registration pages) <<<<<<< HEAD >>>>>>> 73dcd461 (Add login registration pages) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) ======= ======= >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> f92a45b (Featire specs) >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> fb61c5a (Featire specs) ======= >>>>>>> 22ee41c (Add login registration pages) ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 715fac2 (Featire specs) >>>>>>> fb61c5a (Featire specs) >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> 2fef4a0 (Add login registration pages) >>>>>>> 0561be1d (Add login registration pages) ======= ======= >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= ======= >>>>>>> 8d4ec55 (Add login registration pages) >>>>>>> 73dcd461 (Add login registration pages) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= >>>>>>> 0561be1d (Add login registration pages) >>>>>>> 57da3ff (Add login registration pages) ======= ======= >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) >>>>>>> 88d49ad (Add login registration pages) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 22ee41c (Add login registration pages) ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 9a49b7b (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> bae2b7de (Add login registration pages) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> a8b17c32 (Add login registration pages) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 31507b8 (Add login registration pages) >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> ae07231a (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c12b71de (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> ae07231a (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) >>>>>>> ae409ca (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= ======= >>>>>>> 57da3ff (Add login registration pages) ======= ======= >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> 03c0867 (Add login registration pages) >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 8d4ec55 (Add login registration pages) ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 06e5e41 (Add login registration pages) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) >>>>>>> c033601 (Rebased) >>>>>>> 51bc18c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> aa3618b (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> d2e6b3c (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> f182ac7 (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> f182ac7 (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) ======= ======= ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) ======= ======= >>>>>>> e54deeb (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) ======= ======= <<<<<<< HEAD ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= ======= ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> ed8ea634 (Add login registration pages) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD >>>>>>> 2be0d057 (Add login registration pages) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> aca90e3 (Rebased) <<<<<<< HEAD >>>>>>> c7a726c5 (Rebased) ======= ======= ======= <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 610b6138 (Featire specs) >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> bae2b7de (Add login registration pages) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 56fd9d41 (Add login registration pages) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> aa3618b (Rebased) >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> d2e6b3c (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> f182ac7 (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> f182ac7 (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) ======= ======= ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) ======= ======= >>>>>>> e54deeb (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) ======= ======= <<<<<<< HEAD ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> 0561be1d (Add login registration pages) ======= ======= ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> 512d1d87 (Add login registration pages) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD >>>>>>> 4976a174 (Add login registration pages) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> a636fda (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) ======= ======= >>>>>>> e54deeb (Featire specs) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) ======= ======= >>>>>>> 2ee03d3 (Featire specs) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) ======= ======= <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> c871248 (Add login registration pages) <<<<<<< HEAD >>>>>>> e011b0df (Add login registration pages) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD >>>>>>> 852864e (Add login registration pages) <<<<<<< HEAD >>>>>>> 1d11874 (Add login registration pages) <<<<<<< HEAD >>>>>>> ff4c2fe0 (Add login registration pages) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 551f3c1 (Add login registration pages) <<<<<<< HEAD >>>>>>> 06e5e41 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8f1baf1c (Add login registration pages) ======= ======= ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> ccec311 (Add login registration pages) <<<<<<< HEAD >>>>>>> 385136b (Add login registration pages) <<<<<<< HEAD >>>>>>> dda81aa9 (Add login registration pages) ======= ======= ======= ======= ======= >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 2a25e4c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> 8c3e531 (Add login registration pages) <<<<<<< HEAD >>>>>>> 1c33e01 (Add login registration pages) <<<<<<< HEAD >>>>>>> 40a3d25f (Add login registration pages) ======= ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= ======= ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 03c0867 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8d4ec55 (Add login registration pages) <<<<<<< HEAD >>>>>>> 73dcd461 (Add login registration pages) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> d365be68 (Manifest_cache true) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) >>>>>>> e6fc67c7 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> ecb02dbf (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= <<<<<<< HEAD ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4367ccb1 (Manifest_cache true) ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 4fac471d (Manifest_cache true) ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= >>>>>>> ef483b6d (Fix) >>>>>>> b28889f (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> add330c (Manifest_cache true) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 15bff2e (Manifest_cache true) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> 6c71f00 (Manifest_cache true) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 0b43b18 (Manifest_cache true) ======= >>>>>>> 2ee03d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 659083f (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) >>>>>>> 4f4ea3f9 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= >>>>>>> e59c273d (Manifest_cache true) ======= >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 7afa007b (Manifest_cache true) ======= >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= >>>>>>> d9d85ca6 (Fix) >>>>>>> b28889f (Fix) >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5a2009f1 (Fix) >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 78717cc (Manifest_cache true) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> c033601 (Rebased) ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a2206025 (Featire specs) >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 98beee2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= ======= >>>>>>> c033601 (Rebased) ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0e864a5 (Manifest_cache true) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> 1cce66c (Manifest_cache true) ======= >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> da3a9a3 (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 51bc18c (Featire specs) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 59d75f9 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 551c6ab (Manifest_cache true) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 973ba8c (Featire specs) >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd310ed (Manifest_cache true) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= >>>>>>> d782a28 (Manifest_cache true) >>>>>>> 551c6ab (Manifest_cache true) <<<<<<< HEAD >>>>>>> 56531f25 (Manifest_cache true) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= >>>>>>> fd310ed (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86229876 (Manifest_cache true) ======= ======= ======= >>>>>>> e54deeb (Featire specs) ======= <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 42e9c2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> 16ebb0ff (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) ======= <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> c0159bf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d0f5cbf (Manifest_cache true) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 94841b5 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= >>>>>>> b15044a (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) <<<<<<< HEAD >>>>>>> ca274ec (Manifest_cache true) <<<<<<< HEAD >>>>>>> a56ba36d (Manifest_cache true) ======= ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 0b43b18 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1cce66c (Manifest_cache true) <<<<<<< HEAD >>>>>>> d365be68 (Manifest_cache true) ======= ======= ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 3b03895 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> b15044a (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 98beee2 (Manifest_cache true) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= ======= >>>>>>> c033601 (Rebased) ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 59d75f9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 3b03895 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> b15044a (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> 0e864a5 (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3be4d14 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1b8f36d8 (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> a71befd (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8a3779d4 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) >>>>>>> 216fe41 (Featire specs) >>>>>>> f3d746cb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 67ab5299 (Fix) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9e081dc (Fix) >>>>>>> 1049b80c (Fix) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> c7a726c5 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= <<<<<<< HEAD >>>>>>> a5d032d (Fix) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e18eb87 (Fix) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= <<<<<<< HEAD >>>>>>> a5d032d (Fix) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) >>>>>>> 9e081dc (Fix) >>>>>>> 1049b80c (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) ======= >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) ======= >>>>>>> 9e081dc (Fix) ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> 8288136d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= >>>>>>> c8da2e3 (Fix) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8887ba5b (Fix) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> 0c57e4e (Fix) ======= <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) >>>>>>> 9e081dc (Fix) >>>>>>> 1049b80c (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> 8887ba5b (Fix) ======= >>>>>>> 8a3779d4 (Manifest_cache true) ======= >>>>>>> 1049b80c (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 21793167 (Manifest_cache true) ======= >>>>>>> d9d85ca6 (Fix) ======= <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= <<<<<<< HEAD >>>>>>> 824ea7c9 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> ef483b6d (Fix) <<<<<<< HEAD ======= ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 98beee2 (Manifest_cache true) ======= >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> bf137e4 (Manifest_cache true) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> a71befd (Manifest_cache true) ======= >>>>>>> 9e081dc (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) ======= ======= <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) >>>>>>> 8288136d (Fix) ======= >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) >>>>>>> a71befd (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8a3779d4 (Manifest_cache true) ======= ======= ======= <<<<<<< HEAD >>>>>>> 1d59aaa (Fix) >>>>>>> 9e081dc (Fix) >>>>>>> 1049b80c (Fix) ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= >>>>>>> 7375d4b (Manifest_cache true) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 78717cc (Manifest_cache true) ======= ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 98beee2 (Manifest_cache true) ======= ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 385b8df (Manifest_cache true) ======= ======= ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 7bc7f9f (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 84d0df6 (Manifest_cache true) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 450f4e3 (Manifest_cache true) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 7375d4b (Manifest_cache true) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) ======= ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4a0e3b6 (Manifest_cache true) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 7375d4b (Manifest_cache true) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 304cd28a (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 31d15e66 (Fix) ======= ======= ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 7375d4b (Manifest_cache true) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) ======= ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4a0e3b6 (Manifest_cache true) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 7375d4b (Manifest_cache true) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> bd30d038 (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> d4235040 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4fac471d (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> 7375d4b (Manifest_cache true) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 0b43b18 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 0b43b18 (Manifest_cache true) >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) ======= ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0e864a5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> cc390719 (Manifest_cache true) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= ======= ======= >>>>>>> 7375d4b (Manifest_cache true) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3be4d14 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1b8f36d8 (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> a71befd (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8a3779d4 (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 551c6ab (Manifest_cache true) <<<<<<< HEAD >>>>>>> 56531f25 (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> fd310ed (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86229876 (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 42e9c2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> 16ebb0ff (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> c0159bf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d0f5cbf (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= ======= ======= ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) <<<<<<< HEAD >>>>>>> ca274ec (Manifest_cache true) <<<<<<< HEAD >>>>>>> a56ba36d (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 0b43b18 (Manifest_cache true) >>>>>>> 1cce66c (Manifest_cache true) >>>>>>> d365be68 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> cc390719 (Manifest_cache true) ======= >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> d365be68 (Manifest_cache true) ======= >>>>>>> f92a45b (Featire specs) ======= >>>>>>> 0e864a5 (Manifest_cache true) ======= >>>>>>> fb61c5a (Featire specs) ======= >>>>>>> 1cce66c (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 251144b4 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 251144b4 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0341d6de (Manifest_cache true) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 304cd28a (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> bc757df (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 3be4d14 (Manifest_cache true) ======= >>>>>>> 551c6ab (Manifest_cache true) ======= >>>>>>> fd310ed (Manifest_cache true) ======= >>>>>>> 42e9c2e (Manifest_cache true) ======= >>>>>>> c0159bf (Manifest_cache true) ======= >>>>>>> ca274ec (Manifest_cache true) ======= >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> add330c (Manifest_cache true) ======= >>>>>>> 15bff2e (Manifest_cache true) ======= >>>>>>> 6c71f00 (Manifest_cache true) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 0b43b18 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f92a45b (Featire specs) ======= >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 1d6a89b5 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d34a0770 (Manifest_cache true) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> bd30d038 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> d4235040 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4fac471d (Manifest_cache true) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= ======= <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0e864a5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> cc390719 (Manifest_cache true) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3be4d14 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1b8f36d8 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 551c6ab (Manifest_cache true) <<<<<<< HEAD >>>>>>> 56531f25 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> fd310ed (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86229876 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 42e9c2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> 16ebb0ff (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> c0159bf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d0f5cbf (Manifest_cache true) ======= ======= ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) <<<<<<< HEAD >>>>>>> ca274ec (Manifest_cache true) <<<<<<< HEAD >>>>>>> a56ba36d (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 0b43b18 (Manifest_cache true) >>>>>>> 1cce66c (Manifest_cache true) >>>>>>> d365be68 (Manifest_cache true) >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) <<<<<<< HEAD >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 8887ba5b (Fix) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 557c1b8 (Fix) ======= <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= ======= >>>>>>> 557c1b8 (Fix) >>>>>>> 8288136d (Fix) ======= >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> bdc24a1a (Rebased) >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> 8887ba5b (Fix) >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix) ======= >>>>>>> 311e9fa (Rebased) >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> e055dd0 (Rebased) >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 1049b80c (Fix) ======= >>>>>>> f3d746cb (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 8f42922 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 3be4d14 (Manifest_cache true) >>>>>>> 1b8f36d8 (Manifest_cache true) ======= ======= >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 51bc18c (Featire specs) >>>>>>> 7b22ad7e (Featire specs) ======= ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 551c6ab (Manifest_cache true) <<<<<<< HEAD >>>>>>> 56531f25 (Manifest_cache true) ======= ======= >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> aa4361fd (Featire specs) >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd310ed (Manifest_cache true) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 1cce66c (Manifest_cache true) ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> c0159bf (Manifest_cache true) ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= >>>>>>> 02a399d (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= >>>>>>> 1b8f36d8 (Manifest_cache true) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 973ba8c (Featire specs) >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> b97bb382 (Featire specs) ======= >>>>>>> 86229876 (Manifest_cache true) ======= >>>>>>> 35d17b9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 304cd28a (Manifest_cache true) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) >>>>>>> 4fac471d (Manifest_cache true) ======= ======= ======= <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 659083f (Featire specs) ======= <<<<<<< HEAD ======= ======= >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0e864a5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> cc390719 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= >>>>>>> 3be4d14 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1b8f36d8 (Manifest_cache true) ======= ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= >>>>>>> d782a28 (Manifest_cache true) >>>>>>> 551c6ab (Manifest_cache true) <<<<<<< HEAD >>>>>>> 56531f25 (Manifest_cache true) ======= ======= >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> fd310ed (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86229876 (Manifest_cache true) ======= ======= >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> add330c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 42e9c2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> 16ebb0ff (Manifest_cache true) ======= ======= ======= >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> c0159bf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d0f5cbf (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= ======= >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 6c71f00 (Manifest_cache true) <<<<<<< HEAD >>>>>>> ca274ec (Manifest_cache true) <<<<<<< HEAD >>>>>>> a56ba36d (Manifest_cache true) ======= ======= ======= >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 0b43b18 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1cce66c (Manifest_cache true) <<<<<<< HEAD >>>>>>> d365be68 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> c7a726c5 (Rebased) ======= ======= ======= >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> d8dd3b4a (Featire specs) ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> b97bb382 (Featire specs) ======= >>>>>>> 4a2f2ad8 (Featire specs) ======= >>>>>>> 21873de0 (Featire specs) ======= >>>>>>> 392646b5 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> 15c51b7 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> b904d7ae (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 659083f (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c7a726c5 (Rebased) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= <<<<<<< HEAD >>>>>>> bd30d038 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) >>>>>>> b3f2049 (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= >>>>>>> 02a399d (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> bd30d038 (Manifest_cache true) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 35d17b9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d4235040 (Manifest_cache true) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> c12b71de (Featire specs) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 75fa7e1b (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> b97bb382 (Featire specs) ======= >>>>>>> 4a2f2ad8 (Featire specs) ======= >>>>>>> 21873de0 (Featire specs) ======= >>>>>>> 392646b5 (Featire specs) ======= >>>>>>> 1049b80c (Fix) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> 15c51b7 (Featire specs) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> f92a45b (Featire specs) ======= >>>>>>> fb61c5a (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) ======= ======= >>>>>>> 715fac2 (Featire specs) >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> ebcdce06 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 73f364d8 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= >>>>>>> 715fac2 (Featire specs) >>>>>>> fb61c5a (Featire specs) >>>>>>> 73f364d8 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= >>>>>>> fb61c5a (Featire specs) >>>>>>> 73f364d8 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 6da9530 (Featire specs) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) >>>>>>> fb61c5a (Featire specs) >>>>>>> 73f364d8 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> c7a726c5 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 02a399d (Manifest_cache true) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> e055dd0 (Rebased) >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9e081dc (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 563720e (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 51bc18c (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 973ba8c (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= >>>>>>> 551c6ab (Manifest_cache true) <<<<<<< HEAD >>>>>>> 56531f25 (Manifest_cache true) ======= ======= >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= >>>>>>> fd310ed (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86229876 (Manifest_cache true) ======= ======= >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= >>>>>>> 42e9c2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> 16ebb0ff (Manifest_cache true) ======= ======= >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= >>>>>>> c0159bf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d0f5cbf (Manifest_cache true) ======= ======= >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= >>>>>>> ca274ec (Manifest_cache true) <<<<<<< HEAD >>>>>>> a56ba36d (Manifest_cache true) ======= ======= >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= >>>>>>> 1cce66c (Manifest_cache true) <<<<<<< HEAD >>>>>>> d365be68 (Manifest_cache true) ======= ======= >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 0e864a5 (Manifest_cache true) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 551c6ab (Manifest_cache true) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> fd310ed (Manifest_cache true) ======= ======= >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) ======= ======= >>>>>>> add330c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 42e9c2e (Manifest_cache true) ======= ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) ======= ======= >>>>>>> 15bff2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> c0159bf (Manifest_cache true) ======= ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) ======= ======= >>>>>>> 6c71f00 (Manifest_cache true) <<<<<<< HEAD >>>>>>> ca274ec (Manifest_cache true) ======= ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) ======= ======= >>>>>>> 0b43b18 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1cce66c (Manifest_cache true) ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 02a399d (Manifest_cache true) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 551c6ab (Manifest_cache true) ======= >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 0ed7f7c (Featire specs) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 304cd28a (Manifest_cache true) ======= ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 11792758 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 4bf888bf (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= ======= >>>>>>> 31d15e66 (Fix) ======= ======= ======= >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 563720e (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 02a399d (Manifest_cache true) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> bd30d038 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> d4235040 (Manifest_cache true) ======= ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4fac471d (Manifest_cache true) ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> b3f2049 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0e864a5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> cc390719 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3be4d14 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1b8f36d8 (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> a71befd (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8a3779d4 (Manifest_cache true) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 551c6ab (Manifest_cache true) <<<<<<< HEAD >>>>>>> 56531f25 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> fd310ed (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86229876 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> add330c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 42e9c2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> 16ebb0ff (Manifest_cache true) ======= ======= ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 15bff2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> c0159bf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d0f5cbf (Manifest_cache true) ======= ======= ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= ======= >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) <<<<<<< HEAD >>>>>>> ca274ec (Manifest_cache true) <<<<<<< HEAD >>>>>>> a56ba36d (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 0b43b18 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1cce66c (Manifest_cache true) <<<<<<< HEAD >>>>>>> d365be68 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> 15c51b7 (Featire specs) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) <<<<<<< HEAD >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 973ba8c (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> d365be68 (Manifest_cache true) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> f92a45b (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> fb61c5a (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 1cce66c (Manifest_cache true) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> cc390719 (Manifest_cache true) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 8887ba5b (Fix) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 1b8f36d8 (Manifest_cache true) ======= >>>>>>> 8a3779d4 (Manifest_cache true) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> 56531f25 (Manifest_cache true) ======= >>>>>>> b97bb382 (Featire specs) ======= >>>>>>> 86229876 (Manifest_cache true) ======= >>>>>>> 4a2f2ad8 (Featire specs) ======= >>>>>>> 16ebb0ff (Manifest_cache true) ======= >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= >>>>>>> 21873de0 (Featire specs) ======= >>>>>>> 1d0f5cbf (Manifest_cache true) ======= >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= >>>>>>> 392646b5 (Featire specs) ======= >>>>>>> a56ba36d (Manifest_cache true) ======= >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1049b80c (Fix) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ed7f7c (Featire specs) >>>>>>> ecb02dbf (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0e864a5 (Manifest_cache true) >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= >>>>>>> 3be4d14 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1b8f36d8 (Manifest_cache true) ======= ======= >>>>>>> a71befd (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8a3779d4 (Manifest_cache true) ======= ======= >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= >>>>>>> 551c6ab (Manifest_cache true) <<<<<<< HEAD >>>>>>> 56531f25 (Manifest_cache true) ======= ======= >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= >>>>>>> fd310ed (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86229876 (Manifest_cache true) ======= ======= >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= >>>>>>> 42e9c2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> 16ebb0ff (Manifest_cache true) ======= ======= >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= >>>>>>> c0159bf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d0f5cbf (Manifest_cache true) ======= ======= >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= >>>>>>> ca274ec (Manifest_cache true) <<<<<<< HEAD >>>>>>> a56ba36d (Manifest_cache true) ======= ======= >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9e081dc (Fix) >>>>>>> 1049b80c (Fix) >>>>>>> b3f2049 (Featire specs) ======= >>>>>>> e18eb87 (Fix) >>>>>>> 99dad91f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= >>>>>>> cc390719 (Manifest_cache true) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 8887ba5b (Fix) ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 1b8f36d8 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= >>>>>>> 8a3779d4 (Manifest_cache true) ======= >>>>>>> 7b22ad7e (Featire specs) ======= <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= >>>>>>> 56531f25 (Manifest_cache true) ======= >>>>>>> b97bb382 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 304cd28a (Manifest_cache true) ======= ======= >>>>>>> 86229876 (Manifest_cache true) ======= >>>>>>> 4a2f2ad8 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 610b6138 (Featire specs) ======= <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) >>>>>>> bc6bc8d2 (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) >>>>>>> 8288136d (Fix) ======= ======= <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) >>>>>>> d52f9efe (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> d34a0770 (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) >>>>>>> ae07231a (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) >>>>>>> bd30d038 (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> c12b71de (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> d4235040 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 8cbdfeb (Manifest_cache true) >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 64dceec (Manifest_cache true) >>>>>>> 4fac471d (Manifest_cache true) ======= ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= >>>>>>> 0e864a5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> cc390719 (Manifest_cache true) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> 3be4d14 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1b8f36d8 (Manifest_cache true) ======= ======= >>>>>>> a71befd (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8a3779d4 (Manifest_cache true) ======= ======= ======= <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= >>>>>>> 551c6ab (Manifest_cache true) <<<<<<< HEAD >>>>>>> 56531f25 (Manifest_cache true) ======= ======= ======= <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= >>>>>>> fd310ed (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86229876 (Manifest_cache true) ======= ======= ======= <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 42e9c2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> 16ebb0ff (Manifest_cache true) ======= ======= ======= <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> c0159bf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d0f5cbf (Manifest_cache true) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= ======= ======= <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) <<<<<<< HEAD >>>>>>> ca274ec (Manifest_cache true) <<<<<<< HEAD >>>>>>> a56ba36d (Manifest_cache true) ======= ======= ======= <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= ======= ======= <<<<<<< HEAD >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 0b43b18 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1cce66c (Manifest_cache true) <<<<<<< HEAD >>>>>>> d365be68 (Manifest_cache true) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> df37394 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 715fac2 (Featire specs) >>>>>>> fb61c5a (Featire specs) >>>>>>> 73f364d8 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= >>>>>>> fb61c5a (Featire specs) >>>>>>> 73f364d8 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) >>>>>>> 73f364d8 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= ======= <<<<<<< HEAD ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d52f9efe (Featire specs) >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d34a0770 (Manifest_cache true) >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824ea7c9 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae07231a (Featire specs) >>>>>>> 307f31f (Manifest_cache true) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bd30d038 (Manifest_cache true) >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c12b71de (Featire specs) >>>>>>> d782a28 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d4235040 (Manifest_cache true) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> b3f2049 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) >>>>>>> 1d6a89b5 (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> d34a0770 (Manifest_cache true) ======= >>>>>>> 307f31f (Manifest_cache true) >>>>>>> 824ea7c9 (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> ae07231a (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) >>>>>>> bd30d038 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> c12b71de (Featire specs) ======= >>>>>>> d4235040 (Manifest_cache true) >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> b3f2049 (Featire specs) >>>>>>> 9d98d9ab (Featire specs) >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) >>>>>>> f92a45b (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) >>>>>>> add330c (Manifest_cache true) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 0b43b18 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 2ee03d3 (Featire specs) >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 5506bd0 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= >>>>>>> e989024d (Add login registration pages) ======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= >>>>>>> f6e20266 (Add login registration pages) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= >>>>>>> ed8ea634 (Add login registration pages) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2be0d057 (Add login registration pages) ======= >>>>>>> d9d85ca6 (Fix) ======= <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> 73dcd461 (Add login registration pages) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> aca90e3 (Rebased) ======= ======= <<<<<<< HEAD ======= >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) ======= >>>>>>> 4d90e3d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= >>>>>>> c5efe8e (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> aa3618b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> fb61c5a (Featire specs) ======= >>>>>>> 8d4ec55 (Add login registration pages) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= >>>>>>> 8f1baf1c (Add login registration pages) ======= >>>>>>> 21873de0 (Featire specs) ======= >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= >>>>>>> dda81aa9 (Add login registration pages) ======= >>>>>>> 392646b5 (Featire specs) ======= >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= >>>>>>> 40a3d25f (Add login registration pages) ======= >>>>>>> 1049b80c (Fix) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 49e8a6c (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> e60833c (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> aa3618b (Rebased) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 6da9530 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> f92a45b (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> 551f3c1 (Add login registration pages) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> ccec311 (Add login registration pages) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 8c3e531 (Add login registration pages) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 03c0867 (Add login registration pages) ======= >>>>>>> 5506bd0 (Featire specs) ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 8249ff3c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD >>>>>>> 73dcd461 (Add login registration pages) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) >>>>>>> b5ac3004 (Featire specs) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 11792758 (Rebased) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> c033601 (Rebased) >>>>>>> 8249ff3c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) ======= >>>>>>> 9a49b7b (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 512d1d87 (Add login registration pages) >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b904d7ae (Featire specs) >>>>>>> e60833c (Add login registration pages) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4976a174 (Add login registration pages) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ef483b6d (Fix) >>>>>>> f416f45 (Add login registration pages) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> a8b17c32 (Add login registration pages) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> bc6bc8d2 (Rebased) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> e60833c (Add login registration pages) >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= >>>>>>> f416f45 (Add login registration pages) >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> c871248 (Add login registration pages) <<<<<<< HEAD >>>>>>> e011b0df (Add login registration pages) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 551f3c1 (Add login registration pages) <<<<<<< HEAD >>>>>>> 06e5e41 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8f1baf1c (Add login registration pages) ======= ======= ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> ccec311 (Add login registration pages) <<<<<<< HEAD >>>>>>> 385136b (Add login registration pages) <<<<<<< HEAD >>>>>>> dda81aa9 (Add login registration pages) ======= ======= ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> 8c3e531 (Add login registration pages) <<<<<<< HEAD >>>>>>> 1c33e01 (Add login registration pages) <<<<<<< HEAD >>>>>>> 40a3d25f (Add login registration pages) ======= ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> bdc24a1a (Rebased) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> e055dd0 (Rebased) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= >>>>>>> c871248 (Add login registration pages) <<<<<<< HEAD >>>>>>> e011b0df (Add login registration pages) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= ======= ======= >>>>>>> 03c0867 (Add login registration pages) >>>>>>> 8d4ec55 (Add login registration pages) >>>>>>> 73dcd461 (Add login registration pages) <<<<<<< HEAD >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ef483b6d (Fix) ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) ======= >>>>>>> 26b462d (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> aca90e3 (Rebased) ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) >>>>>>> a8b17c32 (Add login registration pages) >>>>>>> 9bfbd88 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> f92a45b (Featire specs) ======= ======= >>>>>>> 715fac2 (Featire specs) >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0561be1d (Add login registration pages) ======= ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) ======= >>>>>>> 26b462d (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> e1f4d17 (Add login registration pages) ======= >>>>>>> 4552227 (Featire specs) ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) ======= >>>>>>> 26b462d (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1049b80c (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> e1f4d17 (Add login registration pages) ======= ======= >>>>>>> 03c0867 (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 715fac2 (Featire specs) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 03c0867 (Add login registration pages) ======= >>>>>>> 5506bd0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 0561be1d (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e1f4d17 (Add login registration pages) ======= <<<<<<< HEAD ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 5b7749a (Fix) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD ======= ======= >>>>>>> ebcdce06 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f92a45b (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 6da9530 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9e081dc (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) >>>>>>> b28889f (Fix) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD ======= ======= >>>>>>> e055dd0 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> e18eb87 (Fix) ======= >>>>>>> 7c4ea7f (Fix) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= ======= ======= ======= >>>>>>> e18eb87 (Fix) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 5507b42 (Featire specs) ======= ======= ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> aca90e3 (Rebased) <<<<<<< HEAD >>>>>>> c7a726c5 (Rebased) ======= ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 88d49ad (Add login registration pages) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5b7749a (Fix) ======= ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= ======= >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> b28889f (Fix) >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= ======= >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 0c57e4e (Fix) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) ======= ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 1d11874 (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> e18eb87 (Fix) ======= ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> bae2b7de (Add login registration pages) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> f182ac7 (Add login registration pages) >>>>>>> 852864e (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 7c4ea7f (Fix) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> f182ac7 (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> f182ac7 (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 9ec6862 (Add login registration pages) >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= >>>>>>> f182ac7 (Add login registration pages) >>>>>>> 852864e (Add login registration pages) >>>>>>> 1d11874 (Add login registration pages) >>>>>>> ff4c2fe0 (Add login registration pages) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= ======= ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> 0c57e4e (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> e18eb87 (Fix) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 9e081dc (Fix) >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> 8887ba5b (Fix) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 5e31aeb (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) >>>>>>> afa56d1 (Featire specs) >>>>>>> e1ecabbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> ecb02dbf (Featire specs) >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> e18eb87 (Fix) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) ======= ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> 1d59aaa (Fix) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) ======= ======= ======= >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) ======= ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) ======= ======= >>>>>>> 2ee03d3 (Featire specs) >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 973ba8c (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 8181d13 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 2ee03d3 (Featire specs) >>>>>>> afa56d1 (Featire specs) >>>>>>> e1ecabbe (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 0c57e4e (Fix) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) >>>>>>> afa56d1 (Featire specs) >>>>>>> e1ecabbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> ecb02dbf (Featire specs) >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> e18eb87 (Fix) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> 216fe41 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) ======= ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> 1d59aaa (Fix) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) ======= ======= ======= >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) ======= ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) ======= ======= >>>>>>> 2ee03d3 (Featire specs) >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 973ba8c (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 8181d13 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 2ee03d3 (Featire specs) >>>>>>> afa56d1 (Featire specs) >>>>>>> e1ecabbe (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 0c57e4e (Fix) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) >>>>>>> afa56d1 (Featire specs) >>>>>>> e1ecabbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9e081dc (Fix) <<<<<<< HEAD ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 9e081dc (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> af057e3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> d52f9efe (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 7c4ea7f (Fix) ======= ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 659083f (Featire specs) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 9e081dc (Fix) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 0c57e4e (Fix) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) >>>>>>> afa56d1 (Featire specs) >>>>>>> e1ecabbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> fb61c5a (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 715fac2 (Featire specs) >>>>>>> fb61c5a (Featire specs) >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 730a8ca (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e1f4d17 (Add login registration pages) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> aca90e3 (Rebased) ======= >>>>>>> c033601 (Rebased) >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> c033601 (Rebased) >>>>>>> 84003439 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 730a8ca (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 7a02bbe (Featire specs) ======= <<<<<<< HEAD >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e1f4d17 (Add login registration pages) ======= <<<<<<< HEAD ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> c033601 (Rebased) >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) >>>>>>> b28889f (Fix) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 5507b42 (Featire specs) ======= ======= ======= >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> aca90e3 (Rebased) ======= ======= <<<<<<< HEAD ======= >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 88d49ad (Add login registration pages) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5b7749a (Fix) ======= ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> a5d032d (Fix) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 9ec6862 (Add login registration pages) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> f182ac7 (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> f182ac7 (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 67ab5299 (Fix) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> c8da2e3 (Fix) >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 5b7749a (Fix) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> bf05825 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> d8dd3b4a (Featire specs) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 67ab5299 (Fix) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> c8da2e3 (Fix) >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 5b7749a (Fix) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> bf05825 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> d8dd3b4a (Featire specs) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 67ab5299 (Fix) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> c8da2e3 (Fix) >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> af057e3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> f136376a (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> d8dd3b4a (Featire specs) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 84809242 (Featire specs) >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> fb61c5a (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8d4ec55 (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a5d032d (Fix) >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= ======= ======= >>>>>>> 03c0867 (Add login registration pages) >>>>>>> 8d4ec55 (Add login registration pages) >>>>>>> 73dcd461 (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> aca90e3 (Rebased) <<<<<<< HEAD ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> c033601 (Rebased) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> c033601 (Rebased) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> c033601 (Rebased) >>>>>>> e3e66f3 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> 6da9530 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) ======= ======= >>>>>>> 2ee03d3 (Featire specs) >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 3be4d14 (Manifest_cache true) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> b719333 (Manifest_cache true) ======= >>>>>>> d52f9efe (Featire specs) ======= ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> d34a0770 (Manifest_cache true) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e1ecabbe (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= >>>>>>> e6fc67c7 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> d34a0770 (Manifest_cache true) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> e6fc67c7 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= >>>>>>> 3be4d14 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1b8f36d8 (Manifest_cache true) ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> e1ecabbe (Featire specs) <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> fd6db03 (Manifest_cache true) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 9620751 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 4552227 (Featire specs) ======= >>>>>>> 998f08d (Manifest_cache true) ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c59d1a99 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> ebcdce06 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 9620751 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 4552227 (Featire specs) ======= >>>>>>> 998f08d (Manifest_cache true) ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) ======= >>>>>>> 6da9530 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> b3f2049 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) ======= ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> b3f2049 (Featire specs) ======= <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0e864a5 (Manifest_cache true) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= >>>>>>> 9620751 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> f182ac7 (Add login registration pages) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> fd6db03 (Manifest_cache true) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> 4552227 (Featire specs) ======= >>>>>>> 998f08d (Manifest_cache true) ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 0b43b18 (Manifest_cache true) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> b97bb382 (Featire specs) ======= >>>>>>> 4a2f2ad8 (Featire specs) ======= >>>>>>> 21873de0 (Featire specs) ======= >>>>>>> 392646b5 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= ======= >>>>>>> 77d62af (Featire specs) >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> ae409ca (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 610b6138 (Featire specs) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> aa3618b (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 36356d3 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> aca90e3 (Rebased) >>>>>>> c7a726c5 (Rebased) ======= ======= >>>>>>> 37e48018 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> aa3618b (Rebased) >>>>>>> 11792758 (Rebased) ======= ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 36356d3 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= ======= >>>>>>> 0ed7f7c (Featire specs) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 5506bd0 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= <<<<<<< HEAD >>>>>>> c033601 (Rebased) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5506bd0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 0b43b18 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> cc390719 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f92a45b (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 0e864a5 (Manifest_cache true) ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) ======= ======= ======= >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> 251144b4 (Manifest_cache true) >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) >>>>>>> 393eff3b (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 73f364d8 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= >>>>>>> 715fac2 (Featire specs) >>>>>>> fb61c5a (Featire specs) >>>>>>> 73f364d8 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> e055dd0 (Rebased) >>>>>>> bdc24a1a (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 311e9fa (Rebased) >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> e055dd0 (Rebased) >>>>>>> bdc24a1a (Rebased) >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> 4a2f2ad8 (Featire specs) ======= >>>>>>> 21873de0 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) <<<<<<< HEAD ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b904d7ae (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) >>>>>>> 72b9cab (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) >>>>>>> 15c51b7 (Featire specs) ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= ======= >>>>>>> afa56d1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) ======= ======= >>>>>>> 2ee03d3 (Featire specs) >>>>>>> afa56d1 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774fd (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c033601 (Rebased) ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ef483b6d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= ======= ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 78717cc (Manifest_cache true) ======= ======= ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 98beee2 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> add330c (Manifest_cache true) <<<<<<< HEAD >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= ======= >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> aa4361fd (Featire specs) >>>>>>> b3f2049 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bd30d038 (Manifest_cache true) ======= >>>>>>> 7b22ad7e (Featire specs) ======= ======= >>>>>>> 551c6ab (Manifest_cache true) >>>>>>> 56531f25 (Manifest_cache true) >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> 56531f25 (Manifest_cache true) ======= ======= >>>>>>> 973ba8c (Featire specs) >>>>>>> b97bb382 (Featire specs) >>>>>>> d782a28 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d4235040 (Manifest_cache true) ======= >>>>>>> b97bb382 (Featire specs) ======= ======= >>>>>>> fd310ed (Manifest_cache true) >>>>>>> 86229876 (Manifest_cache true) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b3f2049 (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> b3f2049 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) >>>>>>> 1d6a89b5 (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> ae07231a (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) >>>>>>> bd30d038 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> c12b71de (Featire specs) ======= >>>>>>> d4235040 (Manifest_cache true) ======= >>>>>>> 86229876 (Manifest_cache true) ======= >>>>>>> 1049b80c (Fix) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 385b8df (Manifest_cache true) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7bc7f9f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 7bc7f9f (Manifest_cache true) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 84d0df6 (Manifest_cache true) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824ea7c9 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 824ea7c9 (Manifest_cache true) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 450f4e3 (Manifest_cache true) ======= ======= ======= <<<<<<< HEAD ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 307f31f (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 6fa625b (Manifest_cache true) ======= ======= <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> b3f2049 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> b3f2049 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) >>>>>>> 0e864a5 (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) >>>>>>> 551c6ab (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> fd310ed (Manifest_cache true) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) >>>>>>> 9e081dc (Fix) <<<<<<< HEAD ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 304cd28a (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= ======= >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 7bc7f9f (Manifest_cache true) >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 37e48018 (Featire specs) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4d90e3d (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) >>>>>>> 31d15e66 (Fix) ======= ======= ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 307f31f (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 6fa625b (Manifest_cache true) ======= ======= <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> bd30d038 (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> d4235040 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= ======= >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4fac471d (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 307f31f (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) ======= ======= ======= >>>>>>> 6fa625b (Manifest_cache true) ======= ======= <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) >>>>>>> d782a28 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 715fac2 (Featire specs) >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 0b43b18 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0e864a5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> cc390719 (Manifest_cache true) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3be4d14 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1b8f36d8 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> a71befd (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8a3779d4 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 551c6ab (Manifest_cache true) <<<<<<< HEAD >>>>>>> 56531f25 (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> fd310ed (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86229876 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 42e9c2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> 16ebb0ff (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> c0159bf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d0f5cbf (Manifest_cache true) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) >>>>>>> 0b43b18 (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) <<<<<<< HEAD >>>>>>> ca274ec (Manifest_cache true) <<<<<<< HEAD >>>>>>> a56ba36d (Manifest_cache true) ======= ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0b43b18 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1cce66c (Manifest_cache true) <<<<<<< HEAD >>>>>>> d365be68 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> b97bb382 (Featire specs) ======= >>>>>>> 4a2f2ad8 (Featire specs) ======= >>>>>>> 21873de0 (Featire specs) ======= >>>>>>> 392646b5 (Featire specs) ======= >>>>>>> 1049b80c (Fix) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> 0676508 (Featire specs) >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> 15c51b7 (Featire specs) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> b97bb382 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> d52f9efe (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 2612be03 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 973ba8c (Featire specs) >>>>>>> b97bb382 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 973ba8c (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
File % covered Lines Relevant Lines Lines covered Lines missed Avg. Hits / Line
app/controllers/application_controller.rb100.00 % 2 1app/admin/admin_users.rb 40.00 % 27 20 8 12 0.40
app/admin/authors.rbapp/controllers/application_controller.rb100.00 % 36 22 22 0 1.95app/controllers/application_controller.rbapp/controllers/application_controller.rbapp/controllers/application_controller.rb 100.00 % 2 1 1 0 1.00
app/admin/books.rb 100.00 % 57 41 41 0 2.49
app/admin/categories.rb 100.00 % 31 18 18 0 2.17
app/admin/dashboard.rb 42.86 % 14 7 3 4 4.71app/controllers/books_controller.rb 100.00 % 28 14 14 0 13.86app/controllers/books_controller.rb 100.00 % 24 12 12 0 13.50
app/controllers/home_controller.rb 100.00 % 12 7 7 0 1.86
app/decorators/author_decorator.rb100.00 % 7 4 4 0 1.50
app/decorators/book_decorator.rb 100.00 % 18 10 10 0 12.90
app/decorators/category_decorator.rb 100.00 % 3 2 2 0 1.00
app/decorators/paginating_decorator.rb 100.00 % 3 2 21 1app/controllers/books_controller.rb 100.00 % 28 14 14 013.8640.91 % 36 22 9 13 0.41100.00 % 36 22 22 0 1.950 1.0013.3613.860 1.00
app/controllers/home_controller.rb 100.00 % 12 7 7 0 1.86
app/decorators/author_decorator.rb100.00 % 7 4 4 0 1.50
app/decorators/book_decorator.rb 100.00 % 18 10 10 012.9012.7012.90
app/decorators/category_decorator.rb 100.00 % 3 2 2 0 1.00
app/decorators/paginating_decorator.rb 100.00 % 3 2 20 1.00
app/admin/books.rb 100.00 %app/admin/books.rb 100.00 %57 41 41 0 2.4977 51 51 0 4.20app/admin/books.rb 100.00 % 77 51app/admin/books.rb 100.00 % 77 5111 40 0.2251 0 4.20
app/admin/categories.rb 100.00 % 31 18 18 0 2.17
app/admin/coupons.rbapp/admin/dashboard.rb 42.86 % 14 7 3 4 4.71
app/controllers/application_controller.rb100.00 % 3 2 2app/controllers/application_controller.rbapp/decorators/author_decorator.rb100.00 % 7 4 4 0 1.25
app/decorators/book_decorator.rb 90.00 % 18 10 9 1 0.90
app/decorators/category_decorator.rb 100.00 % 5 2 21 1app/controllers/application_controller.rbapp/decorators/author_decorator.rb100.00 % 7 4 4 0 1.25
app/decorators/book_decorator.rb 90.00 % 18 10 9 1 0.90
app/decorators/category_decorator.rb 100.00 % 5 2 21 1app/controllers/application_controller.rb 100.00 % 2 1 10 1.00
app/admin/dashboard.rb42.86 % 14 7 3 44.715.864.71
app/controllers/application_controller.rb100.00 % 2 1app/admin/admin_users.rb 40.00 % 27 20 8 12 0.401app/controllers/application_controller.rb 100.00 % 2 1 10 1.00
app/admin/authors.rbapp/controllers/application_controller.rb100.00 % 36 22 22 0 1.95app/controllers/application_controller.rb100.00 % 2 1 1app/controllers/books_controller.rb 93.33 % 30 15 1414 013.8640.91 % 36 22 9 13 0.41100.00 % 36 22 22 0 1.9513.361 14.13
app/controllers/home_controller.rb 100.00 % 12 7 7 0 6.14
app/controllers/reviews_controller.rb 100.00 % 17 9 9 0 1.33
app/controllers/users_controller.rb 86.67 % 31 15 13 2 2.93
app/decorators/author_decorator.rbapp/decorators/author_decorator.rb100.00 % 7 4 4 0 1.50
app/decorators/book_decorator.rb 100.00 % 23 12 12 012.9012.70
app/decorators/category_decorator.rb 100.00 % 3 2 2 0 1.0024.50
app/decorators/paginating_decorator.rb 100.00 % 3 2 20 1.00
app/admin/books.rb 100.00 %57 41 41 0 2.4977 51 51 0 4.20app/admin/books.rb 100.00 % 77 5111 40 0.2251 0 4.20
app/admin/categories.rb 100.00 % 31 18 18 0 2.17
app/admin/dashboard.rb 42.86 % 14 7 3 44.715.86
app/controllers/application_controller.rbapp/controllers/application_controller.rb 100.00 % 2 1app/admin/admin_users.rb 40.00 % 27 20 8 12 0.401app/controllers/application_controller.rb 100.00 % 21 1app/controllers/application_controller.rbapp/decorators/author_decorator.rb100.00 % 7 4 4 01.25
app/decorators/book_decorator.rb 90.00 % 18 10 9 1 0.90
app/decorators/category_decorator.rb 100.00 % 5 2 21 11 1app/controllers/application_controller.rb 100.00 % 2 1 10 1.0013.86app/controllers/books_controller.rb100.00 % 24 12 12 0 13.500.435.86app/controllers/books_controller.rb 100.00 % 28 14 14 013.3613.86app/controllers/books_controller.rb 100.00 % 24 12 12 0 13.50
app/controllers/books_controller.rb93.75 % 31 1693.33 % 3015 113.9414.13app/controllers/books_controller.rb100.00 % 24 12 12 0 13.50
app/controllers/home_controller.rb 100.00 % 12 7 7 06.14
app/controllers/reviews_controller.rb 100.00 % 19 10 10 0 1.30
app/controllers/users_controller.rb 86.67 % 31 15 13 2 2.931.86
app/decorators/author_decorator.rb 100.00 % 7 4 4 0 1.50
app/decorators/book_decorator.rb 100.00 % 23 1212 024.500.90
app/decorators/category_decorator.rb 100.00 % 5 2 2app/controllers/application_controller.rb 100.00 % 2 1 10 1.00
app/admin/authors.rbapp/controllers/books_controller.rbapp/controllers/application_controller.rbapp/controllers/application_controller.rb100.00 % 36 2222 0 1.95app/controllers/application_controller.rbapp/controllers/application_controller.rbapp/controllers/books_controller.rbapp/controllers/books_controller.rb 100.00 % 28 14 14 0 13.8640.91 % 36 22 9 13 0.41100.00 % 36 22 22 0 1.95app/controllers/application_controller.rbapp/controllers/books_controller.rb 100.00 % 28 14 14 0 13.86app/controllers/books_controller.rbapp/controllers/books_controller.rb100.00 % 24 12 12 0 13.50
app/controllers/home_controller.rb 100.00 % 12 7 7 0 1.86
app/decorators/author_decorator.rb100.00 % 7 4 4 0 1.50
app/decorators/book_decorator.rb 100.00 % 18 10 10 0 12.90
app/decorators/category_decorator.rb 100.00 % 3 2 2 0 1.00
app/decorators/paginating_decorator.rb 100.00 % 3 2 2 0 1.00
app/controllers/home_controller.rb 100.00 % 12 7 7 0 1.86
app/decorators/author_decorator.rb100.00 % 28 14 14 013.86app/controllers/books_controller.rb 100.00 % 24 12 12 0 13.50app/controllers/application_controller.rb 100.00 %1.50
app/decorators/book_decorator.rb 100.00 % 18 10 10 0 12.90
app/decorators/category_decorator.rb 100.00 % 3 2 2 0 1.00
app/decorators/paginating_decorator.rb 100.00 % 3 22 1 1 0 1.00
app/admin/books.rb 100.00 % 77 51 51 0 4.20
app/admin/categories.rb 100.00 % 31 18 18 0 2.17
app/admin/coupons.rb 100.00 % 3 2 2 0 1.00
app/admin/dashboard.rb42.86 % 14 7 3 44.71app/controllers/books_controller.rb 100.00 % 28 14 14 0 13.86app/controllers/books_controller.rb 100.00 % 24 12 12 0 13.500.435.86app/controllers/books_controller.rb 100.00 % 28 14 14 013.3613.86
app/controllers/home_controller.rb 100.00 % 12 7 7 0 1.86
app/decorators/author_decorator.rbapp/controllers/application_controller.rb100.00 % 2 1 1app/controllers/application_controller.rb 100.00 % 21 1app/controllers/application_controller.rbapp/decorators/author_decorator.rb100.00 % 7 4 4 01.25
app/decorators/book_decorator.rb 90.00 % 18 10 9 1 0.90
app/decorators/category_decorator.rb 100.00 % 5 2 21 11 10 1.0013.86app/controllers/books_controller.rb 100.00 % 24 12 12 0 13.500.435.86
app/controllers/books_controller.rb93.75 % 31 1693.33 % 3015 113.9414.13app/controllers/books_controller.rbapp/controllers/books_controller.rbapp/controllers/books_controller.rbapp/controllers/books_controller.rb100.00 % 24 12 12 013.5013.5013.8613.5013.50
app/controllers/home_controller.rb 100.00 % 12 7 7 06.14
app/controllers/reviews_controller.rb 100.00 % 19 10 10 0 1.30
app/controllers/users_controller.rb 86.67 % 31 15 13 2 2.931.86app/controllers/application_controller.rbapp/decorators/author_decorator.rb100.00 % 7 4 4 0 1.50
app/decorators/book_decorator.rb 100.00 %44.44 %18 9 4 5 4.67
app/admin/orders.rb 100.00 % 3 2 2 0 1.00
app/controllers/application_controller.rb 100.00 % 15 10 10 0 47.20
app/decorators/book_decorator.rb 90.00 % 18 10 9 1 0.90
app/decorators/category_decorator.rb 100.00 % 5 2 21 10 1.00
app/controllers/books_controller.rb 93.75 % 31 16 15 1 14.94
app/controllers/coupons_controller.rb 100.00 % 14 8 8 0 2.88
app/controllers/home_controller.rb 100.00 % 12 7 7 0 6.14
app/controllers/order_books_controller.rb 80.65 % 54 31 25 6 1.81
app/controllers/orders_controller.rb 100.00 % 7 4 4 0 2.50
app/controllers/reviews_controller.rb 100.00 % 19 10 10 0 1.30
app/controllers/users_controller.rb 86.67 % 31 15 13 2 2.93
app/decorators/author_decorator.rb100.00 % 7 4 4 0 1.5075.00 % 7 4 3 1 0.75100.00 % 7 4 4 0 1.501.25
app/decorators/book_decorator.rb100.00 %66.67 %100.00 %23 1212 024.500.90
app/decorators/category_decorator.rb 100.00 % 5 2 2app/controllers/application_controller.rb 100.00 % 2 1 10 1.001.86
app/controllers/books_controller.rb93.75 % 31 16 15 1 13.940 1.00
app/controllers/books_controller.rb93.33 % 30 15 14 1 14.13app/controllers/books_controller.rbapp/controllers/books_controller.rbapp/controllers/books_controller.rb100.00 % 24 12 12 013.5013.8613.5013.50
app/controllers/home_controller.rb 100.00 % 12 7 7 06.14
app/controllers/reviews_controller.rb 100.00 %19 10 10 0 1.3017 9 9 0 1.33
app/controllers/users_controller.rb 86.67 % 31 15 13 2 2.93app/controllers/application_controller.rbapp/decorators/author_decorator.rb100.00 % 7 4 4 0 1.50
app/decorators/book_decorator.rb 100.00 %44.44 %18 9 4 5 4.67
app/admin/orders.rb 100.00 % 3 2 2 0 1.00
app/controllers/application_controller.rb 100.00 % 15 10 109 1 0.900 47.20
app/decorators/category_decorator.rb 100.00 % 5 2 21 10 1.00app/controllers/application_controller.rbapp/decorators/author_decorator.rb100.00 % 7 4 4 0 1.250 47.60
app/decorators/book_decorator.rb 90.00 % 18 10 9 1 0.90
app/decorators/category_decorator.rb 100.00 % 5 2 21 10 1.00
app/controllers/books_controller.rb 93.75 % 31 16 15 113.94app/controllers/books_controller.rbapp/controllers/books_controller.rbapp/controllers/books_controller.rbapp/controllers/books_controller.rb14.94
app/controllers/coupons_controller.rb100.00 % 14 8 8 013.5013.8613.502.88
app/controllers/home_controller.rb 100.00 % 12 7 7 06.14
app/controllers/order_books_controller.rb 80.65 % 54 31 25 6 1.81
app/controllers/orders_controller.rb 100.00 % 7 4 4 0 2.50
app/controllers/reviews_controller.rb 100.00 % 19 10 10 0 1.30
app/controllers/users_controller.rb 86.67 % 31 15 13 2 2.93
app/decorators/author_decorator.rb100.00 % 7 432 21 1app/controllers/books_controller.rb 100.00 % 28 14 14 0 13.869 13 0.4122 0 1.950 1.00
app/controllers/home_controller.rb 100.00 % 12 7 7 0 1.86
app/decorators/author_decorator.rb100.00 % 7 44 0 1.50
app/decorators/book_decorator.rb 100.00 %18 10 10 0 12.90
app/decorators/category_decorator.rb 100.00 % 3 2 2 0 1.00
app/decorators/paginating_decorator.rb 100.00 % 3 2 20 1.00
app/admin/books.rb 100.00 % 77 51 51 0 4.20
app/admin/categories.rb 100.00 % 31 18 18 0 2.17
app/admin/coupons.rb 100.00 % 3 2 2 0 1.00
app/admin/dashboard.rb42.86 % 14 7 3 44.71app/controllers/books_controller.rb 100.00 % 28 14 14 013.86app/controllers/books_controller.rb 100.00 % 24 12 12 0 13.500.435.86app/controllers/books_controller.rb 100.00 % 28 14 14 013.3613.8613.36
app/controllers/home_controller.rb 100.00 % 12 7 7 0 1.86
app/controllers/application_controller.rbapp/decorators/author_decorator.rb100.00 % 7 4 4 0 1.50
app/decorators/book_decorator.rb 100.00 % 18 109 1 0.9010 0 12.90100.00 % 2 1 1app/controllers/application_controller.rb 100.00 % 21 1app/controllers/application_controller.rbapp/decorators/author_decorator.rb100.00 % 7 4 4 01.25
app/decorators/book_decorator.rb 90.00 % 18 10 9 1 0.9010 0 12.70
app/decorators/category_decorator.rb 100.00 % 3 2 2 0 1.00
app/decorators/paginating_decorator.rb 100.00 % 3 2 21 11 10 1.0013.86app/controllers/books_controller.rb 100.00 % 24 12 12 0 13.500.435.86
app/controllers/books_controller.rb93.75 % 31 1693.33 % 3015 113.9414.13app/controllers/books_controller.rb100.00 % 24 12 12 0 13.50
app/controllers/home_controller.rb 100.00 % 12 7 7 06.14
app/controllers/reviews_controller.rb 100.00 % 19 10 10 0 1.30
app/controllers/users_controller.rb 86.67 % 31 15 13 2 2.931.86
app/decorators/author_decorator.rb 100.00 % 7 4 4 0 1.5075.00 % 7 4 3 1 0.75100.00 % 7 4 4 0 1.501.251.251.25
app/decorators/book_decorator.rb100.00 %66.67 %100.00 %100.00 %100.00 %23 1212 024.500.90
app/decorators/category_decorator.rb 100.00 % 5 2 2app/controllers/application_controller.rb 100.00 % 2 1 10 1.001.86
app/decorators/category_decorator.rb 100.00 % 5 2 2app/controllers/application_controller.rbapp/decorators/author_decorator.rb100.00 % 7 4 4 0 1.25app/controllers/books_controller.rb93.75 % 31 16 15 1 13.9493.33 % 30 15 14 1 14.13app/controllers/books_controller.rbapp/controllers/books_controller.rbapp/controllers/books_controller.rb100.00 % 24 12 12 013.5013.8613.50
app/controllers/home_controller.rb 100.00 % 12 7 7 06.14
app/controllers/reviews_controller.rb 100.00 %19 10 10 0 1.3017 9 9 0 1.33
app/controllers/users_controller.rb 86.67 % 31 15 13 2 2.93app/controllers/application_controller.rbapp/decorators/author_decorator.rb100.00 % 7 4 4 0 1.501 0.75
app/decorators/book_decorator.rb100.00 %44.44 %18 9 4 5 4.67
app/admin/orders.rb 100.00 % 3 2 2 0 1.00
app/controllers/application_controller.rb 100.00 % 15 10 109 1 0.900 47.20
app/decorators/category_decorator.rb 100.00 % 5 2 21 10 1.00app/controllers/application_controller.rbapp/decorators/author_decorator.rb100.00 % 7 4 4 0 1.250 47.60
app/decorators/book_decorator.rb 90.00 % 18 10 9 1 0.90
app/decorators/category_decorator.rb 100.00 % 5 2 21 10 1.00
app/decorators/author_decorator.rb 100.00 % 7 43 1 0.754 0 1.50
app/decorators/book_decorator.rb90.00 % 18 10 9 1 0.90
app/decorators/category_decorator.rb 100.00 % 5 2 21 1app/controllers/application_controller.rbapp/decorators/author_decorator.rb100.00 % 7 4 4 0 1.25
app/decorators/book_decorator.rb 90.00 % 18 10 9 1 0.90
app/decorators/category_decorator.rb 100.00 % 5 2 21 1app/controllers/application_controller.rb100.00 % 7 4 4 0 1.25
app/decorators/book_decorator.rb 90.00 % 18 10 9 1 0.90
app/decorators/category_decorator.rb 100.00 % 5 2 21 1100.00 % 2 1 10 1.00
app/controllers/books_controller.rb93.33 % 30 15 14 1 14.13app/controllers/books_controller.rbapp/controllers/books_controller.rbapp/controllers/books_controller.rb100.00 % 24 12 12 013.5013.8613.50app/controllers/books_controller.rb 93.75 % 31 16 15 113.94app/controllers/books_controller.rbapp/controllers/books_controller.rbapp/controllers/books_controller.rbapp/controllers/books_controller.rb14.94
app/controllers/coupons_controller.rb100.00 % 14 8 8 013.5013.8613.502.8813.50
app/controllers/home_controller.rb 100.00 % 12 7 7 06.14
app/controllers/order_books_controller.rb 80.65 % 54 31 25 6 1.81
app/controllers/orders_controller.rb 100.00 % 7 4 4 0 2.50
app/controllers/reviews_controller.rb 100.00 %17 9 9 0 1.3319 10 10 0 1.30
app/controllers/users_controller.rb 86.67 % 31 15 13 2 2.93
app/decorators/author_decorator.rb100.00 % 7 4 4 0 1.501.2575.00 % 7 4 3 1 0.75100.00 % 7 4 4 0 1.501.251.251.25
app/decorators/book_decorator.rb100.00 %66.67 %100.00 %100.00 %100.00 %100.00 %23 1266.67 % 23 1223 1212 024.5024.5024.5012.7090.00 % 18 109 1 0.9010 0 12.9027.5827.5027.5827.50
app/decorators/order_book_decorator.rb 100.00 % 9 5 5 01.001.0012 025.6712 0 24.5012 025.6712.7090.00 % 18 109 1 0.9010 0 12.902.602.40
app/decorators/category_decorator.rb 100.00 %3 2 2 0 1.00app/decorators/order_decorator.rb 100.00 % 13 8 8 014.7513.7512 025.6712 0 24.5012 025.6712.7090.00 % 18 109 1 0.9010 0 12.902.602.40
app/decorators/category_decorator.rb 100.00 %3 2 2 0 1.00app/decorators/order_decorator.rb 100.00 % 13 8 8 014.7513.75100.00 % 23 12 12 0 24.5025.6712.7090.00 % 18 109 1 0.9010 0 12.902.602.40
app/decorators/category_decorator.rb 100.00 %3 2 2 0 1.00app/decorators/order_decorator.rb 100.00 % 13 8 8 014.7513.75
app/decorators/paginating_decorator.rb 100.00 % 3555552 2app/controllers/application_controller.rbapp/decorators/author_decorator.rb100.00 % 7 4 4 0 1.25
app/decorators/book_decorator.rb 90.00 % 18 10 91app/controllers/application_controller.rb 100.00 % 2 1 12 20 1.00
app/controllers/books_controller.rb93.33 % 30 15 14100.00 % 28 14100.00 % 28 14100.00 % 28 14100.00 % 28 1414 0 13.361 14.13app/controllers/books_controller.rbapp/controllers/books_controller.rbapp/controllers/books_controller.rbapp/controllers/books_controller.rbapp/controllers/books_controller.rbapp/controllers/books_controller.rbapp/decorators/review_decorator.rb100.00 %7 4 4 0 1.00
app/decorators/user_decorator.rb100.00 % 9 5 5 0 1.401.861.861.861.861.861.861.86app/controllers/books_controller.rb1.868 4 0.67app/decorators/review_decorator.rb 100.00 % 7 4 4 0app/decorators/review_decorator.rb 100.00 % 7 4 4 01.00
app/decorators/user_decorator.rb 100.00 % 9 5 5 0 1.401.861.861.861.861.861.861.861.861.861.861.861.861.861.861.861.861.861.861.86
app/helpers/application_helper.rb100.00 %7 4 45 3 30 5.00100.00 %5 3 3 0 4.6775.00 % 7 4 3 1 0.75100.00 %7 4 404.005.005 3 305.004.677 4 4 0 4.0075.00 % 7 4 3 1 0.75100.00 %7 4 4 0 4.00
app/helpers/constants.rb 100.00 % 27 21 21 0 1.00
app/interactors/billing_update.rb 87.50 % 14 8 7 1 0.88
app/interactors/shipping_update.rb 87.50 % 14 8 7 1 0.88
app/interactors/user_update.rb 100.00 % 25 13 13 0 3.00
app/jobs/application_job.rb 100.00 % 7 1 1 0 1.00
app/jobs/cart_cleaner.rb 60.00 % 8 5 3 2 0.60
app/models/address.rbapp/models/address.rb100.00 % 2412 12 0 13.5013.86app/controllers/books_controller.rb 100.00 %app/controllers/books_controller.rb 100.00 %24 12 12 0 13.5013.86
app/controllers/home_controller.rb 100.00 % 12 7 7 0 6.14
app/controllers/reviews_controller.rb 100.00 % 17 9 9 0 1.33
app/controllers/users_controller.rb 86.67 % 31 15 13 2 2.93
app/decorators/author_decorator.rb 100.00 % 7 4 4 0 1.50
app/decorators/book_decorator.rb 100.00 % 23 12 12 012.70
app/decorators/category_decorator.rb 100.00 % 3 2 2 0 1.0024.50
app/decorators/paginating_decorator.rb 100.00 % 3 2 2 07 7 01.00
app/decorators/review_decorator.rb 100.00 % 7 4 4 0 1.00
app/decorators/user_decorator.rb 100.00 % 9 5 5 0 1.40
app/helpers/application_helper.rb 100.00 %100.00 %5 3 3 0 4.677 4 4 0 4.0075.00 % 7 4 3 1 0.75100.00 %100.00 %7 4 4 04.005.00
app/helpers/constants.rb 100.00 % 27 21 21 0 1.00
app/interactors/billing_update.rb 87.50 % 14 8 7 1 0.88
app/interactors/shipping_update.rb 87.50 % 14 8 7 1 0.88
app/interactors/user_update.rb 100.00 % 25 13 13 0 3.00
app/jobs/application_job.rb 100.00 % 7 1 1app/controllers/application_controller.rb 100.00 % 2 1 10 1.00
app/jobs/cart_cleaner.rb 60.00 % 8 5 3 2 0.60
app/models/address.rb 100.00 % 247 7 0100.00 %app/controllers/books_controller.rb 100.00 %2412 12 013.36app/controllers/books_controller.rb 100.00 %app/controllers/books_controller.rb 100.00 %24 12 12 013.5013.86
app/controllers/home_controller.rb 100.00 % 12 7 7 0 1.86
app/decorators/author_decorator.rb 100.00 % 7 4 4 01.251.501.25
app/decorators/book_decorator.rb90.00 % 18 10 9 1 0.90100.00 % 18 10 10 0 12.7090.00 % 18 10 9 1 0.90
app/decorators/category_decorator.rb 100.00 %53 2 2 07 7 07 7 01.00
app/decorators/paginating_decorator.rb 100.00 % 352 2 07 7 01.00
app/models/admin_user.rb 100.00 % 6app/helpers/application_helper.rb 100.00 % 3app/helpers/application_helper.rb 100.00 % 3app/helpers/application_helper.rb 100.00 % 3app/helpers/application_helper.rb 100.00 % 32 2app/helpers/application_helper.rbapp/models/admin_user.rb100.00 % 6 4 4app/helpers/application_helper.rb 100.00 % 3 2 2app/models/admin_user.rb100.00 % 6 2 2100.00 % 6 4 4app/helpers/application_helper.rb 100.00 % 3 2 2app/helpers/application_helper.rb 100.00 % 3 2 26 4 4app/helpers/application_helper.rb 100.00 % 3 2 26 4 4app/helpers/application_helper.rb 100.00 % 3 2 26 4 4app/helpers/application_helper.rb 100.00 % 3 2 26 4 4app/helpers/application_helper.rb 100.00 % 3 2 26 4 4app/helpers/application_helper.rb 100.00 % 3 2 26 4 4app/helpers/application_helper.rb 100.00 % 6 4 4app/helpers/application_helper.rb 100.00 % 3 2 26 4 4app/helpers/application_helper.rb 100.00 % 3 2 26 4 4app/helpers/application_helper.rb 100.00 % 3 2 26 4 4app/helpers/application_helper.rb 100.00 % 3 2 2app/helpers/application_helper.rb 100.00 % 6 4 4app/helpers/application_helper.rb 100.00 % 3 2 26 4 4app/helpers/application_helper.rb 100.00 % 3 2 26 4 4app/helpers/application_helper.rb 100.00 % 3 2 26 4 4app/helpers/application_helper.rb 100.00 % 3 2 2app/helpers/application_helper.rb 100.00 % 6 4 4app/helpers/application_helper.rb 100.00 % 3 2 2app/helpers/application_helper.rb 100.00 % 3 2 26 4 4app/helpers/application_helper.rb 100.00 % 3 2 26 4 4app/helpers/application_helper.rb 100.00 % 3 2 26 4 4app/helpers/application_helper.rb 100.00 % 3 2 26 4 4app/helpers/application_helper.rb 100.00 % 3 2 2app/helpers/application_helper.rb 100.00 % 6 4 4app/helpers/application_helper.rb 100.00 % 3 2 26 4 40 1.00
app/models/application_record.rb 100.00 % 3 2 2 0 1.00
app/models/author.rb 100.00 %6 4 46 4 47 5 57 5 57 5 57 5 57 5 57 5 57 5 57 5 57 5 57 5 57 5 56 4 40 1.00
app/models/authors_book.rb 100.00 % 6 4 4 0 1.00
7 5 57 5 57 5 56 4 46 4 47 5 57 5 57 5 57 5 50 1.00
app/models/authors_book.rb 100.00 % 6 4 4 0 1.00
app/models/authors_book.rb 100.00 % 6 4 4 0 1.00
app/models/authors_book.rb 100.00 % 6 4 4 0 1.00
app/models/billing.rb 100.00 % 2 1 16 4 4app/models/authors_book.rb 100.00 % 6 4 40 1.00
app/models/billing.rb 100.00 % 2 1 16 4 40 1.00
app/models/book.rb 100.00 %15 8 8app/models/book.rb 100.00 % 13 9 90 1.00
app/models/books_category.rb 100.00 % 6 4 417 9 917 9 917 9 915 8 8app/models/book.rb 100.00 % 13 9 90 1.00
app/models/books_category.rb 100.00 % 6 4 40 1.00
app/models/books_category.rb 100.00 % 6 4 417app/models/book.rb 100.00 % 13app/models/book.rb 100.00 % 13app/models/book.rb 100.00 % 139 9app/models/book.rb 100.00 % 139 9app/models/book.rb 100.00 % 13app/models/book.rb 100.00 % 139 919 10 10app/models/book.rb 100.00 % 15 8 80 1.00
app/models/books_category.rb 100.00 % 6 4 417 9 90 1.00
app/models/books_category.rb 100.00 % 6 4 40 1.00
app/models/books_category.rb 100.00 % 6 4 417app/models/book.rb 100.00 % 13app/models/book.rb 100.00 % 13app/models/book.rb 100.00 % 139 9app/models/book.rb 100.00 % 139 9app/models/book.rb 100.00 % 13app/models/book.rb 100.00 % 139 919 10 100 1.00
app/models/books_category.rb 100.00 % 6 4 40 1.00
app/models/books_category.rb 100.00 % 6 4 417app/models/book.rb 100.00 % 13app/models/book.rb 100.00 % 13app/models/book.rb 100.00 % 13app/models/book.rb 100.00 % 13app/models/book.rb 100.00 % 13app/models/book.rb 100.00 % 139 919 10 100 1.00
app/models/books_category.rb 100.00 % 6 4 4 0 1.00
app/models/category.rb 100.00 % 6 4 4 0 1.00
app/models/user.rbapp/models/review.rb100.00 % 16 7 7app/models/user.rbapp/models/review.rb100.00 %8 2 2100.00 % 16app/models/user.rb 100.00 % 8app/models/coupon.rb 100.00 % 32 216 7 70 1.00app/models/user.rb 100.00 % 8 2 2app/models/review.rb 100.00 % 16 7 7app/models/review.rbapp/models/review.rbapp/models/review.rbapp/models/review.rb100.00 % 16 7 7100.00 % 167 7app/models/user.rb 100.00 % 8 2 2 0 1.00app/models/user.rb 100.00 % 8 2 2app/models/review.rb100.00 % 16app/models/user.rb 100.00 %app/models/user.rb 100.00 % 8 2 2 0 1.00
app/queries/book_query.rb 87.50 % 1582 2 0 1.00app/models/user.rb 100.00 % 8 2 2
app/models/order.rb 100.00 % 6 4 40 1.00
app/models/order_book.rb 100.00 % 4 3 3 0 1.00
app/models/review.rb 100.00 % 1677 0 1.001 7.507 1 7.25
app/queries/book_query.rb 87.50 % 15 8 7 17.507.507.50
app/queries/book_query.rb 87.50 % 15 8app/queries/book_query.rb 87.50 % 15 87 70 1.001 7.507 1 7.257.257.25
app/queries/book_query.rb 87.50 % 15 8 7 1app/models/shipping.rb 100.00 % 2 117.507.507.25app/queries/book_query.rb 85.71 % 13 7 6 1 8.147.50
app/queries/book_query.rb 87.50 % 15 877 0 1.001 7.507 1 7.257.25
app/queries/book_query.rb 87.50 % 15 8 7app/models/shipping.rb 100.00 % 2 117.507.50
app/queries/book_query.rb 87.50 % 15 8770 1.001 7.507 1 7.257.25
app/queries/book_query.rb 87.50 % 15 8 7 17.257.25app/queries/book_query.rb 85.71 % 13 7 6 1 8.147.507.25app/models/shipping.rb 100.00 % 2 1 1 0 1.00app/models/user.rb 100.00 % 82 2 0 1.00app/models/user.rb 100.00 % 8 2 2app/models/review.rb 100.00 % 16 7 7app/models/review.rb100.00 % 167 7app/models/user.rb 100.00 % 8 2 2 0 1.00app/models/user.rb 100.00 % 8 2 2app/models/review.rb 100.00 % 16app/models/user.rb 100.00 % 8 2 2 0 1.00app/models/user.rb 100.00 % 8 2 2
app/models/order.rb 100.00 % 6 4 40 1.00
app/models/order_book.rb 100.00 % 4 3 3 0 1.00
app/models/review.rb 100.00 % 167 7app/models/user.rb 100.00 % 8app/models/coupon.rb 100.00 % 32 2 0 1.00app/models/user.rb 100.00 % 8 2 2
app/models/order.rb 100.00 % 6 4 4 0 1.00
app/models/order_book.rb 100.00 % 4 3 3 0 1.00
app/models/review.rb 100.00 % 16 7 7 0 1.00
app/queries/book_query.rb 87.50 % 15 8 7 17.507.507.507.25app/queries/book_query.rb 85.71 % 13 7 6 1 8.147.50
app/queries/book_query.rb 87.50 % 15 8770 1.001 7.507 1 7.257.257.25
app/queries/book_query.rb 87.50 % 15 8 7 17.507.507.50
app/queries/book_query.rb 87.50 % 15 8app/queries/book_query.rb 87.50 % 15 87 70 1.001 7.507 1 7.257.257.25
app/queries/book_query.rb 87.50 % 15 8 7 1app/models/shipping.rb 100.00 % 2 117.507.50app/queries/book_query.rb 87.50 % 15 8 7 17.25app/queries/book_query.rb 85.71 % 13 7 6 1 8.147.50
app/queries/book_query.rb 87.50 % 15 877 0 1.001 7.507 1 7.257.25
app/queries/book_query.rb 87.50 % 15 8 7app/models/shipping.rb 100.00 % 2 117.507.507.25app/queries/book_query.rb 85.71 % 13 7 6 1 8.147.50
app/queries/book_query.rb 87.50 % 15 8770 1.001 7.507 1 7.257.25
app/queries/book_query.rb 87.50 % 15 8 7 17.257.25app/queries/book_query.rb 85.71 % 13 7 6 1 8.147.507.25app/models/shipping.rb 100.00 % 2 1 1 0 1.00app/models/user.rb 100.00 % 8 2 2 0 1.00app/models/user.rb 100.00 % 8 2 2 0 1.00
app/queries/book_query.rb 87.50 % 15 8 7 1 7.50
app/queries/book_query.rb 87.50 % 15 8770 1.001 7.507 1 7.25
app/queries/book_query.rb 87.50 % 15 8 7app/models/shipping.rb 100.00 % 2 117.507.50
app/queries/book_query.rb 87.50 % 15 877 0 1.001 7.507 1 7.257.25
app/queries/book_query.rb 87.50 % 15 8 7 17.25app/queries/book_query.rb 85.71 % 13 7 6 1 8.147.507.257.50app/models/shipping.rb 100.00 % 2 1 1 0 1.00
app/models/user.rb 50.00 % 21 12 6 6 0.50
app/queries/book_query.rb 90.00 % 17 10 9 1 9.30
app/queries/book_query.rb 87.50 % 15 8 7app/models/shipping.rb 100.00 % 2 117.507.50
app/queries/book_query.rb 87.50 % 15 877 0 1.001 7.507 1 7.257.25
app/queries/book_query.rb 87.50 % 15 8 7 17.25app/queries/book_query.rb 85.71 % 13 7 6 1 8.147.507.257.50app/models/shipping.rb 100.00 % 2 1 1 0 1.00
app/models/user.rb 50.00 % 21 12 6 6 0.50
app/queries/book_query.rb 90.00 % 17 10 9 1 9.30app/queries/book_query.rb 85.71 % 13 7 6 1 8.14
app/models/user.rb 53.85 % 22 13 7 6 0.54
app/queries/book_query.rb 90.00 % 17 10 9 1 9.30
app/models/user.rb 53.85 % 22 13 7 6 0.54
app/queries/book_query.rb 90.00 % 17 10 9 1 9.30
app/models/user.rb 53.85 % 22 13 7 6 0.54
app/queries/book_query.rb 90.00 % 17 10 9 1 9.30
app/services/book_service.rb 88.89 % 19 9 8 1 1.56
app/services/coupon_service.rb 100.00 % 19 8 8 0 2.25
app/services/book_service.rb 88.89 % 19 9 8 1 1.56
app/services/coupon_service.rb 100.00 % 19 8 8 0 2.25
app/services/book_service.rb 88.89 % 19 9 8 1 1.56
app/services/coupon_service.rb 100.00 % 19 8 8 0 2.25
config/application.rb 100.00 % 22 6 6 0 1.00
config/boot.rb 100.00 % 4 3 3 0 1.00
config/environment.rb 100.00 % 5 2 2 0 1.00
config/environments/test.rb 100.00 % 6019 19 0 1.00
config/initializers/active_admin.rb 100.00 % 12 11 1118 1818 1818 1818 1818 1818 1818 1818 1818 1818 1818 1818 1818 1818 1818 1818 1818 1818 1818 180 1.00
config/initializers/application_controller_renderer.rb 100.00 % 8 0 0 0 0.00
config/initializers/assets.rb 100.00 % 14 2 2 0 1.00
config/initializers/backtrace_silencers.rb 100.00 % 8 1 1 0 1.00
config/initializers/content_security_policy.rb 100.00 % 30 0 0 0 0.00
config/initializers/cookies_serializer.rb 100.00 % 5 1 1 0 1.00
config/initializers/devise.rb 100.00 % 20 14 14config/initializers/devise.rb 100.00 % 311 13 1320 14 14config/initializers/devise.rb 100.00 % 311 13 13config/initializers/devise.rb 100.00 % 20 14 14config/initializers/devise.rb 100.00 % 311 13 13config/initializers/devise.rb 100.00 % 20 14 140 1.00
config/initializers/filter_parameter_logging.rb 100.00 % 6 1 1 0 1.00
config/initializers/inflections.rb 100.00 % 16 0 0 0 0.00
config/initializers/kaminari.rb 100.00 % 3 2 2 0 1.00
config/initializers/mime_types.rb 100.00 % 4 0 0 0 0.00
config/initializers/omniauth.rbconfig/initializers/omniauth.rbconfig/initializers/money.rbconfig/initializers/money.rbconfig/initializers/money.rb100.00 % 3 3 3config/initializers/omniauth.rb 100.00 % 3 2 20 1.00
config/initializers/omniauth.rb 100.00 % 8 3 3config/initializers/omniauth.rbconfig/initializers/money.rbconfig/initializers/money.rbconfig/initializers/money.rb100.00 % 32 23 3config/initializers/omniauth.rbconfig/initializers/money.rb100.00 % 33 32 23 33 30 1.00
config/initializers/omniauth.rb 100.00 % 8 3 3config/initializers/omniauth.rbconfig/initializers/money.rb100.00 % 32 23 3config/initializers/omniauth.rb 100.00 % 3 2 23 33 3config/initializers/omniauth.rb 100.00 % 3 2 20 1.00
config/initializers/omniauth.rb 100.00 % 8 3 3config/initializers/omniauth.rb 100.00 % 3 2 20 1.00
config/initializers/permissions_policy.rb 100.00 % 11 0 0 0 0.00
config/initializers/wrap_parameters.rb 100.00 % 14 2 2 0 1.50
config/routes.rb 100.00 %7 4 45 3 317 9 917 9 917 9 95 3 37 4 45 3 37 4 417 9 917 9 917 9 95 3 35 3 35 3 37 4 45 3 37 4 417 9 917 9 917 9 95 3 37 4 417 9 95 3 37 4 45 3 37 4 45 3 37 4 417 9 95 3 37 4 431 17 1717 9 95 3 37 4 45 3 35 3 37 4 417 9 95 3 37 4 45 3 37 4 45 3 37 4 417 9 95 3 37 4 431 17 175 3 35 3 37 4 45 3 37 4 45 3 37 4 417 9 917 9 95 3 37 4 431 17 175 3 30 1.00
spec/decorators/author_decorator_spec.rb 100.00 % 9 5 5 0 1.60spec/decorators/author_decorator_spec.rb 100.00 % 9 5 5 01.291.60spec/decorators/author_decorator_spec.rb 100.00 % 13 7 7 0 1.29
spec/decorators/book_decorator_spec.rb 100.00 % 36 15 15 01.73
spec/factories/addresses.rb 100.00 % 4 2 2 0 1.001.501.46spec/decorators/book_decorator_spec.rb 100.00 % 29 13 13 01.501.461.731.46spec/decorators/book_decorator_spec.rb 100.00 % 29 13 13 01.501.46spec/decorators/book_decorator_spec.rb 100.00 % 29 13 13 01.501.461.731.731.731.46spec/decorators/book_decorator_spec.rb 100.00 % 29 13 13 01.501.46spec/decorators/book_decorator_spec.rb 100.00 % 29 13 13 01.501.461.731.731.731.731.46spec/decorators/book_decorator_spec.rb 100.00 % 29 13 13 01.501.46spec/decorators/book_decorator_spec.rb 100.00 % 29 13 13 01.501.46spec/decorators/book_decorator_spec.rb 100.00 % 29 13 13 01.501.461.731.731.731.731.46spec/decorators/book_decorator_spec.rb 100.00 % 29 13 13 01.501.46spec/decorators/book_decorator_spec.rb 100.00 % 29 13 13 01.501.461.731.731.731.731.46spec/decorators/book_decorator_spec.rb 100.00 % 29 13 13 01.501.46spec/decorators/book_decorator_spec.rb 100.00 % 29 13 13 01.501.46spec/decorators/book_decorator_spec.rb 100.00 % 29 13 13 01.501.461.731.731.46spec/decorators/book_decorator_spec.rb 100.00 % 29 13 13 01.501.46spec/decorators/book_decorator_spec.rb 100.00 % 29 13 13 01.501.461.731.731.46spec/decorators/book_decorator_spec.rb 100.00 % 29 13 13 01.501.46spec/decorators/book_decorator_spec.rb 100.00 % 29 13 13 01.501.46spec/decorators/book_decorator_spec.rb 100.00 % 29 13 13 01.501.461.73
spec/factories/admin_users.rbspec/factories/authors.rbspec/factories/authors.rbspec/factories/authors.rbspec/factories/addresses.rb 100.00 % 4 2 2 0 1.00
spec/factories/admin_users.rbspec/factories/authors.rbspec/factories/authors.rbspec/factories/authors.rbspec/factories/authors.rbspec/factories/addresses.rb 100.00 % 4 2 2 0 1.00
spec/factories/admin_users.rb100.00 % 6 4 4 08.007.007.008.001.008.008.008.007.007.008.001.008.00
spec/factories/authors.rb 80.00 % 18 108 2 2.508 2 2.508 2 2.508 2 2.50spec/factories/authors.rbspec/factories/authors.rb100.00 % 6 4 4 01.007 3 0.708 2 2.507 3 0.708 2 2.507.001.008.008.00
spec/factories/authors.rb 80.00 % 18 108 2 2.508 2 2.508 2 2.50spec/factories/authors.rb 100.00 % 6 4 4 0 1.007 3 0.708 2 2.501.007 3 0.708 2 2.507 3 0.708 2 2.50
spec/factories/authors_books.rb 100.00 % 6 4 4 0 1.00
spec/factories/billings.rb 100.00 % 10 8 8 01.001.002.5669.562.5668.002.5668.002.5668.002.5669.561.001.001.001.001.00
spec/factories/books.rb 80.95 % 35 2117 4 45.52spec/factories/books.rbspec/factories/billings.rb100.00 % 10 8 8 068.002.5669.562.5668.002.5668.002.5668.002.5669.5668.002.5669.5615 6 0.7117 446.3845.5217 446.3817 446.3817 445.52spec/factories/books.rb 100.00 % 11 9 9 068.0068.002.5669.562.5668.0046.3868.002.5668.002.5668.0068.002.5669.5668.002.5669.5615 6 0.7117 4 46.38spec/factories/books.rb 100.00 % 11 9 9 068.002.5668.0068.002.5669.562.562.5668.002.562.5668.002.5668.002.5669.5668.002.5669.5668.002.5669.5649.621.0068.0069.5615 6 0.71
spec/factories/books_categories.rbspec/factories/books_categories.rbspec/factories/books_categories.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_categories.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_categories.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_categories.rbspec/factories/books.rb 80.95 % 35 21 17 4 45.5217 4 46.3845.5217 4 46.3817 446.3817 4 45.52spec/factories/books.rb 100.00 % 11 9 9 068.0068.002.5669.562.5668.0046.3868.002.5668.002.5668.0068.002.5669.5668.002.5669.5615 6 0.7117 4 46.38spec/factories/books.rb 100.00 % 11 9 9 068.002.5669.562.562.5668.002.562.5668.002.5668.002.5669.5668.002.5669.5668.002.5669.5649.6268.0068.0046.3868.002.5668.002.5669.5668.002.5669.5615 6 0.7117 4 46.38spec/factories/books.rb 100.00 % 11 9 9 068.002.5669.562.562.5668.002.5668.002.5668.002.5668.002.5669.5649.6268.002.5668.0068.00
spec/factories/books_categories.rbspec/factories/books_category.rbspec/factories/books_categories.rbspec/factories/books_categories.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_categories.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_categories.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_categories.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_categories.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_category.rb100.00 % 6 4 4 0 1.00
spec/factories/categories.rb 100.00 % 5 3 3 04.671.001.003.333.333.333.333.334.674.673.333.333.331.004.674.674.674.673.333.333.331.004.671.004.673.333.333.333.333.334.674.673.333.333.331.004.674.674.674.673.333.333.331.004.671.004.673.333.333.333.333.334.673.334.674.673.333.333.331.004.671.004.673.333.333.333.333.334.67
spec/factories/users.rbspec/factories/reviews.rb100.00 % 7 5 5spec/factories/users.rbspec/factories/reviews.rb100.00 %4 2 20 1.00spec/factories/users.rb 100.00 % 4 2 27 5 5spec/factories/coupons.rb 100.00 % 8 6 6 0 2.50
spec/factories/order_books.rb 100.00 % 7 5 5 0 1.80
spec/factories/orders.rb 77.78 % 17 9 7 2 1.56
spec/factories/coupons.rb 100.00 % 8 6 6 0 2.50
spec/factories/order_books.rb 100.00 % 7 5 5 0 1.80
spec/factories/orders.rb 77.78 % 17 9 7 2 1.56
spec/factories/reviews.rb100.00 % 7 5 5spec/factories/users.rb 100.00 % 4 2 27 5 50 1.00spec/factories/users.rbspec/factories/reviews.rb100.00 % 7 5 5spec/factories/users.rb 100.00 % 4 2 20 1.00spec/factories/users.rb 100.00 % 4 2 20 1.00spec/factories/users.rb 100.00 % 4 2 2 0 1.00
spec/feature/book_spec.rb 100.00 % 202 105 105 0 2.37
spec/feature/home_spec.rb 100.00 % 39 20 20 0 1.05
spec/models/author_spec.rb 100.00 % 15 9 9 0 1.44
spec/models/authors_book_spec.rb 100.00 % 15 9 9 0 1.44
spec/models/book_spec.rb 100.00 % 23 16 16 0 1.69
spec/models/books_category_spec.rb 100.00 % 15 9 9 0 1.44
spec/models/category_spec.rb 100.00 % 14 8 8 0 1.38
spec/feature/book_spec.rb 100.00 % 202 105 105 0 2.37
spec/feature/home_spec.rb 100.00 % 39 20 20 0 1.05
spec/models/author_spec.rb 100.00 % 15 9 9 0 1.44
spec/models/authors_book_spec.rb 100.00 % 15 9 9 0 1.44
spec/models/book_spec.rb 100.00 % 23 16 16 0 1.69
spec/models/books_category_spec.rb 100.00 % 15 9 9 0 1.44
spec/models/category_spec.rb 100.00 % 14 8 8 0 1.380 1.00
spec/feature/book_spec.rb 100.00 % 202 105 105 0 2.37
spec/feature/home_spec.rb 100.00 % 39 20 20 0 1.05
spec/models/author_spec.rb 100.00 % 15 9 9 0 1.44
spec/models/authors_book_spec.rb 100.00 % 15 9 9 0 1.44
spec/models/book_spec.rb 100.00 % 23 16 16 0 1.69
spec/models/books_category_spec.rb 100.00 % 15 9 9 0 1.44
spec/models/category_spec.rb 100.00 % 14 8 8 0 1.38
spec/feature/book_spec.rb 100.00 % 202 105 105 0 2.37
spec/feature/home_spec.rb 100.00 % 39 20 20 0 1.05
spec/models/author_spec.rb 100.00 % 15 9 9 0 1.44
spec/models/authors_book_spec.rb 100.00 % 15 9 9 0 1.44
spec/models/book_spec.rb 100.00 % 23 16 16 0 1.69
spec/models/books_category_spec.rb 100.00 % 15 9 9 0 1.44
spec/models/category_spec.rb 100.00 % 14 8 8 0 1.380 1.00
spec/factories/shippings.rb 100.00 % 10 8 8 0 1.00
spec/factories/users.rb 100.00 % 7 5 5 011.0013.4011.00
spec/feature/admin/author_spec.rb 100.00 % 57 31 31 0 1.48
spec/feature/admin/book_spec.rb 100.00 %61 32 32 0 1.4183 43 43 0 1.56
spec/feature/admin/category_spec.rb 100.00 % 48 25 25 0 1.56
spec/feature/billing_spec.rb 73.08 % 42 26 19 7 0.773.333.333.333.333.333.333.33
spec/factories/shippings.rb 100.00 % 10 8 8 0 1.00
spec/factories/users.rb 100.00 % 7 5 5 011.0013.40
spec/feature/admin/author_spec.rb 100.00 % 57 31 31 0 1.48
spec/feature/admin/book_spec.rb 100.00 %61 32 32 0 1.4183 43 43 0 1.56
spec/feature/admin/category_spec.rb 100.00 % 48 25 25 0 1.56
spec/feature/billing_spec.rb 73.08 % 42 26 19 7 0.773.333.333.333.333.333.333.333.333.33
spec/factories/users.rb 100.00 % 4 2 2 0 1.003.333.333.33
spec/factories/users.rb 100.00 % 4 2 2 0 1.003.333.333.33
spec/factories/users.rb 100.00 % 4 2 2 0 1.003.33
spec/feature/book_spec.rb 100.00 % 202spec/feature/book_spec.rb 100.00 % 202104 104 0 2.38105 105 0 2.37
spec/feature/cart_spec.rb 96.55 % 56 29 28 1 1.41
spec/feature/coupon_spec.rb 100.00 % 50 30 30 0 2.17
spec/feature/cart_spec.rb 96.55 % 56 29 28 1 1.41
spec/feature/coupon_spec.rb 100.00 % 50 30 30 0 2.17
spec/feature/home_spec.rb 100.00 %96 49 49 0 1.12
spec/feature/login_spec.rb 100.00 % 35 19 19 0 1.16
spec/feature/new_password_spec.rb 100.00 % 24 13 13 0 1.15
spec/feature/registration_spec.rb 100.00 % 51 29 29 0 1.14
spec/feature/review_spec.rb 100.00 %49 30 30 0 1.6746 28 28 0 1.71
spec/feature/settings_spec.rb 100.00 % 62 34 34 0 1.26
spec/feature/shipping_spec.rb 73.08 % 42 26 19 7 0.77
spec/feature/user_spec.rb 100.00 % 76 42 42 0 1.10
spec/models/admin_user_spec.rb 100.00 % 8 5 5 0 1.4039 20 20 0 1.05
spec/models/author_spec.rb 100.00 %13 8 8 0 1.50
spec/models/authors_book_spec.rb 100.00 % 13 8 8 0 1.50
spec/models/billing_spec.rb 100.00 % 27 20 20 0 1.75
spec/models/book_spec.rb 100.00 % 23 16 16 0 1.75
spec/models/books_category_spec.rb 100.00 % 13 8 8 0 1.50
spec/models/category_spec.rb 100.00 % 12 7 7 0 1.43
spec/models/order_spec.rb 100.00 % 10 6 6 0 1.33
spec/models/review_spec.rb 100.00 % 20 14 14 0 1.64
spec/models/shipping_spec.rb 100.00 % 27 20 20 0 1.75
spec/models/user_spec.rb 100.00 %15 9 913 8 80 1.5015 9 913 8 801.441.50
spec/queryes/book_query_spec.rb 100.00 % 77 45 45 01.381.381.381.381.381.001.001.00
spec/feature/book_spec.rb1.00
spec/models/user_spec.rb100.00 % 202 105 105 02.371.001.531.53
spec/feature/book_spec.rb 100.00 % 202 105 105 0 2.37
spec/feature/home_spec.rb 100.00 % 39 20 20 0 1.05
spec/models/author_spec.rb 100.00 % 15 9 9 0 1.44
spec/models/authors_book_spec.rb 100.00 % 15 9 9 0 1.44
spec/models/book_spec.rb 100.00 % 23 16 16 0 1.69
spec/models/books_category_spec.rb 100.00 % 15 9 9 0 1.44
spec/models/category_spec.rb 100.00 % 14 8 8 0 1.380 1.00
spec/factories/shippings.rb 100.00 % 10 8 8 0 1.00
spec/factories/users.rb 100.00 % 7 5 5 011.0013.40
spec/feature/admin/author_spec.rb 100.00 % 57 31 31 0 1.48
spec/feature/admin/book_spec.rb 100.00 %61 32 32 0 1.4183 43 43 0 1.56
spec/feature/admin/category_spec.rb 100.00 % 48 25 25 0 1.56
spec/feature/billing_spec.rb 73.08 % 42 26 19 7 0.773.333.333.333.333.33
spec/factories/shippings.rb 100.00 % 10 8 8 0 1.00
spec/factories/users.rb 100.00 % 7 5 5 011.00
spec/feature/admin/author_spec.rb 100.00 % 57 31 31 0 1.48
spec/feature/admin/book_spec.rb 100.00 %61 32 32 0 1.4183 43 43 0 1.56
spec/feature/admin/category_spec.rb 100.00 % 48 25 25 0 1.56
spec/feature/billing_spec.rb 73.08 % 42 26 19 7 0.773.333.333.333.333.333.33
spec/factories/users.rb 100.00 % 4 2 2 0 1.003.333.333.33
spec/factories/users.rb 100.00 % 4 2 2 0 1.003.33
spec/feature/book_spec.rb 100.00 % 202spec/feature/book_spec.rb 100.00 % 202104 104 0 2.38105 105 0 2.37
spec/feature/cart_spec.rb 96.55 % 56 29 28 1 1.41
spec/feature/coupon_spec.rb 100.00 % 50 30 30 0 2.17
spec/feature/home_spec.rb 100.00 %96 49 49 0 1.12
spec/feature/login_spec.rb 100.00 % 35 19 19 0 1.16
spec/feature/new_password_spec.rb 100.00 % 24 13 13 0 1.15
spec/feature/registration_spec.rb 100.00 % 51 29 29 0 1.14
spec/feature/review_spec.rb 100.00 %49 30 30 0 1.6746 28 28 0 1.71
spec/feature/settings_spec.rb 100.00 % 62 34 34 0 1.26
spec/feature/shipping_spec.rb 73.08 % 42 26 19 7 0.77
spec/feature/user_spec.rb 100.00 % 76 42 42 0 1.10
spec/models/admin_user_spec.rb 100.00 % 8 5 5 0 1.4039 20 20 0 1.05
spec/models/author_spec.rb 100.00 %13 8 8 0 1.50
spec/models/authors_book_spec.rb 100.00 % 13 8 8 0 1.50
spec/models/billing_spec.rb 100.00 % 27 20 20 0 1.75
spec/models/book_spec.rb 100.00 % 23 16 16 0 1.75
spec/models/books_category_spec.rb 100.00 % 13 8 8 0 1.50
spec/models/category_spec.rb 100.00 % 12 7 7 0 1.43
spec/models/order_spec.rb 100.00 % 10 6 6 0 1.33
spec/models/review_spec.rb 100.00 % 20 14 14 0 1.64
spec/models/shipping_spec.rb 100.00 % 27 20 20 0 1.75
spec/models/user_spec.rb 100.00 %15 9 913 8 80 1.50
spec/queryes/book_query_spec.rb 100.00 % 77 45 45 01.381.381.381.381.001.001.00
spec/models/user_spec.rb 100.00 % 5 3 3 0 1.001.001.00
spec/models/user_spec.rb 100.00 % 5 3 3 0 1.001.531.531.53
spec/rails_helper.rb 87.50 % 23 16 14 2 0.881.53spec/models/authors_book_spec.rb 100.00 % 15 9 9 0 1.44
spec/models/book_spec.rb 100.00 % 23 16 16 0 1.69
spec/models/books_category_spec.rb 100.00 % 15 9 9 0 1.44
spec/models/category_spec.rb 100.00 % 14 8 8 0 1.381.001.001.00
spec/models/user_spec.rb 100.00 % 5 3 3 0 1.001.00
spec/models/user_spec.rb 100.00 % 5 3 3 0 1.001.00
spec/models/user_spec.rb 100.00 % 5 3 3 0 1.001.001.00
spec/models/user_spec.rb 100.00 % 5 3 3 0 1.001.00
spec/models/user_spec.rb 100.00 % 5 3 3 0 1.001.00
spec/models/user_spec.rb 100.00 % 5 3 3 0 1.001.001.001.00
spec/models/user_spec.rb 100.00 % 5 3 3 0 1.001.00
spec/models/user_spec.rb 100.00 % 5 3 3 0 1.001.00
spec/models/user_spec.rb 100.00 % 5 3 3spec/support/configs/capybara.rb100.00 %36.84 % 29 19 7 12 0.37100.00 % 29100.00 % 30100.00 % 30100.00 % 3019 190 1.0036.84 % 29 19 7 12 0.3736.84 % 29 19 7 12 0.3736.84 % 29 19 7 12 0.37
spec/models/user_spec.rb 100.00 % 5 3 3 0 1.00
spec/models/user_spec.rb 100.00 % 5 3 3 0 1.001.001.00
spec/models/user_spec.rb 100.00 % 5 3 3 0 1.001.00
spec/models/user_spec.rb 100.00 % 5 3 3 0 1.001.00
spec/models/user_spec.rb 100.00 % 5 3 3 0 1.001.001.001.00
spec/models/user_spec.rb 100.00 % 5 3 3 0 1.001.00
spec/models/user_spec.rb 100.00 % 5 3 3 0 1.001.00
spec/models/user_spec.rb 100.00 % 5 3 3 0 1.001.001.00
spec/models/user_spec.rb 100.00 % 5 3 3 0 1.001.00
spec/models/user_spec.rb 100.00 % 5 3 3 0 1.001.00
spec/models/user_spec.rb 100.00 % 5 3 3 0 1.001.001.001.00
spec/models/user_spec.rb 100.00 % 5 3 3 0 1.001.00
spec/models/user_spec.rb 100.00 % 5 3 3 0 1.001.00
spec/models/user_spec.rb 100.00 % 5 3 3 0 1.001.00
spec/rails_helper.rb 87.50 % 23 16 14 2 0.881.001.001.001.001.001.001.001.53spec/models/authors_book_spec.rb 100.00 % 15 9 9 0 1.44
spec/models/book_spec.rb 100.00 % 23 16 16 0 1.69
spec/models/books_category_spec.rb 100.00 % 15 9 9 0 1.44
spec/models/category_spec.rb 100.00 % 14 8 8 0 1.381.00
spec/rails_helper.rb 87.50 % 23 16 14 2 0.88
spec/support/configs/capybara.rb100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %36.84 % 29 19 7 12 0.37100.00 % 29100.00 % 30100.00 % 30100.00 % 3019 19 0 1.0036.84 % 29 19 7 12 0.37100.00 % 30 19 19 0 1.00100.00 % 30 19 19 0 1.00100.00 % 30 19 19 0 1.00100.00 % 30 19 19 0 1.0036.84 % 29 19 7 12 0.3736.84 % 29 19 7 12 0.3736.84 % 29 19 7 12 0.37100.00 %293036.84 % 291919191919 0 1.007 12 0.377 12 0.3719 0 1.0036.84 % 29 19 7 12 0.37100.00 % 30 19 19 0 1.0036.84 % 29 19 7 12 0.37100.00 %36.84 % 29 19 7 12 0.37100.00 % 29 1919 0 1.0036.84 % 29 19 7 12 0.37100.00 % 29 19 19 0 1.00100.00 % 29 19 19 0 1.007 12 0.377 12 0.377 12 0.3719 0 1.0036.84 % 29 19 7 12 0.37100.00 % 30 19 19 0 1.0036.84 % 29 19 7 12 0.3736.84 % 29 19 7 12 0.37100.00 %293036.84 % 2919100.00 % 29 1919 0 1.0036.84 % 29 19 7 12 0.37100.00 % 29 1919 0 1.00100.00 % 29 19 19 0 1.007 12 0.3736.84 % 29 19 7 12 0.3736.84 % 29 19 7 12 0.37100.00 % 29 19 19 0 1.00100.00 % 29 19 19 0 1.007 12 0.377 12 0.377 12 0.3719 0 1.0036.84 % 29 19 7 12 0.37100.00 % 30 19 19 0 1.0036.84 % 29 19 7 12 0.3736.84 % 29 19 7 12 0.37100.00 %293036.84 % 2919100.00 % 29 1919 0 1.0036.84 % 29 19 7 12 0.37100.00 % 29 19 19 0 1.00100.00 % 29 19 19 0 1.007 12 0.3736.84 % 29 19 7 12 0.3736.84 % 29 19 7 12 0.37100.00 % 29 19 19 0 1.007 12 0.377 12 0.377 12 0.3719 0 1.0036.84 % 29 19 7 12 0.37100.00 % 30 19 19 0 1.0036.84 % 29 19 7 12 0.3736.84 % 29 19 7 12 0.37100.00 %293036.84 % 2919100.00 % 29 1919 0 1.0036.84 % 29 19 7 12 0.37100.00 % 29100.00 % 3019 19 0 1.00100.00 % 29 19 19 0 1.007 12 0.3736.84 % 29 19 7 12 0.3736.84 % 29 19 7 12 0.37100.00 % 29 19 19 0 1.00
spec/support/configs/shoulda_matcher.rb 100.00 %88889999989999999899998898999999899989999989999989995 5 0 1.00
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 73f364d8 (Featire specs) ======= ======= >>>>>>> e1ecabbe (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5506bd0 (Featire specs) >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) >>>>>>> aa4361fd (Featire specs) ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 715fac2 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> add330c (Manifest_cache true) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1d59aaa (Fix) ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> df37394 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 715fac2 (Featire specs) >>>>>>> fb61c5a (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= >>>>>>> fb61c5a (Featire specs) >>>>>>> 73f364d8 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) <<<<<<< HEAD ======= >>>>>>> 0ed7f7c (Featire specs) >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 0676508 (Featire specs) >>>>>>> 448bef30 (Featire specs) ======= ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> aa4361fd (Featire specs) >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d365be68 (Manifest_cache true) ======= >>>>>>> e1ecabbe (Featire specs) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) ======= ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 255dd8d (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 1d6a89b5 (Manifest_cache true) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 6b6d1c2d (Featire specs) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> bc6bc8d2 (Rebased) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> d34a0770 (Manifest_cache true) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 824ea7c9 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> ae07231a (Featire specs) >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> bd30d038 (Manifest_cache true) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c12b71de (Featire specs) >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> bd30d038 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> d4235040 (Manifest_cache true) >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) >>>>>>> d4235040 (Manifest_cache true) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> b3f2049 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0e864a5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> cc390719 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3be4d14 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1b8f36d8 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> a71befd (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8a3779d4 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 551c6ab (Manifest_cache true) <<<<<<< HEAD >>>>>>> 56531f25 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> fd310ed (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86229876 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 42e9c2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> 16ebb0ff (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> c0159bf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d0f5cbf (Manifest_cache true) ======= ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) <<<<<<< HEAD >>>>>>> ca274ec (Manifest_cache true) <<<<<<< HEAD >>>>>>> a56ba36d (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 0b43b18 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1cce66c (Manifest_cache true) <<<<<<< HEAD >>>>>>> d365be68 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)
======= >>>>>>> 5c33a07 (Featire specs)
>>>>>>> 715fac2 (Featire specs)

app/admin/admin_users.rb

40.0% lines covered

20 relevant lines. 8 lines covered and 12 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

<<<<<<< HEAD
            ActiveAdmin.register AdminUser do
=======
            class ApplicationController < ActionController::Base
          
    2. 
        
    
      
        
    
          
  2. 
            
            

            

            end
          
    3.

app/controllers/books_controller.rb

100.0% lines covered

<<<<<<< HEAD 14 relevant lines. 14 lines covered and ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 14 relevant lines. 14 lines covered and ======= 12 relevant lines. 12 lines covered and >>>>>>> 752f0c0 (Featire specs) ======= 12 relevant lines. 12 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= 12 relevant lines. 12 lines covered and >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class BooksController < ApplicationController
>>>>>>> 715fac2 (Featire specs)
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

<<<<<<< HEAD
              permit_params :email, :password, :password_confirmation
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
              PAGINATION_PER_PAGE = 12
>>>>>>> 715fac2 (Featire specs)
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

<<<<<<< HEAD
              index do
=======
<<<<<<< HEAD
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
              def index
>>>>>>> 715fac2 (Featire specs)
          
    5. 
        
    
      
        
    
<<<<<<< HEAD
          
  5. 
            
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
          
  6. 
            24
<<<<<<< HEAD
=======
=======
          
  7. 
            25
>>>>>>> 1214e1f (Add login registration pages)
=======
          
  8. 
            24
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 715fac2 (Featire specs)
            

            

                selectable_column
          
    9. 
        
    
      
        
    
<<<<<<< HEAD
          
  9. 
            
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
          
  10. 
            24
<<<<<<< HEAD
=======
=======
          
  11. 
            25
>>>>>>> 1214e1f (Add login registration pages)
=======
          
  12. 
            24
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 715fac2 (Featire specs)
            

            

                id_column
          
    13. 
        
    
      
        
    
<<<<<<< HEAD
          
  13. 
            
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
          
  14. 
            24
>>>>>>> 715fac2 (Featire specs)
            

            

                column :email
          
    15. 
        
    
      
        
    
          
  15. 
            
            

            

                column :current_sign_in_at
          
    16. 
        
    
      
        
    
<<<<<<< HEAD
          
  16. 
            
            

            

                column :sign_in_count
          
    17. 
        
    
      
        
    
          
  17. 
            
            

            

                column :created_at
          
    18. 
        
    
      
        
    
          
  18. 
            
            

            

                actions
          
    19. 
        
    
      
        
    
          
  19. 
            
            

            

              end
          
    20. 
        
    
      
        
    
          
  20. 
=======
          
  21. 
<<<<<<< HEAD
=======
=======
          
  22. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  23. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  24. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 715fac2 (Featire specs)
            
            

            

            
          
    25. 
        
    
      
        
    
<<<<<<< HEAD
          
  25. 
            1
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
          
  26. 
            24
<<<<<<< HEAD
=======
=======
          
  27. 
            25
>>>>>>> 1214e1f (Add login registration pages)
=======
          
  28. 
            24
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 715fac2 (Featire specs)
            

            

<<<<<<< HEAD
              filter :email
          
    29. 
        
    
      
        
    
          
  29. 
            1
            

            

              filter :current_sign_in_at
          
    30. 
        
    
      
        
    
          
  30. 
            1
            

            

              filter :sign_in_count
          
    31. 
        
    
      
        
    
          
  31. 
            1
            

            

              filter :created_at
          
    32. 
        
    
      
        
    
          
  32. 
            
            

            

            
          
    33. 
        
    
      
        
    
          
  33. 
            1
            

            

              form do |f|
          
    34. 
        
    
      
        
    
          
  34. 
            
            

            

                f.inputs do
          
    35. 
        
    
      
        
    
          
  35. 
            
            

            

                  f.input :email
          
    36. 
        
    
      
        
    
          
  36. 
            
            

            

                  f.input :password
          
    37. 
        
    
      
        
    
          
  37. 
            
            

            

                  f.input :password_confirmation
          
    38. 
        
    
      
        
    
          
  38. 
            
            

            

                end
          
    39. 
        
    
      
        
    
          
  39. 
            
            

            

                f.actions
          
    40. 
        
    
      
        
    
          
  40. 
            
            

            

              end
          
    41. 
        
    
      
        
    
          
  41. 
            
            

            

            end
          
    42.

app/admin/authors.rb

100.0% lines covered

22 relevant lines. 22 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            ActiveAdmin.register Author do
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              config.filters = true
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

              permit_params :first_name, :last_name
          
    4. 
        
    
      
        
    
          
  4. 
            
            

            

            
          
    5. 
        
    
      
        
    
          
  5. 
            1
            

            

              filter :books, collection: Book.all
          
    6. 
        
    
      
        
    
          
  6. 
            1
            

            

              filter :first_name
          
    7. 
        
    
      
        
    
          
  7. 
            1
            

            

              filter :last_name
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

            
          
    9. 
        
    
      
        
    
          
  9. 
            1
            

            

              index do
          
    10. 
        
    
      
        
    
          
  10. 
            3
            

            

                selectable_column
=======
<<<<<<< HEAD
                @books = BookDecorator.decorate_collection(sorted_books)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                @books = BookDecorator.decorate_collection(sorted_books)
=======
                @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE)
>>>>>>> 752f0c0 (Featire specs)
=======
                @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE)
>>>>>>> 4e81ea2 (Featire specs)
=======
                @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE)
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 715fac2 (Featire specs)
          
    11. 
        
    
      
        
    
<<<<<<< HEAD
          
  11. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  12. 
=======
          
  13. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  14. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  15. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
            
            

            

            
          
    16. 
        
    
      
        
    
<<<<<<< HEAD
          
  16. 
            3
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
          
  17. 
            24
<<<<<<< HEAD
=======
=======
          
  18. 
            25
>>>>>>> 1214e1f (Add login registration pages)
=======
          
  19. 
            24
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 715fac2 (Featire specs)
            

            

                column :first_name
          
    20. 
        
    
      
        
    
<<<<<<< HEAD
          
  20. 
            3
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
          
  21. 
            24
<<<<<<< HEAD
=======
=======
          
  22. 
            25
>>>>>>> 1214e1f (Add login registration pages)
=======
          
  23. 
            24
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 715fac2 (Featire specs)
            

            

                column :last_name
          
    24. 
        
    
      
        
    
<<<<<<< HEAD
          
  24. 
            
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
          
  25. 
            24
<<<<<<< HEAD
=======
=======
          
  26. 
            25
>>>>>>> 1214e1f (Add login registration pages)
=======
          
  27. 
            24
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 715fac2 (Featire specs)
            

            

            
          
    28. 
        
    
      
        
    
<<<<<<< HEAD
          
  28. 
            3
=======
<<<<<<< HEAD
          
  29. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  30. 
=======
          
  31. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  32. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  33. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
            1
>>>>>>> 715fac2 (Featire specs)
            

            

                actions
          
    34. 
        
    
      
        
    
<<<<<<< HEAD
          
  34. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  35. 
=======
          
  36. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  37. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  38. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
            
            

            

              end
          
    39. 
        
    
      
        
    
<<<<<<< HEAD
          
  39. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  40. 
=======
          
  41. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  42. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  43. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
            
            

            

            
          
    44. 
        
    
      
        
    
<<<<<<< HEAD
          
  44. 
            1
            

            

              show do
          
    45. 
        
    
      
        
    
          
  45. 
            3
            

            

                attributes_table do
          
    46. 
        
    
      
        
    
          
  46. 
            3
            

            

                  row :first_name
          
    47. 
        
    
      
        
    
          
  47. 
            3
            

            

                  row :last_name
          
    48. 
        
    
      
        
    
          
  48. 
            3
            

            

                  row :books
          
    49. 
        
    
      
        
    
          
  49. 
=======
<<<<<<< HEAD
          
  50. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  51. 
=======
          
  52. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  53. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  54. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 715fac2 (Featire specs)
            
            

            

                end
          
    55. 
        
    
      
        
    
<<<<<<< HEAD
          
  55. 
            
            

            

              end
          
    56. 
        
    
      
        
    
          
  56. 
            
            

            

            
          
    57. 
        
    
      
        
    
          
  57. 
            1
            

            

              form do |f|
          
    58. 
        
    
      
        
    
          
  58. 
            2
            

            

                f.inputs do
          
    59. 
        
    
      
        
    
          
  59. 
            2
            

            

                  f.input :first_name
          
    60. 
        
    
      
        
    
          
  60. 
            2
            

            

                  f.input :last_name
          
    61. 
        
    
      
        
    
          
  61. 
            
            

            

            
          
    62. 
        
    
      
        
    
          
  62. 
            2
            

            

                  f.input :books, as: :select, collection: Book.all
          
    63. 
        
    
      
        
    
          
  63. 
            
            

            

                end
          
    64. 
        
    
      
        
    
          
  64. 
            
            

            

            
          
    65. 
        
    
      
        
    
          
  65. 
            2
            

            

                f.actions
          
    66. 
        
    
      
        
    
          
  66. 
            
            

            

              end
          
    67. 
        
    
      
        
    
          
  67. 
            
            

            

            end
          
    68.

app/admin/books.rb

100.0% lines covered

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= ======= >>>>>>> e055dd0 (Rebased) >>>>>>> bdc24a1a (Rebased) 41 relevant lines. 41 lines covered and ======= 51 relevant lines. 51 lines covered and >>>>>>> b28889f (Fix) 0 lines missed. ======= 51 relevant lines. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix) 11 lines covered and 40 lines missed. >>>>>>> 49e8a6c (Rebased) ======= 51 lines covered and 0 lines missed. >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> fdab719f (Fix) 41 relevant lines. 41 lines covered and ======= 51 relevant lines. 51 lines covered and >>>>>>> b28889f (Fix) 0 lines missed. >>>>>>> c7a726c5 (Rebased) ======= 11 lines covered and 40 lines missed. >>>>>>> 49e8a6c (Rebased) >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> 8887ba5b (Fix) ======= ======= >>>>>>> e18eb87 (Fix) 41 relevant lines. 41 lines covered and ======= 51 relevant lines. 51 lines covered and >>>>>>> b28889f (Fix) 0 lines missed. >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= 11 lines covered and 40 lines missed. >>>>>>> 49e8a6c (Rebased) >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix) 
    
    
      
        
    
          
  1. 
            1
            

            

            ActiveAdmin.register Book do
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              permit_params :title, :description, :price_cents, :dimensions, :year_of_publication, :materials, :quantity,
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                            author_ids: [], category_ids: [], images: []
=======
                            category_ids: [], author_ids: []
>>>>>>> c7a726c5 (Rebased)
=======
                            author_ids: [], category_ids: [], images: []
>>>>>>> bc6bc8d2 (Rebased)
=======
=======
>>>>>>> bdc24a1a (Rebased)
                            author_ids: [], category_ids: [], images: []
=======
                            category_ids: [], author_ids: []
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
                            author_ids: [], category_ids: [], images: []
>>>>>>> e055dd0 (Rebased)
>>>>>>> bdc24a1a (Rebased)
          
    4. 
        
    
      
        
    
          
  4. 
            
            

            

            
          
    5. 
        
    
      
        
    
          
  5. 
            1
            

            

              decorate_with BookDecorator
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

            
          
    7. 
        
    
      
        
    
          
  7. 
            1
            

            

              filter :authors, collection: AuthorDecorator.decorate_collection(Author.all)
          
    8. 
        
    
      
        
    
          
  8. 
            1
            

            

              filter :categories
          
    9. 
        
    
      
        
    
          
  9. 
            1
            

            

              filter :title
          
    10. 
        
    
      
        
    
          
  10. 
            1
            

            

              filter :year_of_publication
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

            
          
    12. 
        
    
      
        
    
          
  12. 
            1
            

            

              index do
          
    13. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> e18eb87 (Fix)
>>>>>>> 99dad91f (Fix)
=======
=======
>>>>>>> 8887ba5b (Fix)
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
>>>>>>> 0c57e4e (Fix)
>>>>>>> 8887ba5b (Fix)
          
  13. 
            4
=======
          
  14. 
            6
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> 99dad91f (Fix)
=======
=======
>>>>>>> e055dd0 (Rebased)
>>>>>>> bdc24a1a (Rebased)
=======
          
  15. 
            
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> bdc24a1a (Rebased)
=======
=======
>>>>>>> 0c57e4e (Fix)
>>>>>>> 8887ba5b (Fix)
=======
          
  16. 
            6
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  17. 
            4
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> 8288136d (Fix)
=======
=======
>>>>>>> 8887ba5b (Fix)
=======
          
  18. 
            4
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
>>>>>>> 0c57e4e (Fix)
>>>>>>> 8887ba5b (Fix)
            

            

                selectable_column
          
    19. 
        
    
      
        
    
          
  19. 
            
            

            

            
          
    20. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> e18eb87 (Fix)
>>>>>>> 99dad91f (Fix)
=======
=======
>>>>>>> 8887ba5b (Fix)
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
>>>>>>> 0c57e4e (Fix)
>>>>>>> 8887ba5b (Fix)
          
  20. 
            4
=======
          
  21. 
            6
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> 99dad91f (Fix)
=======
=======
>>>>>>> e055dd0 (Rebased)
>>>>>>> bdc24a1a (Rebased)
=======
          
  22. 
            
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> bdc24a1a (Rebased)
=======
=======
>>>>>>> 0c57e4e (Fix)
>>>>>>> 8887ba5b (Fix)
=======
          
  23. 
            6
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> 8288136d (Fix)
=======
=======
>>>>>>> 8887ba5b (Fix)
=======
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
>>>>>>> 0c57e4e (Fix)
>>>>>>> 8887ba5b (Fix)
            

            

                column :categories, &:categories_names
          
    24. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> 99dad91f (Fix)
=======
=======
>>>>>>> e055dd0 (Rebased)
>>>>>>> bdc24a1a (Rebased)
=======
=======
>>>>>>> e055dd0 (Rebased)
=======
>>>>>>> 0c57e4e (Fix)
>>>>>>> 8887ba5b (Fix)
          
  24. 
            6
>>>>>>> b28889f (Fix)
=======
          
  25. 
            
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> bdc24a1a (Rebased)
=======
=======
>>>>>>> 0c57e4e (Fix)
>>>>>>> 8887ba5b (Fix)
=======
          
  26. 
            6
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  27. 
            4
>>>>>>> c7a726c5 (Rebased)
=======
          
  28. 
            6
>>>>>>> b28889f (Fix)
>>>>>>> fdab719f (Fix)
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> 8288136d (Fix)
=======
=======
>>>>>>> 8887ba5b (Fix)
=======
          
  29. 
            4
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
          
  30. 
            6
>>>>>>> b28889f (Fix)
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
>>>>>>> 0c57e4e (Fix)
>>>>>>> 8887ba5b (Fix)
            

            

                column :title
          
    31. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> e18eb87 (Fix)
>>>>>>> 99dad91f (Fix)
=======
=======
>>>>>>> 8887ba5b (Fix)
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
>>>>>>> 0c57e4e (Fix)
>>>>>>> 8887ba5b (Fix)
          
  31. 
            4
=======
          
  32. 
            6
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  33. 
            4
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> fdab719f (Fix)
=======
=======
>>>>>>> 99dad91f (Fix)
=======
          
  34. 
            4
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> e18eb87 (Fix)
>>>>>>> 99dad91f (Fix)
            

            

                column :year_of_publication
          
    35. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> e18eb87 (Fix)
>>>>>>> 99dad91f (Fix)
          
  35. 
            4
=======
          
  36. 
            6
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  37. 
            4
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> fdab719f (Fix)
=======
=======
>>>>>>> 99dad91f (Fix)
=======
          
  38. 
            4
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> e18eb87 (Fix)
>>>>>>> 99dad91f (Fix)
            

            

                column :materials
          
    39. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> e18eb87 (Fix)
>>>>>>> 99dad91f (Fix)
          
  39. 
            4
=======
          
  40. 
            6
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  41. 
            4
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> fdab719f (Fix)
=======
=======
>>>>>>> 99dad91f (Fix)
=======
          
  42. 
            4
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> e18eb87 (Fix)
>>>>>>> 99dad91f (Fix)
            

            

                column :dimensions
          
    43. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> fdab719f (Fix)
=======
=======
>>>>>>> 6da9530 (Featire specs)
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
>>>>>>> 99dad91f (Fix)
          
  43. 
            4
            

            

                column :price_cents, &:price
          
    44. 
        
    
      
        
    
          
  44. 
            4
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> e18eb87 (Fix)
>>>>>>> 99dad91f (Fix)
=======
          
  45. 
            6
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> fdab719f (Fix)
=======
=======
>>>>>>> 6da9530 (Featire specs)
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
>>>>>>> 99dad91f (Fix)
            

            

                column :quantity
          
    46. 
        
    
      
        
    
          
  46. 
            4
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> e055dd0 (Rebased)
>>>>>>> bdc24a1a (Rebased)
=======
          
  47. 
            
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> bdc24a1a (Rebased)
=======
=======
>>>>>>> 0c57e4e (Fix)
>>>>>>> 8887ba5b (Fix)
=======
          
  48. 
            6
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> 8288136d (Fix)
=======
=======
>>>>>>> 8887ba5b (Fix)
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
>>>>>>> 0c57e4e (Fix)
>>>>>>> 8887ba5b (Fix)
            

            

                column :authors, &:authors_names
          
    49. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> e18eb87 (Fix)
>>>>>>> 99dad91f (Fix)
=======
=======
>>>>>>> 8887ba5b (Fix)
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
>>>>>>> 0c57e4e (Fix)
>>>>>>> 8887ba5b (Fix)
          
  49. 
            4
=======
          
  50. 
            6
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> 99dad91f (Fix)
=======
=======
>>>>>>> e055dd0 (Rebased)
>>>>>>> bdc24a1a (Rebased)
=======
          
  51. 
            
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> bdc24a1a (Rebased)
=======
=======
>>>>>>> 0c57e4e (Fix)
>>>>>>> 8887ba5b (Fix)
=======
          
  52. 
            6
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  53. 
            4
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> 8288136d (Fix)
=======
=======
>>>>>>> 8887ba5b (Fix)
=======
          
  54. 
            4
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
>>>>>>> 0c57e4e (Fix)
>>>>>>> 8887ba5b (Fix)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> e055dd0 (Rebased)
>>>>>>> bdc24a1a (Rebased)
                column :description
          
    55. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> bdc24a1a (Rebased)
=======
>>>>>>> 8887ba5b (Fix)
          
  55. 
            6
=======
          
  56. 
            
<<<<<<< HEAD
>>>>>>> bc6bc8d2 (Rebased)
=======
          
  57. 
            6
>>>>>>> 8288136d (Fix)
=======
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
          
  58. 
            6
>>>>>>> 0c57e4e (Fix)
>>>>>>> 8887ba5b (Fix)
            

            

                column :price, &:price
          
    59. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> bdc24a1a (Rebased)
=======
>>>>>>> 8887ba5b (Fix)
          
  59. 
            6
=======
          
  60. 
            
<<<<<<< HEAD
>>>>>>> bc6bc8d2 (Rebased)
=======
          
  61. 
            6
>>>>>>> 8288136d (Fix)
=======
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
          
  62. 
            6
>>>>>>> 0c57e4e (Fix)
>>>>>>> 8887ba5b (Fix)
            

            

                column :quantity
          
    63. 
        
    
      
        
    
          
  63. 
            
            

            

            
          
    64. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> bdc24a1a (Rebased)
=======
>>>>>>> 8887ba5b (Fix)
          
  64. 
            6
=======
          
  65. 
            
<<<<<<< HEAD
>>>>>>> bc6bc8d2 (Rebased)
=======
          
  66. 
            6
>>>>>>> 8288136d (Fix)
=======
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
          
  67. 
            6
>>>>>>> 0c57e4e (Fix)
>>>>>>> 8887ba5b (Fix)
            

            

                actions
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
                column :categories, &:categories_names
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
=======
                column :categories, &:categories_names
>>>>>>> 6da9530 (Featire specs)
>>>>>>> 0f8241bb (Featire specs)
=======
=======
                column :categories, &:categories_names
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> e055dd0 (Rebased)
>>>>>>> bdc24a1a (Rebased)
          
    68. 
        
    
      
        
    
          
  68. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> bdc24a1a (Rebased)
=======
            
          
    69. 
        
    
      
        
    
          
  69. 
            4
            

            

                actions
          
    70. 
        
    
      
        
    
          
  70. 
            
            

            

<<<<<<< HEAD
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> e055dd0 (Rebased)
>>>>>>> bdc24a1a (Rebased)
              end
          
    71. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  71. 
=======
          
  72. 
>>>>>>> c7a726c5 (Rebased)
=======
          
  73. 
>>>>>>> bc6bc8d2 (Rebased)
=======
=======
>>>>>>> bdc24a1a (Rebased)
          
  74. 
=======
          
  75. 
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
          
  76. 
>>>>>>> e055dd0 (Rebased)
>>>>>>> bdc24a1a (Rebased)
            
            

            

            
          
    77. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  77. 
=======
          
  78. 
>>>>>>> c7a726c5 (Rebased)
=======
          
  79. 
>>>>>>> bc6bc8d2 (Rebased)
=======
=======
>>>>>>> bdc24a1a (Rebased)
          
  80. 
=======
          
  81. 
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
          
  82. 
>>>>>>> e055dd0 (Rebased)
>>>>>>> bdc24a1a (Rebased)
            1
            

            

              show do
          
    83. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> e18eb87 (Fix)
>>>>>>> 99dad91f (Fix)
=======
=======
>>>>>>> 8887ba5b (Fix)
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
>>>>>>> 0c57e4e (Fix)
>>>>>>> 8887ba5b (Fix)
          
  83. 
            3
=======
          
  84. 
            5
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> 99dad91f (Fix)
=======
=======
>>>>>>> e055dd0 (Rebased)
>>>>>>> bdc24a1a (Rebased)
=======
          
  85. 
            
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> bdc24a1a (Rebased)
=======
=======
>>>>>>> 0c57e4e (Fix)
>>>>>>> 8887ba5b (Fix)
=======
          
  86. 
            5
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  87. 
            3
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> 8288136d (Fix)
=======
=======
>>>>>>> 8887ba5b (Fix)
=======
          
  88. 
            3
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
>>>>>>> 0c57e4e (Fix)
>>>>>>> 8887ba5b (Fix)
            

            

                attributes_table do
          
    89. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> e18eb87 (Fix)
>>>>>>> 99dad91f (Fix)
=======
=======
>>>>>>> 8887ba5b (Fix)
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
>>>>>>> 0c57e4e (Fix)
>>>>>>> 8887ba5b (Fix)
          
  89. 
            3
=======
          
  90. 
            5
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> 99dad91f (Fix)
=======
=======
>>>>>>> e055dd0 (Rebased)
>>>>>>> bdc24a1a (Rebased)
=======
          
  91. 
            
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> bdc24a1a (Rebased)
=======
=======
>>>>>>> 0c57e4e (Fix)
>>>>>>> 8887ba5b (Fix)
=======
          
  92. 
            5
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  93. 
            3
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> 8288136d (Fix)
=======
=======
>>>>>>> 8887ba5b (Fix)
=======
          
  94. 
            3
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
>>>>>>> 0c57e4e (Fix)
>>>>>>> 8887ba5b (Fix)
            

            

                  row :authors, &:authors_names
          
    95. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> e18eb87 (Fix)
>>>>>>> 99dad91f (Fix)
=======
=======
>>>>>>> 8887ba5b (Fix)
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
>>>>>>> 0c57e4e (Fix)
>>>>>>> 8887ba5b (Fix)
          
  95. 
            3
=======
          
  96. 
            5
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> 99dad91f (Fix)
=======
=======
>>>>>>> e055dd0 (Rebased)
>>>>>>> bdc24a1a (Rebased)
=======
          
  97. 
            
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> bdc24a1a (Rebased)
=======
=======
>>>>>>> 0c57e4e (Fix)
>>>>>>> 8887ba5b (Fix)
=======
          
  98. 
            5
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  99. 
            3
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> 8288136d (Fix)
=======
=======
>>>>>>> 8887ba5b (Fix)
=======
          
  100. 
            3
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
>>>>>>> 0c57e4e (Fix)
>>>>>>> 8887ba5b (Fix)
            

            

                  row :categories, &:categories_names
          
    101. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> e18eb87 (Fix)
>>>>>>> 99dad91f (Fix)
=======
=======
>>>>>>> 8887ba5b (Fix)
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
>>>>>>> 0c57e4e (Fix)
>>>>>>> 8887ba5b (Fix)
          
  101. 
            3
=======
          
  102. 
            5
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> 99dad91f (Fix)
=======
=======
>>>>>>> e055dd0 (Rebased)
>>>>>>> bdc24a1a (Rebased)
=======
          
  103. 
            
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> bdc24a1a (Rebased)
=======
=======
>>>>>>> 0c57e4e (Fix)
>>>>>>> 8887ba5b (Fix)
=======
          
  104. 
            5
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  105. 
            3
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> 8288136d (Fix)
=======
=======
>>>>>>> 8887ba5b (Fix)
=======
          
  106. 
            3
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
>>>>>>> 0c57e4e (Fix)
>>>>>>> 8887ba5b (Fix)
            

            

                  row :year_of_publication
          
    107. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> e18eb87 (Fix)
>>>>>>> 99dad91f (Fix)
=======
=======
>>>>>>> 8887ba5b (Fix)
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
>>>>>>> 0c57e4e (Fix)
>>>>>>> 8887ba5b (Fix)
          
  107. 
            3
=======
          
  108. 
            5
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> 99dad91f (Fix)
=======
=======
>>>>>>> e055dd0 (Rebased)
>>>>>>> bdc24a1a (Rebased)
=======
          
  109. 
            
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> bdc24a1a (Rebased)
=======
=======
>>>>>>> 0c57e4e (Fix)
>>>>>>> 8887ba5b (Fix)
=======
          
  110. 
            5
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  111. 
            3
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> 8288136d (Fix)
=======
=======
>>>>>>> 8887ba5b (Fix)
=======
          
  112. 
            3
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
>>>>>>> 0c57e4e (Fix)
>>>>>>> 8887ba5b (Fix)
            

            

                  row :description
          
    113. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> e18eb87 (Fix)
>>>>>>> 99dad91f (Fix)
=======
=======
>>>>>>> 8887ba5b (Fix)
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
>>>>>>> 0c57e4e (Fix)
>>>>>>> 8887ba5b (Fix)
          
  113. 
            3
=======
          
  114. 
            5
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> 99dad91f (Fix)
=======
=======
>>>>>>> e055dd0 (Rebased)
>>>>>>> bdc24a1a (Rebased)
=======
          
  115. 
            
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> bdc24a1a (Rebased)
=======
=======
>>>>>>> 0c57e4e (Fix)
>>>>>>> 8887ba5b (Fix)
=======
          
  116. 
            5
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  117. 
            3
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> 8288136d (Fix)
=======
=======
>>>>>>> 8887ba5b (Fix)
=======
          
  118. 
            3
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
>>>>>>> 0c57e4e (Fix)
>>>>>>> 8887ba5b (Fix)
            

            

                  row :materials
          
    119. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> e18eb87 (Fix)
>>>>>>> 99dad91f (Fix)
=======
=======
>>>>>>> 8887ba5b (Fix)
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
>>>>>>> 0c57e4e (Fix)
>>>>>>> 8887ba5b (Fix)
          
  119. 
            3
=======
          
  120. 
            5
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> 99dad91f (Fix)
=======
=======
>>>>>>> e055dd0 (Rebased)
>>>>>>> bdc24a1a (Rebased)
=======
          
  121. 
            
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> bdc24a1a (Rebased)
=======
=======
>>>>>>> 0c57e4e (Fix)
>>>>>>> 8887ba5b (Fix)
=======
          
  122. 
            5
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  123. 
            3
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> 8288136d (Fix)
=======
=======
>>>>>>> 8887ba5b (Fix)
=======
          
  124. 
            3
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
>>>>>>> 0c57e4e (Fix)
>>>>>>> 8887ba5b (Fix)
            

            

                  row :dimensions
          
    125. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> e18eb87 (Fix)
>>>>>>> 99dad91f (Fix)
=======
=======
>>>>>>> 8887ba5b (Fix)
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
>>>>>>> 0c57e4e (Fix)
>>>>>>> 8887ba5b (Fix)
          
  125. 
            3
=======
          
  126. 
            5
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> 99dad91f (Fix)
=======
=======
>>>>>>> e055dd0 (Rebased)
>>>>>>> bdc24a1a (Rebased)
=======
          
  127. 
            
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> bdc24a1a (Rebased)
=======
=======
>>>>>>> 0c57e4e (Fix)
>>>>>>> 8887ba5b (Fix)
=======
          
  128. 
            5
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  129. 
            3
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> 8288136d (Fix)
=======
=======
>>>>>>> 8887ba5b (Fix)
=======
          
  130. 
            3
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
>>>>>>> 0c57e4e (Fix)
>>>>>>> 8887ba5b (Fix)
            

            

                  row :price, &:price
          
    131. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> e18eb87 (Fix)
>>>>>>> 99dad91f (Fix)
=======
=======
>>>>>>> 8887ba5b (Fix)
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
>>>>>>> 0c57e4e (Fix)
>>>>>>> 8887ba5b (Fix)
          
  131. 
            3
=======
          
  132. 
            5
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> 99dad91f (Fix)
=======
=======
>>>>>>> e055dd0 (Rebased)
>>>>>>> bdc24a1a (Rebased)
=======
          
  133. 
            
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> bdc24a1a (Rebased)
=======
=======
>>>>>>> 0c57e4e (Fix)
>>>>>>> 8887ba5b (Fix)
=======
          
  134. 
            5
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  135. 
            3
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> 8288136d (Fix)
=======
=======
>>>>>>> 8887ba5b (Fix)
=======
          
  136. 
            3
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
>>>>>>> 0c57e4e (Fix)
>>>>>>> 8887ba5b (Fix)
            

            

                  row :created_at
          
    137. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> e18eb87 (Fix)
>>>>>>> 99dad91f (Fix)
=======
=======
>>>>>>> 8887ba5b (Fix)
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
>>>>>>> 0c57e4e (Fix)
>>>>>>> 8887ba5b (Fix)
          
  137. 
            3
=======
          
  138. 
            5
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> 99dad91f (Fix)
=======
=======
>>>>>>> e055dd0 (Rebased)
>>>>>>> bdc24a1a (Rebased)
=======
          
  139. 
            
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> bdc24a1a (Rebased)
=======
=======
>>>>>>> 0c57e4e (Fix)
>>>>>>> 8887ba5b (Fix)
=======
          
  140. 
            5
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  141. 
            3
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> 8288136d (Fix)
=======
=======
>>>>>>> 8887ba5b (Fix)
=======
          
  142. 
            3
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
>>>>>>> 0c57e4e (Fix)
>>>>>>> 8887ba5b (Fix)
            

            

                  row :updated_at
          
    143. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  143. 
=======
          
  144. 
>>>>>>> c7a726c5 (Rebased)
=======
          
  145. 
>>>>>>> bc6bc8d2 (Rebased)
=======
=======
>>>>>>> bdc24a1a (Rebased)
          
  146. 
=======
          
  147. 
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
          
  148. 
>>>>>>> e055dd0 (Rebased)
>>>>>>> bdc24a1a (Rebased)
            
            

            

                end
          
    149. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> e18eb87 (Fix)
>>>>>>> 99dad91f (Fix)
=======
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> e055dd0 (Rebased)
>>>>>>> bdc24a1a (Rebased)
          
  149. 
=======
          
  150. 
            
            

            

            
          
    151. 
        
    
      
        
    
          
  151. 
            5
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> 8288136d (Fix)
=======
=======
>>>>>>> e18eb87 (Fix)
>>>>>>> 99dad91f (Fix)
=======
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> 0c57e4e (Fix)
>>>>>>> 8887ba5b (Fix)
            

            

                panel :images do
          
    152. 
        
    
      
        
    
          
  152. 
            5
            

            

                  table do
          
    153. 
        
    
      
        
    
          
  153. 
            5
            

            

                    book.images.each do |image|
          
    154. 
        
    
      
        
    
          
  154. 
            2
            

            

                      span image_tag image.variant(resize_to_limit: [100, 100])
          
    155. 
        
    
      
        
    
          
  155. 
            
            

            

                    end
          
    156. 
        
    
      
        
    
          
  156. 
=======
<<<<<<< HEAD
          
  157. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  158. 
=======
          
  159. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  160. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  161. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 715fac2 (Featire specs)
            
            

            

                  end
          
    162. 
        
    
      
        
    
<<<<<<< HEAD
          
  162. 
            
            

            

                end
          
    163. 
        
    
      
        
    
          
  163. 
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  164. 
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> fdab719f (Fix)
=======
=======
          
  165. 
>>>>>>> 6da9530 (Featire specs)
>>>>>>> 0f8241bb (Featire specs)
=======
=======
          
  166. 
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
>>>>>>> 99dad91f (Fix)
            
            

            

              end
          
    167. 
        
    
      
        
    
          
  167. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> bdc24a1a (Rebased)
=======
          
  168. 
>>>>>>> 49e8a6c (Rebased)
=======
<<<<<<< HEAD
>>>>>>> c7a726c5 (Rebased)
=======
=======
          
  169. 
>>>>>>> 49e8a6c (Rebased)
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
          
  170. 
>>>>>>> 49e8a6c (Rebased)
>>>>>>> e055dd0 (Rebased)
>>>>>>> bdc24a1a (Rebased)
            
            

            

            
          
    171. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> bdc24a1a (Rebased)
          
  171. 
            
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  172. 
            
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> 8288136d (Fix)
=======
=======
>>>>>>> 8887ba5b (Fix)
=======
          
  173. 
            
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
>>>>>>> 0c57e4e (Fix)
>>>>>>> 8887ba5b (Fix)
            

            

                panel :images do
          
    174. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> bdc24a1a (Rebased)
=======
>>>>>>> 8887ba5b (Fix)
          
  174. 
            5
=======
          
  175. 
            
<<<<<<< HEAD
>>>>>>> bc6bc8d2 (Rebased)
=======
          
  176. 
            5
>>>>>>> 8288136d (Fix)
=======
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
          
  177. 
            5
>>>>>>> 0c57e4e (Fix)
>>>>>>> 8887ba5b (Fix)
            

            

                  table do
          
    178. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> bdc24a1a (Rebased)
=======
>>>>>>> 8887ba5b (Fix)
          
  178. 
            5
=======
          
  179. 
            
<<<<<<< HEAD
>>>>>>> bc6bc8d2 (Rebased)
=======
          
  180. 
            5
>>>>>>> 8288136d (Fix)
=======
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
          
  181. 
            5
>>>>>>> 0c57e4e (Fix)
>>>>>>> 8887ba5b (Fix)
            

            

                    book.images.each do |image|
          
    182. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> bdc24a1a (Rebased)
=======
>>>>>>> 8887ba5b (Fix)
          
  182. 
            2
=======
          
  183. 
            
<<<<<<< HEAD
>>>>>>> bc6bc8d2 (Rebased)
=======
          
  184. 
            2
>>>>>>> 8288136d (Fix)
=======
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
          
  185. 
            2
>>>>>>> 0c57e4e (Fix)
>>>>>>> 8887ba5b (Fix)
            

            

                      span image_tag image.variant(resize_to_limit: [100, 100])
          
    186. 
        
    
      
        
    
          
  186. 
            
            

            

                    end
          
    187. 
        
    
      
        
    
          
  187. 
            
            

            

                  end
          
    188. 
        
    
      
        
    
          
  188. 
            
            

            

                end
          
    189. 
        
    
      
        
    
          
  189. 
            
            

            

              end
          
    190. 
        
    
      
        
    
          
  190. 
            
            

            

            
          
    191. 
        
    
      
        
    
          
  191. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  192. 
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
=======
          
  193. 
>>>>>>> 6da9530 (Featire specs)
>>>>>>> 0f8241bb (Featire specs)
=======
=======
          
  194. 
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> e055dd0 (Rebased)
>>>>>>> bdc24a1a (Rebased)
            1
            

            

              form do |f|
          
    195. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> e18eb87 (Fix)
>>>>>>> 99dad91f (Fix)
=======
=======
>>>>>>> 8887ba5b (Fix)
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
>>>>>>> 0c57e4e (Fix)
>>>>>>> 8887ba5b (Fix)
          
  195. 
            2
=======
          
  196. 
            6
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> 99dad91f (Fix)
=======
=======
>>>>>>> e055dd0 (Rebased)
>>>>>>> bdc24a1a (Rebased)
=======
          
  197. 
            
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> bdc24a1a (Rebased)
=======
=======
>>>>>>> 0c57e4e (Fix)
>>>>>>> 8887ba5b (Fix)
=======
          
  198. 
            6
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  199. 
            2
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> 8288136d (Fix)
=======
=======
>>>>>>> 8887ba5b (Fix)
=======
          
  200. 
            2
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
>>>>>>> 0c57e4e (Fix)
>>>>>>> 8887ba5b (Fix)
            

            

                f.inputs do
          
    201. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> e18eb87 (Fix)
>>>>>>> 99dad91f (Fix)
=======
=======
>>>>>>> 8887ba5b (Fix)
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
>>>>>>> 0c57e4e (Fix)
>>>>>>> 8887ba5b (Fix)
          
  201. 
            2
=======
          
  202. 
            6
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> 99dad91f (Fix)
=======
=======
>>>>>>> e055dd0 (Rebased)
>>>>>>> bdc24a1a (Rebased)
=======
          
  203. 
            
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> bdc24a1a (Rebased)
=======
=======
>>>>>>> 0c57e4e (Fix)
>>>>>>> 8887ba5b (Fix)
=======
          
  204. 
            6
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  205. 
            2
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> 8288136d (Fix)
=======
=======
>>>>>>> 8887ba5b (Fix)
=======
          
  206. 
            2
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
>>>>>>> 0c57e4e (Fix)
>>>>>>> 8887ba5b (Fix)
            

            

                  f.input :title
          
    207. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> e18eb87 (Fix)
>>>>>>> 99dad91f (Fix)
=======
=======
>>>>>>> 8887ba5b (Fix)
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
>>>>>>> 0c57e4e (Fix)
>>>>>>> 8887ba5b (Fix)
          
  207. 
            2
=======
          
  208. 
            6
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> 99dad91f (Fix)
=======
=======
>>>>>>> e055dd0 (Rebased)
>>>>>>> bdc24a1a (Rebased)
=======
          
  209. 
            
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> bdc24a1a (Rebased)
=======
=======
>>>>>>> 0c57e4e (Fix)
>>>>>>> 8887ba5b (Fix)
=======
          
  210. 
            6
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> 8288136d (Fix)
=======
=======
>>>>>>> 8887ba5b (Fix)
=======
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
>>>>>>> 0c57e4e (Fix)
>>>>>>> 8887ba5b (Fix)
            

            

                  f.input :description
          
    211. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> 99dad91f (Fix)
=======
=======
>>>>>>> e055dd0 (Rebased)
>>>>>>> bdc24a1a (Rebased)
=======
=======
>>>>>>> e055dd0 (Rebased)
=======
>>>>>>> 0c57e4e (Fix)
>>>>>>> 8887ba5b (Fix)
          
  211. 
            6
>>>>>>> b28889f (Fix)
=======
          
  212. 
            
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> bdc24a1a (Rebased)
=======
=======
>>>>>>> 0c57e4e (Fix)
>>>>>>> 8887ba5b (Fix)
=======
          
  213. 
            6
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  214. 
            2
>>>>>>> c7a726c5 (Rebased)
=======
          
  215. 
            6
>>>>>>> b28889f (Fix)
>>>>>>> fdab719f (Fix)
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> 8288136d (Fix)
=======
=======
>>>>>>> 8887ba5b (Fix)
=======
          
  216. 
            2
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
          
  217. 
            6
>>>>>>> b28889f (Fix)
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
>>>>>>> 0c57e4e (Fix)
>>>>>>> 8887ba5b (Fix)
            

            

                  f.input :year_of_publication
          
    218. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> e18eb87 (Fix)
>>>>>>> 99dad91f (Fix)
=======
=======
>>>>>>> 8887ba5b (Fix)
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
>>>>>>> 0c57e4e (Fix)
>>>>>>> 8887ba5b (Fix)
          
  218. 
            2
=======
          
  219. 
            6
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> 99dad91f (Fix)
=======
=======
>>>>>>> e055dd0 (Rebased)
>>>>>>> bdc24a1a (Rebased)
=======
          
  220. 
            
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> bdc24a1a (Rebased)
=======
=======
>>>>>>> 0c57e4e (Fix)
>>>>>>> 8887ba5b (Fix)
=======
          
  221. 
            6
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  222. 
            2
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> 8288136d (Fix)
=======
=======
>>>>>>> 8887ba5b (Fix)
=======
          
  223. 
            2
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
>>>>>>> 0c57e4e (Fix)
>>>>>>> 8887ba5b (Fix)
            

            

                  f.input :price_cents
          
    224. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> e18eb87 (Fix)
>>>>>>> 99dad91f (Fix)
=======
=======
>>>>>>> 8887ba5b (Fix)
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
>>>>>>> 0c57e4e (Fix)
>>>>>>> 8887ba5b (Fix)
          
  224. 
            2
=======
          
  225. 
            6
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> 99dad91f (Fix)
=======
=======
>>>>>>> e055dd0 (Rebased)
>>>>>>> bdc24a1a (Rebased)
=======
          
  226. 
            
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> bdc24a1a (Rebased)
=======
=======
>>>>>>> 0c57e4e (Fix)
>>>>>>> 8887ba5b (Fix)
=======
          
  227. 
            6
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  228. 
            2
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> 8288136d (Fix)
=======
=======
>>>>>>> 8887ba5b (Fix)
=======
          
  229. 
            2
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
>>>>>>> 0c57e4e (Fix)
>>>>>>> 8887ba5b (Fix)
            

            

                  f.input :materials
          
    230. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> e18eb87 (Fix)
>>>>>>> 99dad91f (Fix)
=======
=======
>>>>>>> 8887ba5b (Fix)
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
>>>>>>> 0c57e4e (Fix)
>>>>>>> 8887ba5b (Fix)
          
  230. 
            2
=======
          
  231. 
            6
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> 99dad91f (Fix)
=======
=======
>>>>>>> e055dd0 (Rebased)
>>>>>>> bdc24a1a (Rebased)
=======
          
  232. 
            
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> bdc24a1a (Rebased)
=======
=======
>>>>>>> 0c57e4e (Fix)
>>>>>>> 8887ba5b (Fix)
=======
          
  233. 
            6
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  234. 
            2
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> 8288136d (Fix)
=======
=======
>>>>>>> 8887ba5b (Fix)
=======
          
  235. 
            2
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
>>>>>>> 0c57e4e (Fix)
>>>>>>> 8887ba5b (Fix)
            

            

                  f.input :dimensions
          
    236. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> e18eb87 (Fix)
>>>>>>> 99dad91f (Fix)
=======
=======
>>>>>>> 8887ba5b (Fix)
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
>>>>>>> 0c57e4e (Fix)
>>>>>>> 8887ba5b (Fix)
          
  236. 
            2
=======
          
  237. 
            6
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> 99dad91f (Fix)
=======
=======
>>>>>>> e055dd0 (Rebased)
>>>>>>> bdc24a1a (Rebased)
=======
          
  238. 
            
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> bdc24a1a (Rebased)
=======
=======
>>>>>>> 0c57e4e (Fix)
>>>>>>> 8887ba5b (Fix)
=======
          
  239. 
            6
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  240. 
            2
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> 8288136d (Fix)
=======
=======
>>>>>>> 8887ba5b (Fix)
=======
          
  241. 
            2
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
>>>>>>> 0c57e4e (Fix)
>>>>>>> 8887ba5b (Fix)
            

            

                  f.input :quantity
          
    242. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> bdc24a1a (Rebased)
=======
          
  242. 
            2
            

            

                  f.input :description, as: :text
          
    243. 
        
    
      
        
    
          
  243. 
            
            

            

            
          
    244. 
        
    
      
        
    
          
  244. 
            2
            

            

                  f.input :categories, as: :select, collection: Category.all
          
    245. 
        
    
      
        
    
          
  245. 
            2
            

            

                  f.input :authors, as: :select, collection: AuthorDecorator.decorate_collection(Author.all)
          
    246. 
        
    
      
        
    
          
  246. 
            
            

            

                end
          
    247. 
        
    
      
        
    
          
  247. 
            
            

            

            
          
    248. 
        
    
      
        
    
          
  248. 
            2
            

            

                f.actions
          
    249. 
        
    
      
        
    
<<<<<<< HEAD
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> e055dd0 (Rebased)
>>>>>>> bdc24a1a (Rebased)
          
  249. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> bdc24a1a (Rebased)
=======
=======
>>>>>>> 49e8a6c (Rebased)
=======
=======
<<<<<<< HEAD
>>>>>>> fdab719f (Fix)
=======
=======
=======
>>>>>>> 49e8a6c (Rebased)
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
=======
=======
>>>>>>> 49e8a6c (Rebased)
>>>>>>> e055dd0 (Rebased)
>>>>>>> bdc24a1a (Rebased)
            
          
    250. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> 99dad91f (Fix)
=======
=======
>>>>>>> e055dd0 (Rebased)
>>>>>>> bdc24a1a (Rebased)
=======
=======
>>>>>>> e055dd0 (Rebased)
=======
>>>>>>> 0c57e4e (Fix)
>>>>>>> 8887ba5b (Fix)
          
  250. 
            6
=======
          
  251. 
            
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> bdc24a1a (Rebased)
=======
=======
>>>>>>> 0c57e4e (Fix)
>>>>>>> 8887ba5b (Fix)
=======
          
  252. 
            6
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  253. 
            6
>>>>>>> fdab719f (Fix)
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> 8288136d (Fix)
=======
=======
>>>>>>> 8887ba5b (Fix)
=======
          
  254. 
            6
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
>>>>>>> 0c57e4e (Fix)
>>>>>>> 8887ba5b (Fix)
            

            

                  f.input :categories, as: :select, collection: Category.all
          
    255. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> 99dad91f (Fix)
=======
=======
>>>>>>> e055dd0 (Rebased)
>>>>>>> bdc24a1a (Rebased)
=======
=======
>>>>>>> e055dd0 (Rebased)
=======
>>>>>>> 0c57e4e (Fix)
>>>>>>> 8887ba5b (Fix)
          
  255. 
            6
=======
          
  256. 
            
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> bdc24a1a (Rebased)
=======
=======
>>>>>>> 0c57e4e (Fix)
>>>>>>> 8887ba5b (Fix)
=======
          
  257. 
            6
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  258. 
            6
>>>>>>> fdab719f (Fix)
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> 8288136d (Fix)
=======
=======
>>>>>>> 8887ba5b (Fix)
=======
          
  259. 
            6
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
>>>>>>> 0c57e4e (Fix)
>>>>>>> 8887ba5b (Fix)
            

            

                  f.input :authors, as: :select, collection: AuthorDecorator.decorate_collection(Author.all)
          
    260. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> 99dad91f (Fix)
=======
=======
>>>>>>> e055dd0 (Rebased)
>>>>>>> bdc24a1a (Rebased)
=======
=======
>>>>>>> e055dd0 (Rebased)
=======
>>>>>>> 0c57e4e (Fix)
>>>>>>> 8887ba5b (Fix)
          
  260. 
            6
=======
          
  261. 
            
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> bdc24a1a (Rebased)
=======
=======
>>>>>>> 0c57e4e (Fix)
>>>>>>> 8887ba5b (Fix)
=======
          
  262. 
            6
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  263. 
            6
>>>>>>> fdab719f (Fix)
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> 8288136d (Fix)
=======
=======
>>>>>>> 8887ba5b (Fix)
=======
          
  264. 
            6
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
>>>>>>> 0c57e4e (Fix)
>>>>>>> 8887ba5b (Fix)
            

            

                  f.input :images, as: :file, input_html: { multiple: true }
          
    265. 
        
    
      
        
    
          
  265. 
            
            

            

                end
          
    266. 
        
    
      
        
    
          
  266. 
            
            

            

            
          
    267. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> 99dad91f (Fix)
=======
=======
>>>>>>> e055dd0 (Rebased)
>>>>>>> bdc24a1a (Rebased)
=======
=======
>>>>>>> e055dd0 (Rebased)
=======
>>>>>>> 0c57e4e (Fix)
>>>>>>> 8887ba5b (Fix)
          
  267. 
            6
=======
          
  268. 
            
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> bdc24a1a (Rebased)
=======
=======
>>>>>>> 0c57e4e (Fix)
>>>>>>> 8887ba5b (Fix)
=======
          
  269. 
            6
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  270. 
            6
>>>>>>> fdab719f (Fix)
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> 8288136d (Fix)
=======
=======
>>>>>>> 8887ba5b (Fix)
=======
          
  271. 
            6
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
>>>>>>> 0c57e4e (Fix)
>>>>>>> 8887ba5b (Fix)
            

            

                panel :images do
          
    272. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> 99dad91f (Fix)
=======
=======
>>>>>>> e055dd0 (Rebased)
>>>>>>> bdc24a1a (Rebased)
=======
=======
>>>>>>> e055dd0 (Rebased)
=======
>>>>>>> 0c57e4e (Fix)
>>>>>>> 8887ba5b (Fix)
          
  272. 
            6
=======
          
  273. 
            
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> bdc24a1a (Rebased)
=======
=======
>>>>>>> 0c57e4e (Fix)
>>>>>>> 8887ba5b (Fix)
=======
          
  274. 
            6
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  275. 
            6
>>>>>>> fdab719f (Fix)
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> 8288136d (Fix)
=======
=======
>>>>>>> 8887ba5b (Fix)
=======
          
  276. 
            6
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
>>>>>>> 0c57e4e (Fix)
>>>>>>> 8887ba5b (Fix)
            

            

                  f.object.images.each do |image|
          
    277. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> 99dad91f (Fix)
=======
=======
>>>>>>> e055dd0 (Rebased)
>>>>>>> bdc24a1a (Rebased)
=======
=======
>>>>>>> e055dd0 (Rebased)
=======
>>>>>>> 0c57e4e (Fix)
>>>>>>> 8887ba5b (Fix)
          
  277. 
            1
=======
          
  278. 
            
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> bdc24a1a (Rebased)
=======
=======
>>>>>>> 0c57e4e (Fix)
>>>>>>> 8887ba5b (Fix)
=======
          
  279. 
            1
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  280. 
            1
>>>>>>> fdab719f (Fix)
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> 8288136d (Fix)
=======
=======
>>>>>>> 8887ba5b (Fix)
=======
          
  281. 
            1
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
>>>>>>> 0c57e4e (Fix)
>>>>>>> 8887ba5b (Fix)
            

            

                    span image_tag image.variant(resize_to_limit: [100, 100])
          
    282. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> 99dad91f (Fix)
=======
=======
>>>>>>> e055dd0 (Rebased)
>>>>>>> bdc24a1a (Rebased)
=======
=======
>>>>>>> e055dd0 (Rebased)
=======
>>>>>>> 0c57e4e (Fix)
>>>>>>> 8887ba5b (Fix)
          
  282. 
            1
=======
          
  283. 
            
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> bdc24a1a (Rebased)
=======
=======
>>>>>>> 0c57e4e (Fix)
>>>>>>> 8887ba5b (Fix)
=======
          
  284. 
            1
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  285. 
            1
>>>>>>> fdab719f (Fix)
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> 8288136d (Fix)
=======
=======
>>>>>>> 8887ba5b (Fix)
=======
          
  286. 
            1
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
>>>>>>> 0c57e4e (Fix)
>>>>>>> 8887ba5b (Fix)
            

            

                    span link_to('Delete', delete_image_admin_book_path(image.id), method: :delete,
          
    287. 
        
    
      
        
    
          
  287. 
            
            

            

                                                                                   data: { confirm: "Delete #{image.filename}?" })
          
    288. 
        
    
      
        
    
          
  288. 
            
            

            

                  end
          
    289. 
        
    
      
        
    
          
  289. 
            
            

            

                end
          
    290. 
        
    
      
        
    
          
  290. 
            
            

            

            
          
    291. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> 99dad91f (Fix)
=======
=======
>>>>>>> e055dd0 (Rebased)
>>>>>>> bdc24a1a (Rebased)
=======
=======
>>>>>>> e055dd0 (Rebased)
=======
>>>>>>> 0c57e4e (Fix)
>>>>>>> 8887ba5b (Fix)
          
  291. 
            6
=======
          
  292. 
            
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> bdc24a1a (Rebased)
=======
=======
>>>>>>> 0c57e4e (Fix)
>>>>>>> 8887ba5b (Fix)
=======
          
  293. 
            6
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  294. 
            6
>>>>>>> fdab719f (Fix)
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> 8288136d (Fix)
=======
=======
>>>>>>> 8887ba5b (Fix)
=======
          
  295. 
            6
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
>>>>>>> 0c57e4e (Fix)
>>>>>>> 8887ba5b (Fix)
            

            

                f.actions
          
    296. 
        
    
      
        
    
          
  296. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> bdc24a1a (Rebased)
>>>>>>> b28889f (Fix)
=======
>>>>>>> 49e8a6c (Rebased)
=======
<<<<<<< HEAD
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> b28889f (Fix)
=======
>>>>>>> 49e8a6c (Rebased)
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> b28889f (Fix)
=======
>>>>>>> 49e8a6c (Rebased)
>>>>>>> e055dd0 (Rebased)
>>>>>>> bdc24a1a (Rebased)
              end
          
    297. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  297. 
=======
=======
>>>>>>> 49e8a6c (Rebased)
          
  298. 
            
            

            

            
          
    299. 
        
    
      
        
    
          
  299. 
            1
            

            

              member_action :delete_image, method: :delete do
          
    300. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
          
  300. 
            1
=======
          
  301. 
            
>>>>>>> 49e8a6c (Rebased)
=======
          
  302. 
            1
>>>>>>> 872e675 (Fix)
            

            

                ActiveStorage::Attachment.find(params[:id]).destroy
          
    303. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
          
  303. 
            1
=======
          
  304. 
            
>>>>>>> 49e8a6c (Rebased)
=======
          
  305. 
            1
>>>>>>> 872e675 (Fix)
            

            

                redirect_back(fallback_location: edit_admin_book_path)
          
    306. 
        
    
      
        
    
          
  306. 
            
            

            

=======
>>>>>>> b28889f (Fix)
>>>>>>> fdab719f (Fix)
              end
          
    307. 
        
    
      
        
    
<<<<<<< HEAD
          
  307. 
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
=======
>>>>>>> 49e8a6c (Rebased)
=======
          
  308. 
>>>>>>> c7a726c5 (Rebased)
=======
<<<<<<< HEAD
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> bdc24a1a (Rebased)
          
  309. 
=======
=======
>>>>>>> 49e8a6c (Rebased)
          
  310. 
            
            

            

            
          
    311. 
        
    
      
        
    
          
  311. 
            1
            

            

              member_action :delete_image, method: :delete do
          
    312. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
          
  312. 
            1
=======
          
  313. 
            
>>>>>>> 49e8a6c (Rebased)
=======
          
  314. 
            1
>>>>>>> 872e675 (Fix)
            

            

                ActiveStorage::Attachment.find(params[:id]).destroy
          
    315. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
          
  315. 
            1
=======
          
  316. 
            
>>>>>>> 49e8a6c (Rebased)
=======
          
  317. 
            1
>>>>>>> 872e675 (Fix)
            

            

                redirect_back(fallback_location: edit_admin_book_path)
          
    318. 
        
    
      
        
    
          
  318. 
            
            

            

=======
>>>>>>> b28889f (Fix)
>>>>>>> e18eb87 (Fix)
              end
          
    319. 
        
    
      
        
    
<<<<<<< HEAD
          
  319. 
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> fdab719f (Fix)
=======
=======
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> bc6bc8d2 (Rebased)
=======
=======
          
  320. 
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> e055dd0 (Rebased)
          
  321. 
=======
=======
>>>>>>> 49e8a6c (Rebased)
          
  322. 
            
            

            

            
          
    323. 
        
    
      
        
    
          
  323. 
            1
            

            

              member_action :delete_image, method: :delete do
          
    324. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
          
  324. 
            1
=======
          
  325. 
            
>>>>>>> 49e8a6c (Rebased)
=======
          
  326. 
            1
>>>>>>> 872e675 (Fix)
            

            

                ActiveStorage::Attachment.find(params[:id]).purge_later
          
    327. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
          
  327. 
            1
=======
          
  328. 
            
>>>>>>> 49e8a6c (Rebased)
=======
          
  329. 
            1
>>>>>>> 872e675 (Fix)
            

            

                redirect_back(fallback_location: edit_admin_book_path)
          
    330. 
        
    
      
        
    
          
  330. 
            
            

            

              end
          
    331. 
        
    
      
        
    
          
  331. 
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
=======
>>>>>>> 49e8a6c (Rebased)
>>>>>>> e055dd0 (Rebased)
>>>>>>> bdc24a1a (Rebased)
            
            

            

            end
          
    332.

app/admin/categories.rb

100.0% lines covered

18 relevant lines. 18 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            ActiveAdmin.register Category do
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              permit_params :name, book_ids: []
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              filter :books, collection: Book.all
          
    5. 
        
    
      
        
    
          
  5. 
            1
            

            

              filter :name
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

            
          
    7. 
        
    
      
        
    
          
  7. 
            1
            

            

              index do
          
    8. 
        
    
      
        
    
          
  8. 
            4
            

            

                selectable_column
          
    9. 
        
    
      
        
    
          
  9. 
            
            

            

            
          
    10. 
        
    
      
        
    
          
  10. 
            4
            

            

                column :name
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

            
          
    12. 
        
    
      
        
    
          
  12. 
            4
            

            

                actions
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

              end
          
    14. 
        
    
      
        
    
          
  14. 
            
            

            

            
          
    15. 
        
    
      
        
    
          
  15. 
            1
            

            

              show do
          
    16. 
        
    
      
        
    
          
  16. 
            3
            

            

                attributes_table do
          
    17. 
        
    
      
        
    
          
  17. 
            3
            

            

                  row :name
          
    18. 
        
    
      
        
    
          
  18. 
            3
            

            

                  row :created_at
          
    19. 
        
    
      
        
    
          
  19. 
            3
            

            

                  row :updated_at
          
    20. 
        
    
      
        
    
=======
<<<<<<< HEAD
>>>>>>> 715fac2 (Featire specs)
          
  20. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  21. 
=======
          
  22. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  23. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  24. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
            
            

            

                end
          
    25. 
        
    
      
        
    
<<<<<<< HEAD
          
  25. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  26. 
=======
          
  27. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  28. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  29. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
            
            

            

              end
          
    30. 
        
    
      
        
    
<<<<<<< HEAD
          
  30. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  31. 
=======
          
  32. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  33. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  34. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
            
            

            

            
          
    35. 
        
    
      
        
    
<<<<<<< HEAD
          
  35. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  36. 
=======
          
  37. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  38. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  39. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
            1
            

            

              form do |f|
          
    40. 
        
    
      
        
    
<<<<<<< HEAD
          
  40. 
            2
=======
<<<<<<< HEAD
          
  41. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  42. 
=======
          
  43. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  44. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  45. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
            7
>>>>>>> 715fac2 (Featire specs)
            

            

<<<<<<< HEAD
                f.inputs do
=======
<<<<<<< HEAD
                @book = Book.find(params[:id]).decorate
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                @book = Book.find(params[:id]).decorate
=======
                @book = Book.find_by(id: params[:id])
>>>>>>> 752f0c0 (Featire specs)
=======
                @book = Book.find_by(id: params[:id])
>>>>>>> 4e81ea2 (Featire specs)
=======
                @book = Book.find_by(id: params[:id])
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 715fac2 (Featire specs)
          
    46. 
        
    
      
        
    
<<<<<<< HEAD
          
  46. 
            2
=======
<<<<<<< HEAD
          
  47. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  48. 
=======
          
  49. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  50. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  51. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
            
>>>>>>> 715fac2 (Featire specs)
            

            

                  f.input :name
          
    52. 
        
    
      
        
    
<<<<<<< HEAD
          
  52. 
            2
=======
<<<<<<< HEAD
          
  53. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  54. 
=======
          
  55. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  56. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  57. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
            7
>>>>>>> 715fac2 (Featire specs)
            

            

                  f.input :books, as: :select, collection: Book.all
          
    58. 
        
    
      
        
    
<<<<<<< HEAD
          
  58. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  59. 
=======
          
  60. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  61. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  62. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
            
            

            

                end
          
    63. 
        
    
      
        
    
<<<<<<< HEAD
          
  63. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  64. 
=======
          
  65. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  66. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  67. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
            
            

            

            
          
    68. 
        
    
      
        
    
          
  68. 
            2
            

            

                f.actions
          
    69. 
        
    
      
        
    
          
  69. 
            
            

            

              end
          
    70. 
        
    
      
        
    
          
  70. 
            
            

            

            end
          
    71.

app/admin/coupons.rb

100.0% lines covered

2 relevant lines. 2 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            ActiveAdmin.register Coupon do
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              permit_params :code, :is_active, :active_till_date, :discount, :order_id
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            end
          
    4.

app/admin/dashboard.rb

44.44% lines covered

9 relevant lines. 4 lines covered and 5 lines missed. 
    
    
      
        
    
          
  1. 
            
            

            

            # frozen_string_literal: true
          
    2. 
        
    
      
        
    
          
  2. 
            
            

            

            
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

            ActiveAdmin.register_page 'Dashboard' do
          
    4. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> e18eb87 (Fix)
>>>>>>> 99dad91f (Fix)
=======
=======
>>>>>>> 8887ba5b (Fix)
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
>>>>>>> 0c57e4e (Fix)
>>>>>>> 8887ba5b (Fix)
          
  4. 
            31
=======
          
  5. 
            39
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> 99dad91f (Fix)
=======
=======
>>>>>>> e055dd0 (Rebased)
>>>>>>> bdc24a1a (Rebased)
=======
          
  6. 
            1
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> bdc24a1a (Rebased)
=======
=======
>>>>>>> 0c57e4e (Fix)
>>>>>>> 8887ba5b (Fix)
=======
          
  7. 
            39
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  8. 
            31
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> 8288136d (Fix)
=======
=======
>>>>>>> 8887ba5b (Fix)
=======
          
  9. 
            31
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
>>>>>>> 0c57e4e (Fix)
>>>>>>> 8887ba5b (Fix)
            

            

              menu priority: 1, label: proc { I18n.t('active_admin.dashboard') }
          
    10. 
        
    
      
        
    
          
  10. 
            
            

            

            
          
    11. 
        
    
      
        
    
          
  11. 
            1
            

            

              action_item only: :show do
          
    12. 
        
    
      
        
    
          
  12. 
            
            

            

                link_to 'SideKiq View', sidekiq_web_path
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

              end
          
    14. 
        
    
      
        
    
          
  14. 
            
            

            

            
          
    15. 
        
    
      
        
    
          
  15. 
            1
            

            

              content title: proc { I18n.t('active_admin.dashboard') } do
          
    16. 
        
    
      
        
    
          
  16. 
            
            

            

                div class: 'blank_slate_container', id: 'dashboard_default_message' do
          
    17. 
        
    
      
        
    
          
  17. 
            
            

            

                  span class: 'blank_slate' do
          
    18. 
        
    
      
        
    
          
  18. 
            
            

            

                    span I18n.t('active_admin.dashboard_welcome.welcome')
          
    19. 
        
    
      
        
    
          
  19. 
            
            

            

                    small I18n.t('active_admin.dashboard_welcome.call_to_action')
          
    20. 
        
    
      
        
    
          
  20. 
            
            

            

                  end
          
    21. 
        
    
      
        
    
          
  21. 
            
            

            

                end
          
    22. 
        
    
      
        
    
          
  22. 
            
            

            

              end
          
    23. 
        
    
      
        
    
          
  23. 
            
            

            

            end
          
    24.

app/admin/orders.rb

100.0% lines covered

2 relevant lines. 2 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            ActiveAdmin.register Order do
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              permit_params :user_id, :coupon_id, :total_price, :status, :last_action
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            end
          
    4.
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= >>>>>>> 6e923b9d (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 53db2224 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4fac471d (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9bfbd88 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 9bfbd88 (Featire specs) >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 11792758 (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4fac471d (Manifest_cache true) ======= ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix)

app/admin/admin_users.rb

40.0% lines covered

20 relevant lines. 8 lines covered and 12 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            ActiveAdmin.register AdminUser do
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              permit_params :email, :password, :password_confirmation
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              index do
          
    5. 
        
    
      
        
    
          
  5. 
            
            

            

                selectable_column
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

                id_column
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

                column :email
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

                column :current_sign_in_at
          
    9. 
        
    
      
        
    
          
  9. 
            
            

            

                column :sign_in_count
          
    10. 
        
    
      
        
    
          
  10. 
            
            

            

                column :created_at
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

                actions
          
    12. 
        
    
      
        
    
          
  12. 
            
            

            

              end
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

            
          
    14. 
        
    
      
        
    
          
  14. 
            1
            

            

              filter :email
          
    15. 
        
    
      
        
    
          
  15. 
            1
            

            

              filter :current_sign_in_at
          
    16. 
        
    
      
        
    
          
  16. 
            1
            

            

              filter :sign_in_count
          
    17. 
        
    
      
        
    
          
  17. 
            1
            

            

              filter :created_at
          
    18. 
        
    
      
        
    
          
  18. 
            
            

            

            
          
    19. 
        
    
      
        
    
          
  19. 
            1
            

            

              form do |f|
          
    20. 
        
    
      
        
    
          
  20. 
            
            

            

                f.inputs do
          
    21. 
        
    
      
        
    
          
  21. 
            
            

            

                  f.input :email
          
    22. 
        
    
      
        
    
          
  22. 
            
            

            

                  f.input :password
          
    23. 
        
    
      
        
    
          
  23. 
            
            

            

                  f.input :password_confirmation
          
    24. 
        
    
      
        
    
          
  24. 
            
            

            

                end
          
    25. 
        
    
      
        
    
          
  25. 
            
            

            

                f.actions
          
    26. 
        
    
      
        
    
          
  26. 
            
            

            

              end
          
    27. 
        
    
      
        
    
          
  27. 
            
            

            

            end
          
    28.

app/admin/authors.rb

100.0% lines covered

22 relevant lines. 22 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            ActiveAdmin.register Author do
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              config.filters = true
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

              permit_params :first_name, :last_name
          
    4. 
        
    
      
        
    
          
  4. 
            
            

            

            
          
    5. 
        
    
      
        
    
          
  5. 
            1
            

            

              filter :books, collection: Book.all
          
    6. 
        
    
      
        
    
          
  6. 
            1
            

            

              filter :first_name
          
    7. 
        
    
      
        
    
          
  7. 
            1
            

            

              filter :last_name
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

            
          
    9. 
        
    
      
        
    
          
  9. 
            1
            

            

              index do
          
    10. 
        
    
      
        
    
          
  10. 
            3
            

            

                selectable_column
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

            
          
    12. 
        
    
      
        
    
          
  12. 
            3
            

            

                column :first_name
          
    13. 
        
    
      
        
    
          
  13. 
            3
            

            

                column :last_name
          
    14. 
        
    
      
        
    
          
  14. 
            
            

            

            
          
    15. 
        
    
      
        
    
          
  15. 
            3
            

            

                actions
          
    16. 
        
    
      
        
    
          
  16. 
            
            

            

              end
          
    17. 
        
    
      
        
    
          
  17. 
            
            

            

            
          
    18. 
        
    
      
        
    
          
  18. 
            1
            

            

              show do
          
    19. 
        
    
      
        
    
          
  19. 
            3
            

            

                attributes_table do
          
    20. 
        
    
      
        
    
          
  20. 
            3
            

            

                  row :first_name
          
    21. 
        
    
      
        
    
          
  21. 
            3
            

            

                  row :last_name
          
    22. 
        
    
      
        
    
          
  22. 
            3
            

            

                  row :books
          
    23. 
        
    
      
        
    
          
  23. 
            
            

            

                end
          
    24. 
        
    
      
        
    
          
  24. 
            
            

            

              end
          
    25. 
        
    
      
        
    
          
  25. 
            
            

            

            
          
    26. 
        
    
      
        
    
          
  26. 
            1
            

            

              form do |f|
          
    27. 
        
    
      
        
    
          
  27. 
            2
            

            

                f.inputs do
          
    28. 
        
    
      
        
    
          
  28. 
            2
            

            

                  f.input :first_name
          
    29. 
        
    
      
        
    
          
  29. 
            2
            

            

                  f.input :last_name
          
    30. 
        
    
      
        
    
          
  30. 
            
            

            

            
          
    31. 
        
    
      
        
    
          
  31. 
            2
            

            

                  f.input :books, as: :select, collection: Book.all
          
    32. 
        
    
      
        
    
          
  32. 
            
            

            

                end
          
    33. 
        
    
      
        
    
          
  33. 
            
            

            

            
          
    34. 
        
    
      
        
    
          
  34. 
            2
            

            

                f.actions
          
    35. 
        
    
      
        
    
          
  35. 
            
            

            

              end
          
    36. 
        
    
      
        
    
          
  36. 
            
            

            

            end
          
    37.

app/admin/books.rb

100.0% lines covered

51 relevant lines. <<<<<<< HEAD <<<<<<< HEAD 51 lines covered and 0 lines missed. ======= 11 lines covered and 40 lines missed. >>>>>>> 11792758 (Rebased) ======= 51 lines covered and 0 lines missed. >>>>>>> 31d15e66 (Fix) 
    
    
      
        
    
          
  1. 
            1
            

            

            ActiveAdmin.register Book do
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              permit_params :title, :description, :price_cents, :dimensions, :year_of_publication, :materials, :quantity,
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

                            author_ids: [], category_ids: [], images: []
          
    4. 
        
    
      
        
    
          
  4. 
            
            

            

            
          
    5. 
        
    
      
        
    
          
  5. 
            1
            

            

              decorate_with BookDecorator
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

            
          
    7. 
        
    
      
        
    
          
  7. 
            1
            

            

              filter :authors, collection: AuthorDecorator.decorate_collection(Author.all)
          
    8. 
        
    
      
        
    
          
  8. 
            1
            

            

              filter :categories
          
    9. 
        
    
      
        
    
          
  9. 
            1
            

            

              filter :title
          
    10. 
        
    
      
        
    
          
  10. 
            1
            

            

              filter :year_of_publication
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

            
          
    12. 
        
    
      
        
    
          
  12. 
            1
            

            

              index do
          
    13. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
          
  13. 
            6
=======
          
  14. 
            
>>>>>>> 11792758 (Rebased)
=======
          
  15. 
            6
>>>>>>> 31d15e66 (Fix)
            

            

                selectable_column
          
    16. 
        
    
      
        
    
          
  16. 
            
            

            

            
          
    17. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
          
  17. 
            6
=======
          
  18. 
            
>>>>>>> 11792758 (Rebased)
=======
          
  19. 
            6
>>>>>>> 31d15e66 (Fix)
            

            

                column :categories, &:categories_names
          
    20. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
          
  20. 
            6
=======
          
  21. 
            
>>>>>>> 11792758 (Rebased)
=======
          
  22. 
            6
>>>>>>> 31d15e66 (Fix)
            

            

                column :title
          
    23. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
          
  23. 
            6
=======
          
  24. 
            
>>>>>>> 11792758 (Rebased)
=======
          
  25. 
            6
>>>>>>> 31d15e66 (Fix)
            

            

                column :authors, &:authors_names
          
    26. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
          
  26. 
            6
=======
          
  27. 
            
>>>>>>> 11792758 (Rebased)
=======
          
  28. 
            6
>>>>>>> 31d15e66 (Fix)
            

            

                column :description
          
    29. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
          
  29. 
            6
=======
          
  30. 
            
>>>>>>> 11792758 (Rebased)
=======
          
  31. 
            6
>>>>>>> 31d15e66 (Fix)
            

            

                column :price, &:price
          
    32. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
          
  32. 
            6
=======
          
  33. 
            
>>>>>>> 11792758 (Rebased)
=======
          
  34. 
            6
>>>>>>> 31d15e66 (Fix)
            

            

                column :quantity
          
    35. 
        
    
      
        
    
          
  35. 
            
            

            

            
          
    36. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
          
  36. 
            6
=======
          
  37. 
            
>>>>>>> 11792758 (Rebased)
=======
          
  38. 
            6
>>>>>>> 31d15e66 (Fix)
            

            

                actions
          
    39. 
        
    
      
        
    
          
  39. 
            
            

            

              end
          
    40. 
        
    
      
        
    
          
  40. 
            
            

            

            
          
    41. 
        
    
      
        
    
          
  41. 
            1
            

            

              show do
          
    42. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
          
  42. 
            5
=======
          
  43. 
            
>>>>>>> 11792758 (Rebased)
=======
          
  44. 
            5
>>>>>>> 31d15e66 (Fix)
            

            

                attributes_table do
          
    45. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
          
  45. 
            5
=======
          
  46. 
            
>>>>>>> 11792758 (Rebased)
=======
          
  47. 
            5
>>>>>>> 31d15e66 (Fix)
            

            

                  row :authors, &:authors_names
          
    48. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
          
  48. 
            5
=======
          
  49. 
            
>>>>>>> 11792758 (Rebased)
=======
          
  50. 
            5
>>>>>>> 31d15e66 (Fix)
            

            

                  row :categories, &:categories_names
          
    51. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
          
  51. 
            5
=======
          
  52. 
            
>>>>>>> 11792758 (Rebased)
=======
          
  53. 
            5
>>>>>>> 31d15e66 (Fix)
            

            

                  row :year_of_publication
          
    54. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
          
  54. 
            5
=======
          
  55. 
            
>>>>>>> 11792758 (Rebased)
=======
          
  56. 
            5
>>>>>>> 31d15e66 (Fix)
            

            

                  row :description
          
    57. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
          
  57. 
            5
=======
          
  58. 
            
>>>>>>> 11792758 (Rebased)
=======
          
  59. 
            5
>>>>>>> 31d15e66 (Fix)
            

            

                  row :materials
          
    60. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
          
  60. 
            5
=======
          
  61. 
            
>>>>>>> 11792758 (Rebased)
=======
          
  62. 
            5
>>>>>>> 31d15e66 (Fix)
            

            

                  row :dimensions
          
    63. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
          
  63. 
            5
=======
          
  64. 
            
>>>>>>> 11792758 (Rebased)
=======
          
  65. 
            5
>>>>>>> 31d15e66 (Fix)
            

            

                  row :price, &:price
          
    66. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
          
  66. 
            5
=======
          
  67. 
            
>>>>>>> 11792758 (Rebased)
=======
          
  68. 
            5
>>>>>>> 31d15e66 (Fix)
            

            

                  row :created_at
          
    69. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
          
  69. 
            5
=======
          
  70. 
            
>>>>>>> 11792758 (Rebased)
=======
          
  71. 
            5
>>>>>>> 31d15e66 (Fix)
            

            

                  row :updated_at
          
    72. 
        
    
      
        
    
          
  72. 
            
            

            

                end
          
    73. 
        
    
      
        
    
          
  73. 
            
            

            

            
          
    74. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
          
  74. 
            5
=======
          
  75. 
            
>>>>>>> 11792758 (Rebased)
=======
          
  76. 
            5
>>>>>>> 31d15e66 (Fix)
            

            

                panel :images do
          
    77. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
          
  77. 
            5
=======
          
  78. 
            
>>>>>>> 11792758 (Rebased)
=======
          
  79. 
            5
>>>>>>> 31d15e66 (Fix)
            

            

                  table do
          
    80. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
          
  80. 
            5
=======
          
  81. 
            
>>>>>>> 11792758 (Rebased)
=======
          
  82. 
            5
>>>>>>> 31d15e66 (Fix)
            

            

                    book.images.each do |image|
          
    83. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
          
  83. 
            2
=======
          
  84. 
            
>>>>>>> 11792758 (Rebased)
=======
          
  85. 
            2
>>>>>>> 31d15e66 (Fix)
            

            

                      span image_tag image.variant(resize_to_limit: [100, 100])
          
    86. 
        
    
      
        
    
          
  86. 
            
            

            

                    end
          
    87. 
        
    
      
        
    
          
  87. 
            
            

            

                  end
          
    88. 
        
    
      
        
    
          
  88. 
            
            

            

                end
          
    89. 
        
    
      
        
    
          
  89. 
            
            

            

              end
          
    90. 
        
    
      
        
    
          
  90. 
            
            

            

            
          
    91. 
        
    
      
        
    
          
  91. 
            1
            

            

              form do |f|
          
    92. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
          
  92. 
            6
=======
          
  93. 
            
>>>>>>> 11792758 (Rebased)
=======
          
  94. 
            6
>>>>>>> 31d15e66 (Fix)
            

            

                f.inputs do
          
    95. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
          
  95. 
            6
=======
          
  96. 
            
>>>>>>> 11792758 (Rebased)
=======
          
  97. 
            6
>>>>>>> 31d15e66 (Fix)
            

            

                  f.input :title
          
    98. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
          
  98. 
            6
=======
          
  99. 
            
>>>>>>> 11792758 (Rebased)
=======
          
  100. 
            6
>>>>>>> 31d15e66 (Fix)
            

            

                  f.input :description
          
    101. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
          
  101. 
            6
=======
          
  102. 
            
>>>>>>> 11792758 (Rebased)
=======
          
  103. 
            6
>>>>>>> 31d15e66 (Fix)
            

            

                  f.input :year_of_publication
          
    104. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
          
  104. 
            6
=======
          
  105. 
            
>>>>>>> 11792758 (Rebased)
=======
          
  106. 
            6
>>>>>>> 31d15e66 (Fix)
            

            

                  f.input :price_cents
          
    107. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
          
  107. 
            6
=======
          
  108. 
            
>>>>>>> 11792758 (Rebased)
=======
          
  109. 
            6
>>>>>>> 31d15e66 (Fix)
            

            

                  f.input :materials
          
    110. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
          
  110. 
            6
=======
          
  111. 
            
>>>>>>> 11792758 (Rebased)
=======
          
  112. 
            6
>>>>>>> 31d15e66 (Fix)
            

            

                  f.input :dimensions
          
    113. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
          
  113. 
            6
=======
          
  114. 
            
>>>>>>> 11792758 (Rebased)
=======
          
  115. 
            6
>>>>>>> 31d15e66 (Fix)
            

            

                  f.input :quantity
          
    116. 
        
    
      
        
    
          
  116. 
            
            

            

            
          
    117. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
          
  117. 
            6
=======
          
  118. 
            
>>>>>>> 11792758 (Rebased)
=======
          
  119. 
            6
>>>>>>> 31d15e66 (Fix)
            

            

                  f.input :categories, as: :select, collection: Category.all
          
    120. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
          
  120. 
            6
=======
          
  121. 
            
>>>>>>> 11792758 (Rebased)
=======
          
  122. 
            6
>>>>>>> 31d15e66 (Fix)
            

            

                  f.input :authors, as: :select, collection: AuthorDecorator.decorate_collection(Author.all)
          
    123. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
          
  123. 
            6
=======
          
  124. 
            
>>>>>>> 11792758 (Rebased)
=======
          
  125. 
            6
>>>>>>> 31d15e66 (Fix)
            

            

                  f.input :images, as: :file, input_html: { multiple: true }
          
    126. 
        
    
      
        
    
          
  126. 
            
            

            

                end
          
    127. 
        
    
      
        
    
          
  127. 
            
            

            

            
          
    128. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
          
  128. 
            6
=======
          
  129. 
            
>>>>>>> 11792758 (Rebased)
=======
          
  130. 
            6
>>>>>>> 31d15e66 (Fix)
            

            

                panel :images do
          
    131. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
          
  131. 
            6
=======
          
  132. 
            
>>>>>>> 11792758 (Rebased)
=======
          
  133. 
            6
>>>>>>> 31d15e66 (Fix)
            

            

                  f.object.images.each do |image|
          
    134. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
          
  134. 
            1
=======
          
  135. 
            
>>>>>>> 11792758 (Rebased)
=======
          
  136. 
            1
>>>>>>> 31d15e66 (Fix)
            

            

                    span image_tag image.variant(resize_to_limit: [100, 100])
          
    137. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
          
  137. 
            1
=======
          
  138. 
            
>>>>>>> 11792758 (Rebased)
=======
          
  139. 
            1
>>>>>>> 31d15e66 (Fix)
            

            

                    span link_to('Delete', delete_image_admin_book_path(image.id), method: :delete,
          
    140. 
        
    
      
        
    
          
  140. 
            
            

            

                                                                                   data: { confirm: "Delete #{image.filename}?" })
          
    141. 
        
    
      
        
    
          
  141. 
            
            

            

                  end
          
    142. 
        
    
      
        
    
          
  142. 
            
            

            

                end
          
    143. 
        
    
      
        
    
          
  143. 
            
            

            

            
          
    144. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
          
  144. 
            6
=======
          
  145. 
            
>>>>>>> 11792758 (Rebased)
=======
          
  146. 
            6
>>>>>>> 31d15e66 (Fix)
            

            

                f.actions
          
    147. 
        
    
      
        
    
          
  147. 
            
            

            

              end
          
    148. 
        
    
      
        
    
          
  148. 
            
            

            

            
          
    149. 
        
    
      
        
    
          
  149. 
            1
            

            

              member_action :delete_image, method: :delete do
          
    150. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
          
  150. 
            1
=======
          
  151. 
            
>>>>>>> 11792758 (Rebased)
=======
          
  152. 
            1
>>>>>>> 31d15e66 (Fix)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
                ActiveStorage::Attachment.find(params[:id]).purge_later
=======
                ActiveStorage::Attachment.find(params[:id]).destroy
>>>>>>> 11792758 (Rebased)
=======
                ActiveStorage::Attachment.find(params[:id]).purge_later
>>>>>>> ef483b6d (Fix)
          
    153. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
          
  153. 
            1
=======
          
  154. 
            
>>>>>>> 11792758 (Rebased)
=======
          
  155. 
            1
>>>>>>> 31d15e66 (Fix)
            

            

                redirect_back(fallback_location: edit_admin_book_path)
          
    156. 
        
    
      
        
    
          
  156. 
            
            

            

              end
          
    157. 
        
    
      
        
    
          
  157. 
            
            

            

            end
          
    158.

app/admin/categories.rb

100.0% lines covered

18 relevant lines. 18 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            ActiveAdmin.register Category do
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              permit_params :name, book_ids: []
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              filter :books, collection: Book.all
          
    5. 
        
    
      
        
    
          
  5. 
            1
            

            

              filter :name
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

            
          
    7. 
        
    
      
        
    
          
  7. 
            1
            

            

              index do
          
    8. 
        
    
      
        
    
          
  8. 
            4
            

            

                selectable_column
          
    9. 
        
    
      
        
    
          
  9. 
            
            

            

            
          
    10. 
        
    
      
        
    
          
  10. 
            4
            

            

                column :name
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

            
          
    12. 
        
    
      
        
    
          
  12. 
            4
            

            

                actions
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

              end
          
    14. 
        
    
      
        
    
          
  14. 
            
            

            

            
          
    15. 
        
    
      
        
    
          
  15. 
            1
            

            

              show do
          
    16. 
        
    
      
        
    
          
  16. 
            3
            

            

                attributes_table do
          
    17. 
        
    
      
        
    
          
  17. 
            3
            

            

                  row :name
          
    18. 
        
    
      
        
    
          
  18. 
            3
            

            

                  row :created_at
          
    19. 
        
    
      
        
    
          
  19. 
            3
            

            

                  row :updated_at
          
    20. 
        
    
      
        
    
          
  20. 
            
            

            

                end
          
    21. 
        
    
      
        
    
          
  21. 
            
            

            

              end
          
    22. 
        
    
      
        
    
          
  22. 
            
            

            

            
          
    23. 
        
    
      
        
    
          
  23. 
            1
            

            

              form do |f|
          
    24. 
        
    
      
        
    
          
  24. 
            2
            

            

                f.inputs do
          
    25. 
        
    
      
        
    
          
  25. 
            2
            

            

                  f.input :name
          
    26. 
        
    
      
        
    
          
  26. 
            2
            

            

                  f.input :books, as: :select, collection: Book.all
          
    27. 
        
    
      
        
    
          
  27. 
            
            

            

                end
          
    28. 
        
    
      
        
    
          
  28. 
            
            

            

            
          
    29. 
        
    
      
        
    
          
  29. 
            2
            

            

                f.actions
          
    30. 
        
    
      
        
    
          
  30. 
            
            

            

              end
          
    31. 
        
    
      
        
    
          
  31. 
            
            

            

            end
          
    32.

app/admin/coupons.rb

100.0% lines covered

2 relevant lines. 2 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            ActiveAdmin.register Coupon do
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              permit_params :code, :is_active, :active_till_date, :discount, :order_id
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            end
          
    4.

app/admin/dashboard.rb

44.44% lines covered

9 relevant lines. 4 lines covered and 5 lines missed. 
    
    
      
        
    
          
  1. 
            
            

            

            # frozen_string_literal: true
          
    2. 
        
    
      
        
    
          
  2. 
            
            

            

            
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

            ActiveAdmin.register_page 'Dashboard' do
          
    4. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
          
  4. 
            39
=======
          
  5. 
            1
>>>>>>> 11792758 (Rebased)
=======
          
  6. 
            39
>>>>>>> 31d15e66 (Fix)
            

            

              menu priority: 1, label: proc { I18n.t('active_admin.dashboard') }
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

            
          
    8. 
        
    
      
        
    
          
  8. 
            1
            

            

              action_item only: :show do
          
    9. 
        
    
      
        
    
          
  9. 
            
            

            

                link_to 'SideKiq View', sidekiq_web_path
          
    10. 
        
    
      
        
    
          
  10. 
            
            

            

              end
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

            
          
    12. 
        
    
      
        
    
          
  12. 
            1
            

            

              content title: proc { I18n.t('active_admin.dashboard') } do
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

                div class: 'blank_slate_container', id: 'dashboard_default_message' do
          
    14. 
        
    
      
        
    
          
  14. 
            
            

            

                  span class: 'blank_slate' do
          
    15. 
        
    
      
        
    
          
  15. 
            
            

            

                    span I18n.t('active_admin.dashboard_welcome.welcome')
          
    16. 
        
    
      
        
    
          
  16. 
            
            

            

                    small I18n.t('active_admin.dashboard_welcome.call_to_action')
          
    17. 
        
    
      
        
    
          
  17. 
            
            

            

                  end
          
    18. 
        
    
      
        
    
          
  18. 
            
            

            

                end
          
    19. 
        
    
      
        
    
          
  19. 
            
            

            

              end
          
    20. 
        
    
      
        
    
          
  20. 
<<<<<<< HEAD
            
            

            

            end
          
    21.

app/admin/orders.rb

100.0% lines covered

2 relevant lines. 2 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            ActiveAdmin.register Order do
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              permit_params :user_id, :coupon_id, :total_price, :status, :last_action
          
    3. 
        
    
      
        
    
          
  3. 
=======
>>>>>>> ef483b6d (Fix)
            
            

            

            end
          
    4.
<<<<<<< HEAD

app/admin/orders.rb

100.0% lines covered

2 relevant lines. 2 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            ActiveAdmin.register Order do
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              permit_params :user_id, :coupon_id, :total_price, :status, :last_action
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            end
          
    4.
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> f7852d17 (Manifest_cache true) >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= ======= >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 98beee2 (Manifest_cache true) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 610b6138 (Featire specs) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> aa3618b (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> c033601 (Rebased) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 37e48018 (Featire specs) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> aa3618b (Rebased) >>>>>>> 11792758 (Rebased) ======= ======= ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> c033601 (Rebased) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 5e31aeb (Featire specs) >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> 659083f (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3e9f99d (Featire specs) >>>>>>> 6fa625b (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> a71befd (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8a3779d4 (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)

app/controllers/application_controller.rb

100.0% lines covered

<<<<<<< HEAD <<<<<<< HEAD 10 relevant lines. 10 lines covered and ======= 1 relevant lines. 1 lines covered and >>>>>>> 6da9530 (Featire specs) ======= 10 relevant lines. 10 lines covered and >>>>>>> 9e081dc (Fix) 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class ApplicationController < ActionController::Base
          
    2. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9e081dc (Fix)
          
  2. 
            1
            

            

              before_action :user_or_guest_have_order
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              private
          
    5. 
        
    
      
        
    
          
  5. 
            
            

            

            
          
    6. 
        
    
      
        
    
          
  6. 
            1
            

            

              def user_or_guest_have_order
          
    7. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 1049b80c (Fix)
=======
>>>>>>> 22d61969 (Fix)
          
  7. 
            164
=======
          
  8. 
            166
<<<<<<< HEAD
>>>>>>> ef483b6d (Fix)
=======
          
  9. 
            164
>>>>>>> d68e8240 (Fix)
=======
>>>>>>> 9e081dc (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
          
  10. 
            164
>>>>>>> e75c983 (Fix)
>>>>>>> 22d61969 (Fix)
            

            

                if current_user
          
    11. 
        
    
      
        
    
          
  11. 
            36
            

            

                  session[:order_id] = Order.find_or_create_by(user_id: current_user.id).id
          
    12. 
        
    
      
        
    
          
  12. 
            36
            

            

                  CartCleaner.set(wait: 1.week).perform_later(session[:order_id])
          
    13. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 1049b80c (Fix)
=======
>>>>>>> 22d61969 (Fix)
          
  13. 
            128
=======
          
  14. 
            130
<<<<<<< HEAD
>>>>>>> ef483b6d (Fix)
=======
          
  15. 
            128
>>>>>>> d68e8240 (Fix)
=======
>>>>>>> 9e081dc (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
          
  16. 
            128
>>>>>>> e75c983 (Fix)
>>>>>>> 22d61969 (Fix)
            

            

                elsif session[:order_id].nil?
          
    17. 
        
    
      
        
    
          
  17. 
            52
            

            

                  session[:order_id] = Order.create.id
          
    18. 
        
    
      
        
    
          
  18. 
            52
            

            

                  CartCleaner.set(wait: 1.week).perform_later(session[:order_id])
          
    19. 
        
    
      
        
    
          
  19. 
            
            

            

                end
          
    20. 
        
    
      
        
    
          
  20. 
            
            

            

              end
          
    21. 
        
    
      
        
    
          
  21. 
<<<<<<< HEAD
=======
          
  22. 
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> 9e081dc (Fix)
            
            

            

            end
          
    23.
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> e18eb87 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> 8887ba5b (Fix) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> 8887ba5b (Fix) >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix) ======= >>>>>>> 311e9fa (Rebased) >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix)

app/controllers/books_controller.rb

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) 93.33% ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) ======= >>>>>>> 15c51b7 (Featire specs) ======= >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= ======= ======= ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> f8e5c9db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> 2274daf2 (Featire specs) >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> a2206025 (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> 8887ba5b (Fix) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> 53db2224 (Featire specs) >>>>>>> 557c1b8 (Fix) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> b97bb382 (Featire specs) >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix) ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) >>>>>>> 8288136d (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> 77d62af (Featire specs) >>>>>>> ae07231a (Featire specs) 93.33% ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= >>>>>>> ef483b6d (Fix) 93.33% ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b904d7ae (Featire specs) >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= 93.33% ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) 93.75% >>>>>>> c4adab0 (Featire specs) ======= 100.0% >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) 100.0% >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD ======= ======= 100.0% >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= 100.0% >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= ======= 100.0% >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= 100.0% >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= 100.0% >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= 100.0% >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> f0e2e12a (Featire specs) ======= <<<<<<< HEAD ======= 100.0% >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= <<<<<<< HEAD ======= 100.0% >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= 100.0% >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> fd3f47ab (Featire specs) ======= 100.0% >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= <<<<<<< HEAD ======= 100.0% >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD ======= 100.0% >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= 100.0% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> b904d7ae (Featire specs) ======= 93.75% >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= 100.0% >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD ======= >>>>>>> 557c1b8 (Fix) >>>>>>> 8288136d (Fix) ======= >>>>>>> d52f9efe (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= 100.0% >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= 100.0% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) 93.75% ======= 100.0% >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 100.0% >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= ======= 100.0% >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= ======= 100.0% >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= 100.0% >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= ======= 100.0% >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= ======= 93.75% >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= 93.33% >>>>>>> c7a726c5 (Rebased) ======= ======= 100.0% >>>>>>> 08edf50 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= 100.0% >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= 100.0% >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= ======= 100.0% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= 93.75% >>>>>>> a5d032d (Fix) >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= 100.0% >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= 100.0% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) 93.75% ======= 100.0% >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 100.0% >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= ======= 100.0% >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= ======= 100.0% >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= 100.0% >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= ======= 100.0% >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= ======= 93.75% >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= ======= >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) ======= ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> 5e31aeb (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 51bc18c (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 973ba8c (Featire specs) ======= ======= >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) ======= ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) ======= ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) ======= ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 1d59aaa (Fix) >>>>>>> 9e081dc (Fix) 93.33% ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) 93.75% >>>>>>> c4adab0 (Featire specs) ======= 100.0% >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= 100.0% >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= 100.0% >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= 100.0% >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= 100.0% >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= 100.0% >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= 100.0% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= 93.75% >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= ======= 100.0% >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= ======= 100.0% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) 93.75% ======= 100.0% >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= ======= 100.0% >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= ======= 100.0% >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= ======= 100.0% >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= ======= ======= ======= ======= 100.0% >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= ======= ======= 100.0% >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= 93.75% >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) 93.33% ======= 100.0% >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= 100.0% >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= ======= 100.0% >>>>>>> 4e81ea2 (Featire specs) ======= 100.0% >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= ======= 100.0% >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 100.0% >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) lines covered

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> f92a45b (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) ======= >>>>>>> 15c51b7 (Featire specs) ======= >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) 15 relevant lines. 14 lines covered and 1 lines missed. ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 160fb15 (Fix) >>>>>>> 67ab5299 (Fix) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> a2206025 (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> 8887ba5b (Fix) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> 53db2224 (Featire specs) >>>>>>> 557c1b8 (Fix) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> b97bb382 (Featire specs) >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) >>>>>>> 8288136d (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> 77d62af (Featire specs) >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) 14 relevant lines. 14 lines covered and ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 14 relevant lines. 14 lines covered and ======= 12 relevant lines. 12 lines covered and >>>>>>> 752f0c0 (Featire specs) ======= 12 relevant lines. 12 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= 12 relevant lines. 12 lines covered and >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) 0 lines missed. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9bfbd88 (Featire specs) >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 9bfbd88 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 9bfbd88 (Featire specs) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 9bfbd88 (Featire specs) >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= 15 relevant lines. 14 lines covered and 1 lines missed. >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 9a49b7b (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 416166f (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 0676508 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) 15 relevant lines. 14 lines covered and 1 lines missed. ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> aa4361fd (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 99dad91f (Fix) >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 99dad91f (Fix) ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> afa56d1 (Featire specs) >>>>>>> e1ecabbe (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= ======= ======= >>>>>>> df37394 (Featire specs) 14 relevant lines. 14 lines covered and ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 14 relevant lines. 14 lines covered and ======= 12 relevant lines. 12 lines covered and >>>>>>> 752f0c0 (Featire specs) ======= 12 relevant lines. 12 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= 12 relevant lines. 12 lines covered and >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e18eb87 (Fix) >>>>>>> 3723aad (Featire specs) ======= ======= ======= >>>>>>> df37394 (Featire specs) 14 relevant lines. 14 lines covered and <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 14 relevant lines. 14 lines covered and ======= 12 relevant lines. 12 lines covered and >>>>>>> 752f0c0 (Featire specs) ======= 12 relevant lines. 12 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= 12 relevant lines. 12 lines covered and >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> f92a45b (Featire specs) 0 lines missed. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= ======= 14 relevant lines. 14 lines covered and 0 lines missed. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> e18eb87 (Fix) ======= 16 relevant lines. 15 lines covered and 1 lines missed. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD 16 relevant lines. 15 lines covered and 1 lines missed. >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD 16 relevant lines. 15 lines covered and 1 lines missed. >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) 16 relevant lines. 15 lines covered and 1 lines missed. >>>>>>> e3e66f3 (Featire specs) ======= 12 relevant lines. 12 lines covered and 0 lines missed. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> fdab719f (Fix) ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 14 relevant lines. 14 lines covered and 0 lines missed. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= ======= 14 relevant lines. 14 lines covered and 0 lines missed. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= ======= 14 relevant lines. 14 lines covered and 0 lines missed. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= ======= 16 relevant lines. 15 lines covered and 1 lines missed. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= 15 relevant lines. 14 lines covered and 1 lines missed. >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= ======= ======= >>>>>>> df37394 (Featire specs) 14 relevant lines. 14 lines covered and ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 14 relevant lines. 14 lines covered and ======= 12 relevant lines. 12 lines covered and >>>>>>> 752f0c0 (Featire specs) ======= 12 relevant lines. 12 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= 12 relevant lines. 12 lines covered and >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 3723aad (Featire specs) ======= ======= 14 relevant lines. 14 lines covered and <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) 0 lines missed. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 14 relevant lines. 14 lines covered and 0 lines missed. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= 16 relevant lines. 15 lines covered and 1 lines missed. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD 16 relevant lines. 15 lines covered and 1 lines missed. >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD 16 relevant lines. 15 lines covered and 1 lines missed. >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) 16 relevant lines. 15 lines covered and 1 lines missed. >>>>>>> e3e66f3 (Featire specs) ======= 12 relevant lines. 12 lines covered and 0 lines missed. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 14 relevant lines. 14 lines covered and 0 lines missed. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= ======= 14 relevant lines. 14 lines covered and 0 lines missed. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= ======= 14 relevant lines. 14 lines covered and 0 lines missed. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= ======= 16 relevant lines. 15 lines covered and 1 lines missed. <<<<<<< HEAD >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0c57e4e (Fix) ======= <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) 16 relevant lines. 15 lines covered and 1 lines missed. >>>>>>> 5507b42 (Featire specs) ======= 12 relevant lines. 12 lines covered and 0 lines missed. <<<<<<< HEAD >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= ======= ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= ======= 14 relevant lines. 14 lines covered and 0 lines missed. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 5506bd0 (Featire specs) ======= ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= ======= 14 relevant lines. 14 lines covered and 0 lines missed. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= ======= ======= ======= ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= ======= ======= 14 relevant lines. 14 lines covered and 0 lines missed. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= 16 relevant lines. 15 lines covered and 1 lines missed. >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) 
    
    
      
        
    
          
  1. 
            1
            

            

            class BooksController < ApplicationController
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 67ab5299 (Fix)
=======
>>>>>>> 84809242 (Featire specs)
=======
>>>>>>> 5a2009f1 (Fix)
=======
>>>>>>> 4f4ea3f9 (Featire specs)
=======
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
>>>>>>> ae884b47 (Fix)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> 74240509 (Fix book_spec decrease quantity and price)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> a1a479e2 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 393eff3b (Featire specs)
=======
>>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d9d85ca6 (Fix)
              def index
=======
=======
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 31d15e66 (Fix)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> 7a08014b (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
>>>>>>> b904d7ae (Featire specs)
=======
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
=======
>>>>>>> ef483b6d (Fix)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> e6fc67c7 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8887ba5b (Fix)
=======
>>>>>>> 0f24a043 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 21873de0 (Featire specs)
=======
>>>>>>> b8c2784f (Fix book_spec decrease quantity and price)
=======
>>>>>>> 392646b5 (Featire specs)
=======
>>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1049b80c (Fix)
=======
>>>>>>> 2612be03 (Featire specs)
              def index
=======
=======
>>>>>>> 9a49b7b (Rebased)
=======
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
=======
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 160fb15 (Fix)
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 160fb15 (Fix)
<<<<<<< HEAD
=======
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 4d90e3d (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> c51bf93 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0c57e4e (Fix)
=======
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 15c51b7 (Featire specs)
=======
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9e081dc (Fix)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> 72b9cab (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> df37394 (Featire specs)
=======
<<<<<<< HEAD
=======
=======
>>>>>>> e18eb87 (Fix)
=======
=======
<<<<<<< HEAD
>>>>>>> df37394 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> c51bf93 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 557c1b8 (Fix)
=======
=======
>>>>>>> 84003439 (Featire specs)
<<<<<<< HEAD
>>>>>>> df37394 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> b28889f (Fix)
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
=======
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> e6fc67c7 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 94841b5 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> 74240509 (Fix book_spec decrease quantity and price)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 7a08014b (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 94841b5 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0f24a043 (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 74240509 (Fix book_spec decrease quantity and price)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0f24a043 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> b8c2784f (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
>>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price)
              PAGINATION_PER_PAGE = 12
>>>>>>> 9bfbd88 (Featire specs)
=======
              PAGINATION_PER_PAGE = 12
>>>>>>> 824bb2b (Featire specs)
=======
              PAGINATION_PER_PAGE = 12
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
              PAGINATION_PER_PAGE = 12
>>>>>>> e3e66f3 (Featire specs)
=======
              PAGINATION_PER_PAGE = 12
>>>>>>> 6da9530 (Featire specs)
          
    3. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  3. 
=======
          
  4. 
=======
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
  5. 
            
            

            

            
          
    6. 
        
    
      
        
    
          
  6. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6da9530 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f92a45b (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f92a45b (Featire specs)
=======
=======
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
>>>>>>> 752f0c0 (Featire specs)
=======
          
  7. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
>>>>>>> 9c0d812 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
=======
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> ebcdce06 (Featire specs)
              def index
=======
<<<<<<< HEAD
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 4d90e3d (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 37e48018 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
=======
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
              PAGINATION_PER_PAGE = 12
>>>>>>> 9bfbd88 (Featire specs)
=======
              PAGINATION_PER_PAGE = 12
>>>>>>> 824bb2b (Featire specs)
=======
              PAGINATION_PER_PAGE = 12
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
              PAGINATION_PER_PAGE = 12
>>>>>>> e3e66f3 (Featire specs)
          
    8. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7d58507 (Add login registration pages)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 22ee41c (Add login registration pages)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 7a08014b (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
          
  8. 
<<<<<<< HEAD
=======
=======
          
  9. 
=======
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> df37394 (Featire specs)
>>>>>>> c51bf93 (Featire specs)
>>>>>>> 752f0c0 (Featire specs)
=======
          
  10. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
>>>>>>> 9c0d812 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
=======
=======
>>>>>>> f92a45b (Featire specs)
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> 6da9530 (Featire specs)
=======
<<<<<<< HEAD
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 9c0d812 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> e18eb87 (Fix)
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> f92a45b (Featire specs)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 0c57e4e (Fix)
=======
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
=======
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
=======
=======
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
              def index
          
    11. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f92a45b (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
>>>>>>> c871248 (Add login registration pages)
=======
>>>>>>> 0c57e4e (Fix)
=======
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 973ba8c (Featire specs)
=======
>>>>>>> 8181d13 (Featire specs)
=======
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 06e5e41 (Add login registration pages)
=======
>>>>>>> 72b9cab (Featire specs)
=======
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 385136b (Add login registration pages)
=======
>>>>>>> 15c51b7 (Featire specs)
=======
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1c33e01 (Add login registration pages)
=======
>>>>>>> 9e081dc (Fix)
=======
=======
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> 2a25e4c (Featire specs)
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> df37394 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7d58507 (Add login registration pages)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7d58507 (Add login registration pages)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> 551f3c1 (Add login registration pages)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> ccec311 (Add login registration pages)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8c3e531 (Add login registration pages)
=======
>>>>>>> 1d59aaa (Fix)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 22ee41c (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8d4ec55 (Add login registration pages)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 03c0867 (Add login registration pages)
          
  11. 
>>>>>>> 9d98d9ab (Featire specs)
>>>>>>> 009401d (Featire specs)
            24
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
>>>>>>> f92a45b (Featire specs)
          
  12. 
            24
<<<<<<< HEAD
=======
>>>>>>> 6da9530 (Featire specs)
=======
          
  13. 
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a624084 (Add login registration pages)
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6a9fede (Add login registration pages)
=======
>>>>>>> 7c4ea7f (Fix)
          
  14. 
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
            25
<<<<<<< HEAD
>>>>>>> 1214e1f (Add login registration pages)
=======
          
  15. 
            24
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
  16. 
            24
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  17. 
            25
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9d98d9ab (Featire specs)
>>>>>>> aca90e3 (Rebased)
=======
>>>>>>> c033601 (Rebased)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
=======
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 06e5e41 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
          
  18. 
            25
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 22ee41c (Add login registration pages)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
          
  19. 
            25
>>>>>>> c033601 (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6da9530 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
=======
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 659083f (Featire specs)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
=======
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
=======
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
=======
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> cacbab9 (Add login registration pages)
>>>>>>> 7d58507 (Add login registration pages)
>>>>>>> c871248 (Add login registration pages)
          
  20. 
            25
=======
          
  21. 
            25
>>>>>>> 9620751 (Featire specs)
=======
          
  22. 
            24
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
=======
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5e31aeb (Featire specs)
=======
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> 51bc18c (Featire specs)
>>>>>>> a636fda (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
          
  23. 
            24
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> aca90e3 (Rebased)
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 0676508 (Featire specs)
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
=======
          
  24. 
            24
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
          
  25. 
            24
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
=======
=======
          
  26. 
            24
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 03c0867 (Add login registration pages)
=======
=======
          
  27. 
            25
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 57a2e05 (Add login registration pages)
=======
=======
>>>>>>> 3b03895 (Featire specs)
=======
          
  28. 
            24
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
>>>>>>> 9c0d812 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
  29. 
            24
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 7d58507 (Add login registration pages)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> ccec311 (Add login registration pages)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> a624084 (Add login registration pages)
=======
          
  30. 
            25
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> cacbab9 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
          
  31. 
            25
<<<<<<< HEAD
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 7d58507 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> c871248 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e011b0df (Add login registration pages)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 0c57e4e (Fix)
<<<<<<< HEAD
>>>>>>> 8887ba5b (Fix)
=======
=======
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5e31aeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 53db2224 (Featire specs)
=======
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0f24a043 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 551f3c1 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 06e5e41 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 8f1baf1c (Add login registration pages)
=======
=======
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> b8c2784f (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> a624084 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> ccec311 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 385136b (Add login registration pages)
<<<<<<< HEAD
>>>>>>> dda81aa9 (Add login registration pages)
=======
=======
=======
=======
=======
          
  32. 
            24
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 392646b5 (Featire specs)
=======
=======
=======
=======
=======
          
  33. 
            24
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
=======
          
  34. 
            25
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 6a9fede (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 8c3e531 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 1c33e01 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 40a3d25f (Add login registration pages)
=======
=======
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
=======
>>>>>>> 22ee41c (Add login registration pages)
>>>>>>> 03c0867 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 8d4ec55 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 73dcd461 (Add login registration pages)
=======
=======
=======
>>>>>>> c033601 (Rebased)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
=======
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 2ee03d3 (Featire specs)
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
          
  35. 
            25
=======
          
  36. 
            24
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
=======
          
  37. 
            24
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
=======
=======
          
  38. 
            24
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
=======
          
  39. 
            24
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
=======
=======
          
  40. 
            24
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
          
  41. 
            25
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 57a2e05 (Add login registration pages)
=======
=======
          
  42. 
            24
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            

            

                @books_count = Book.count
          
    43. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9d98d9ab (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
          
  43. 
=======
          
  44. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  45. 
>>>>>>> 4e81ea2 (Featire specs)
            24
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
=======
>>>>>>> f92a45b (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
>>>>>>> c871248 (Add login registration pages)
=======
>>>>>>> 0c57e4e (Fix)
=======
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 973ba8c (Featire specs)
=======
>>>>>>> 8181d13 (Featire specs)
=======
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 06e5e41 (Add login registration pages)
=======
>>>>>>> 72b9cab (Featire specs)
=======
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 385136b (Add login registration pages)
=======
>>>>>>> 15c51b7 (Featire specs)
=======
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1c33e01 (Add login registration pages)
=======
>>>>>>> 9e081dc (Fix)
=======
=======
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> 2a25e4c (Featire specs)
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> df37394 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7d58507 (Add login registration pages)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> 551f3c1 (Add login registration pages)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> ccec311 (Add login registration pages)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8c3e531 (Add login registration pages)
=======
>>>>>>> 1d59aaa (Fix)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 22ee41c (Add login registration pages)
<<<<<<< HEAD
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 03c0867 (Add login registration pages)
          
  46. 
            24
<<<<<<< HEAD
=======
>>>>>>> 6da9530 (Featire specs)
=======
          
  47. 
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a624084 (Add login registration pages)
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6a9fede (Add login registration pages)
=======
>>>>>>> 7c4ea7f (Fix)
          
  48. 
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
            25
<<<<<<< HEAD
>>>>>>> 1214e1f (Add login registration pages)
=======
          
  49. 
            24
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
  50. 
            24
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  51. 
            25
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9d98d9ab (Featire specs)
>>>>>>> aca90e3 (Rebased)
=======
>>>>>>> c033601 (Rebased)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
=======
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 06e5e41 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
          
  52. 
            25
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 22ee41c (Add login registration pages)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
          
  53. 
            25
>>>>>>> c033601 (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6da9530 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
=======
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 659083f (Featire specs)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
=======
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
=======
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
=======
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> cacbab9 (Add login registration pages)
>>>>>>> 7d58507 (Add login registration pages)
>>>>>>> c871248 (Add login registration pages)
          
  54. 
            25
=======
          
  55. 
            25
>>>>>>> 9620751 (Featire specs)
=======
          
  56. 
            24
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
=======
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5e31aeb (Featire specs)
=======
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> 51bc18c (Featire specs)
>>>>>>> a636fda (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
          
  57. 
            24
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
=======
>>>>>>> 0676508 (Featire specs)
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
=======
          
  58. 
            24
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
          
  59. 
            24
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
=======
=======
          
  60. 
            24
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 03c0867 (Add login registration pages)
=======
=======
          
  61. 
            25
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 57a2e05 (Add login registration pages)
=======
=======
>>>>>>> 3b03895 (Featire specs)
=======
          
  62. 
            24
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
>>>>>>> 9c0d812 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
  63. 
            24
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 7d58507 (Add login registration pages)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> ccec311 (Add login registration pages)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> a624084 (Add login registration pages)
=======
          
  64. 
            25
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> cacbab9 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
          
  65. 
            25
<<<<<<< HEAD
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> e18eb87 (Fix)
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> f92a45b (Featire specs)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 659083f (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7d58507 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> c871248 (Add login registration pages)
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 0c57e4e (Fix)
=======
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5e31aeb (Featire specs)
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 51bc18c (Featire specs)
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 973ba8c (Featire specs)
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 551f3c1 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 06e5e41 (Add login registration pages)
=======
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> a624084 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> ccec311 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 385136b (Add login registration pages)
=======
=======
=======
=======
          
  66. 
            24
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
=======
=======
=======
=======
          
  67. 
            24
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
  68. 
            25
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 6a9fede (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 8c3e531 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 1c33e01 (Add login registration pages)
=======
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
=======
=======
>>>>>>> 22ee41c (Add login registration pages)
>>>>>>> 03c0867 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 8d4ec55 (Add login registration pages)
=======
=======
>>>>>>> c033601 (Rebased)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
=======
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 2ee03d3 (Featire specs)
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
          
  69. 
            25
=======
          
  70. 
            24
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
=======
=======
=======
=======
          
  71. 
            24
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
=======
=======
=======
=======
          
  72. 
            24
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
=======
          
  73. 
            24
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
=======
=======
=======
=======
          
  74. 
            24
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
          
  75. 
            25
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 57a2e05 (Add login registration pages)
=======
=======
          
  76. 
            24
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
            

            

                @categories = Category.all
          
    77. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
=======
>>>>>>> f92a45b (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
>>>>>>> c871248 (Add login registration pages)
=======
>>>>>>> 0c57e4e (Fix)
=======
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 973ba8c (Featire specs)
=======
>>>>>>> 8181d13 (Featire specs)
=======
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 06e5e41 (Add login registration pages)
=======
>>>>>>> 72b9cab (Featire specs)
=======
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 385136b (Add login registration pages)
=======
>>>>>>> 15c51b7 (Featire specs)
=======
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1c33e01 (Add login registration pages)
=======
>>>>>>> 9e081dc (Fix)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7d58507 (Add login registration pages)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> 551f3c1 (Add login registration pages)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> ccec311 (Add login registration pages)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8c3e531 (Add login registration pages)
=======
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
>>>>>>> e18eb87 (Fix)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 03c0867 (Add login registration pages)
>>>>>>> 5c33a07 (Featire specs)
          
  77. 
            24
>>>>>>> f92a45b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  78. 
            24
=======
          
  79. 
            25
>>>>>>> 1214e1f (Add login registration pages)
=======
          
  80. 
            24
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
=======
          
  81. 
            25
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 22ee41c (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 8d4ec55 (Add login registration pages)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a624084 (Add login registration pages)
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6a9fede (Add login registration pages)
          
  82. 
            25
<<<<<<< HEAD
>>>>>>> aca90e3 (Rebased)
=======
>>>>>>> c033601 (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> cacbab9 (Add login registration pages)
>>>>>>> 7d58507 (Add login registration pages)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
          
  83. 
            25
=======
          
  84. 
            25
>>>>>>> 9620751 (Featire specs)
=======
          
  85. 
            25
>>>>>>> 2a25e4c (Featire specs)
=======
          
  86. 
            
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> a636fda (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
          
  87. 
            
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
=======
>>>>>>> 0676508 (Featire specs)
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
=======
          
  88. 
            
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
          
  89. 
            
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> a9e66e9 (Featire specs)
>>>>>>> 3723aad (Featire specs)
=======
=======
>>>>>>> 3b03895 (Featire specs)
=======
          
  90. 
            
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
          
  91. 
            25
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> e18eb87 (Fix)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 659083f (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 0c57e4e (Fix)
=======
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5e31aeb (Featire specs)
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 51bc18c (Featire specs)
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 973ba8c (Featire specs)
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
=======
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
=======
=======
=======
=======
          
  92. 
            
>>>>>>> 4552227 (Featire specs)
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
=======
=======
=======
          
  93. 
            25
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
=======
=======
>>>>>>> a636fda (Featire specs)
=======
=======
          
  94. 
            
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
=======
=======
=======
=======
          
  95. 
            
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
=======
          
  96. 
            
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
=======
=======
=======
=======
          
  97. 
            
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> 9620751 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
=======
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
                sorted_books = BookQuery.query(params).paginate(page: params[:page],
=======
<<<<<<< HEAD
<<<<<<< HEAD
                sorted_books = BookQuery.query(params).paginate(page: params[:page],
=======
            
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
            
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
=======
=======
            
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
            
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
            
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                sorted_books = BookQuery.query(params).paginate(page: params[:page],
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> e18eb87 (Fix)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 659083f (Featire specs)
=======
=======
=======
            
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
=======
=======
=======
            
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 0c57e4e (Fix)
=======
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5e31aeb (Featire specs)
=======
=======
=======
=======
            
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 51bc18c (Featire specs)
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 973ba8c (Featire specs)
=======
=======
=======
=======
            
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
=======
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
=======
=======
=======
=======
            
>>>>>>> 4552227 (Featire specs)
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
=======
=======
=======
                sorted_books = BookQuery.query(params).paginate(page: params[:page],
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
=======
=======
=======
            
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
=======
=======
=======
            
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
=======
=======
=======
            
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
          
    98. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> 9620751 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
=======
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
          
  98. 
            
=======
<<<<<<< HEAD
<<<<<<< HEAD
          
  99. 
            
=======
          
  100. 
            24
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
          
  101. 
            24
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 973ba8c (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
=======
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
          
  102. 
            24
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
          
  103. 
            24
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
          
  104. 
            24
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 6fba6be (Featire specs)
=======
          
  105. 
            
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> e18eb87 (Fix)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 659083f (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 0c57e4e (Fix)
=======
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5e31aeb (Featire specs)
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 51bc18c (Featire specs)
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 973ba8c (Featire specs)
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
=======
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
=======
=======
=======
=======
          
  106. 
            24
>>>>>>> 4552227 (Featire specs)
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
=======
=======
=======
          
  107. 
            
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> 9620751 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
=======
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
                                                                per_page: Constants::PAGINATION_PER_PAGE)
=======
<<<<<<< HEAD
<<<<<<< HEAD
                                                                per_page: Constants::PAGINATION_PER_PAGE)
=======
                @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE)
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
                @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE)
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
          
    108. 
        
    
      
        
    
          
  108. 
=======
          
  109. 
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  110. 
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
          
  111. 
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
=======
          
  112. 
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
            
            

            

            
          
    113. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
          
  113. 
            25
=======
          
  114. 
            1
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
          
  115. 
            1
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
          
  116. 
            1
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                @books = BookDecorator.decorate_collection(sorted_books)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                @books = BookDecorator.decorate_collection(sorted_books)
=======
=======
>>>>>>> bb5c652 (Fix book_spec decrease quantity and price)
=======
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
=======
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
>>>>>>> c033601 (Rebased)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> a5d032d (Fix)
>>>>>>> 31d15e66 (Fix)
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
              def index
          
    117. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 56fd9d41 (Add login registration pages)
=======
>>>>>>> 31d15e66 (Fix)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e60833c (Add login registration pages)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> f416f45 (Add login registration pages)
=======
>>>>>>> 5b7749a (Fix)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84809242 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e60833c (Add login registration pages)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> f416f45 (Add login registration pages)
=======
>>>>>>> 5b7749a (Fix)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e989024d (Add login registration pages)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8249ff3c (Add login registration pages)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
          
  117. 
            24
<<<<<<< HEAD
=======
=======
          
  118. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 57da3ff (Add login registration pages)
<<<<<<< HEAD
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 512d1d87 (Add login registration pages)
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> a624084 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b904d7ae (Featire specs)
>>>>>>> e60833c (Add login registration pages)
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4976a174 (Add login registration pages)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 6a9fede (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ef483b6d (Fix)
>>>>>>> f416f45 (Add login registration pages)
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
=======
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
>>>>>>> 0561be1d (Add login registration pages)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e60833c (Add login registration pages)
>>>>>>> 512d1d87 (Add login registration pages)
=======
>>>>>>> 36356d3 (Featire specs)
>>>>>>> b904d7ae (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
=======
>>>>>>> f416f45 (Add login registration pages)
>>>>>>> 4976a174 (Add login registration pages)
=======
>>>>>>> ef483b6d (Fix)
          
  119. 
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
            25
<<<<<<< HEAD
>>>>>>> 1214e1f (Add login registration pages)
=======
          
  120. 
            24
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> f7852d17 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 7a08014b (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 74240509 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
  121. 
            24
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0561be1d (Add login registration pages)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
          
  122. 
            25
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 0561be1d (Add login registration pages)
=======
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 22ee41c (Add login registration pages)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> ae07231a (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> c12b71de (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
          
  123. 
            25
>>>>>>> c033601 (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57a2e05 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 8249ff3c (Add login registration pages)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> cacbab9 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e989024d (Add login registration pages)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
=======
>>>>>>> f8e5c9db (Featire specs)
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> cacbab9 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 7d58507 (Add login registration pages)
>>>>>>> 31507b8 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 29e1af94 (Add login registration pages)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> cacbab9 (Add login registration pages)
>>>>>>> 56fd9d41 (Add login registration pages)
=======
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> cacbab9 (Add login registration pages)
>>>>>>> 7d58507 (Add login registration pages)
>>>>>>> 31507b8 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> a8b17c32 (Add login registration pages)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
          
  124. 
            25
=======
          
  125. 
            25
>>>>>>> 9620751 (Featire specs)
=======
          
  126. 
            24
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> d52f9efe (Featire specs)
=======
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> a636fda (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
          
  127. 
            24
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c12b71de (Featire specs)
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
=======
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> 77d62af (Featire specs)
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> c12b71de (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> efd6af09 (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
=======
          
  128. 
            24
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> e3e66f3 (Featire specs)
          
  129. 
            24
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
=======
          
  130. 
            24
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
          
  131. 
            25
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 57a2e05 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 8249ff3c (Add login registration pages)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 37e48018 (Featire specs)
          
  132. 
            25
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> e3e66f3 (Featire specs)
          
  133. 
            24
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
  134. 
            24
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 7d58507 (Add login registration pages)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e60833c (Add login registration pages)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> a624084 (Add login registration pages)
=======
          
  135. 
            25
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> cacbab9 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e989024d (Add login registration pages)
=======
=======
>>>>>>> 29e1af94 (Add login registration pages)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 872e675 (Fix)
>>>>>>> ae884b47 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
  136. 
            25
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> ae884b47 (Fix)
=======
>>>>>>> f136376a (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 932dbec (Featire specs)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 7d58507 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 31507b8 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 29e1af94 (Add login registration pages)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> ae884b47 (Fix)
=======
=======
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376a (Featire specs)
=======
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0ea (Featire specs)
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888bf (Featire specs)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 74240509 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
>>>>>>> 2fef4a0 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> f6e20266 (Add login registration pages)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a1a479e2 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> a624084 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e60833c (Add login registration pages)
<<<<<<< HEAD
>>>>>>> ed8ea634 (Add login registration pages)
=======
=======
=======
>>>>>>> fdab719f (Fix)
=======
=======
>>>>>>> c4adab0 (Featire specs)
=======
          
  137. 
            24
<<<<<<< HEAD
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 393eff3b (Featire specs)
=======
=======
=======
=======
          
  138. 
            24
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
  139. 
            25
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 6a9fede (Add login registration pages)
<<<<<<< HEAD
>>>>>>> f416f45 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 2be0d057 (Add login registration pages)
=======
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
>>>>>>> d9d85ca6 (Fix)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
>>>>>>> b832d45 (Featire specs)
=======
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> e3e66f3 (Featire specs)
          
  140. 
            24
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 610b6138 (Featire specs)
=======
=======
=======
          
  141. 
            24
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  142. 
            25
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 57a2e05 (Add login registration pages)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> e3e66f3 (Featire specs)
          
  143. 
            24
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 37e48018 (Featire specs)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
  144. 
            24
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 7d58507 (Add login registration pages)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e60833c (Add login registration pages)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> a624084 (Add login registration pages)
=======
          
  145. 
            25
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> cacbab9 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 56fd9d41 (Add login registration pages)
=======
=======
>>>>>>> a8b17c32 (Add login registration pages)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 8288136d (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
  146. 
            25
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 31d15e66 (Fix)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 932dbec (Featire specs)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> fdab719f (Fix)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 7d58507 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 31507b8 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> a8b17c32 (Add login registration pages)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> 8288136d (Fix)
=======
=======
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> d52f9efe (Featire specs)
=======
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> c12b71de (Featire specs)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
>>>>>>> 2fef4a0 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 0561be1d (Add login registration pages)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> a624084 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e60833c (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 512d1d87 (Add login registration pages)
=======
=======
=======
=======
          
  147. 
            24
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b904d7ae (Featire specs)
=======
=======
=======
=======
          
  148. 
            24
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
  149. 
            25
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 6a9fede (Add login registration pages)
<<<<<<< HEAD
>>>>>>> f416f45 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 4976a174 (Add login registration pages)
=======
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
>>>>>>> ef483b6d (Fix)
            

            

                @books_count = Book.count
          
    150. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 56fd9d41 (Add login registration pages)
=======
>>>>>>> 31d15e66 (Fix)
=======
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> 7a08014b (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> a8b17c32 (Add login registration pages)
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> c12b71de (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0561be1d (Add login registration pages)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 512d1d87 (Add login registration pages)
=======
>>>>>>> b904d7ae (Featire specs)
=======
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4976a174 (Add login registration pages)
=======
>>>>>>> ef483b6d (Fix)
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> c51bf93 (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 31507b8 (Add login registration pages)
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> bf05825 (Featire specs)
=======
>>>>>>> df37394 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7d58507 (Add login registration pages)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2fef4a0 (Add login registration pages)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e60833c (Add login registration pages)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> f416f45 (Add login registration pages)
=======
>>>>>>> 5b7749a (Fix)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> c51bf93 (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 31507b8 (Add login registration pages)
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> bf05825 (Featire specs)
=======
>>>>>>> df37394 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7d58507 (Add login registration pages)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2fef4a0 (Add login registration pages)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e60833c (Add login registration pages)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> f416f45 (Add login registration pages)
=======
>>>>>>> 5b7749a (Fix)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e989024d (Add login registration pages)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8249ff3c (Add login registration pages)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
=======
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 22ee41c (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
>>>>>>> 7a08014b (Featire specs)
=======
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
          
  150. 
            24
<<<<<<< HEAD
=======
=======
          
  151. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 57da3ff (Add login registration pages)
<<<<<<< HEAD
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 512d1d87 (Add login registration pages)
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> a624084 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b904d7ae (Featire specs)
>>>>>>> e60833c (Add login registration pages)
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4976a174 (Add login registration pages)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 6a9fede (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ef483b6d (Fix)
>>>>>>> f416f45 (Add login registration pages)
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
=======
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
>>>>>>> 0561be1d (Add login registration pages)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e60833c (Add login registration pages)
>>>>>>> 512d1d87 (Add login registration pages)
=======
>>>>>>> 36356d3 (Featire specs)
>>>>>>> b904d7ae (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
=======
>>>>>>> f416f45 (Add login registration pages)
>>>>>>> 4976a174 (Add login registration pages)
=======
>>>>>>> ef483b6d (Fix)
          
  152. 
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
            25
<<<<<<< HEAD
>>>>>>> 1214e1f (Add login registration pages)
=======
          
  153. 
            24
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> f7852d17 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 7a08014b (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 74240509 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
  154. 
            24
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0561be1d (Add login registration pages)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
          
  155. 
            25
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 0561be1d (Add login registration pages)
=======
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 22ee41c (Add login registration pages)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> ae07231a (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> c12b71de (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
          
  156. 
            25
>>>>>>> c033601 (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57a2e05 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 8249ff3c (Add login registration pages)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> cacbab9 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e989024d (Add login registration pages)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
=======
>>>>>>> f8e5c9db (Featire specs)
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> cacbab9 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 7d58507 (Add login registration pages)
>>>>>>> 31507b8 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 29e1af94 (Add login registration pages)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> cacbab9 (Add login registration pages)
>>>>>>> 56fd9d41 (Add login registration pages)
=======
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> cacbab9 (Add login registration pages)
>>>>>>> 7d58507 (Add login registration pages)
>>>>>>> 31507b8 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> a8b17c32 (Add login registration pages)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
          
  157. 
            25
=======
          
  158. 
            25
>>>>>>> 9620751 (Featire specs)
=======
          
  159. 
            24
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> d52f9efe (Featire specs)
=======
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> a636fda (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
          
  160. 
            24
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c12b71de (Featire specs)
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
=======
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> 77d62af (Featire specs)
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> c12b71de (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> efd6af09 (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
=======
          
  161. 
            24
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> e3e66f3 (Featire specs)
          
  162. 
            24
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
=======
          
  163. 
            24
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
          
  164. 
            25
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 57a2e05 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 8249ff3c (Add login registration pages)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 37e48018 (Featire specs)
          
  165. 
            25
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> e3e66f3 (Featire specs)
          
  166. 
            24
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
  167. 
            24
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 7d58507 (Add login registration pages)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e60833c (Add login registration pages)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> a624084 (Add login registration pages)
=======
          
  168. 
            25
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> cacbab9 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e989024d (Add login registration pages)
=======
=======
>>>>>>> 29e1af94 (Add login registration pages)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 872e675 (Fix)
>>>>>>> ae884b47 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
  169. 
            25
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> ae884b47 (Fix)
=======
>>>>>>> f136376a (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 932dbec (Featire specs)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 7d58507 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 31507b8 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 29e1af94 (Add login registration pages)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> ae884b47 (Fix)
=======
=======
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376a (Featire specs)
=======
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0ea (Featire specs)
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888bf (Featire specs)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 74240509 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
>>>>>>> 2fef4a0 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> f6e20266 (Add login registration pages)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a1a479e2 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> a624084 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e60833c (Add login registration pages)
<<<<<<< HEAD
>>>>>>> ed8ea634 (Add login registration pages)
=======
=======
=======
>>>>>>> fdab719f (Fix)
=======
=======
>>>>>>> c4adab0 (Featire specs)
=======
          
  170. 
            24
<<<<<<< HEAD
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 393eff3b (Featire specs)
=======
=======
=======
=======
          
  171. 
            24
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
  172. 
            25
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 6a9fede (Add login registration pages)
<<<<<<< HEAD
>>>>>>> f416f45 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 2be0d057 (Add login registration pages)
=======
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
>>>>>>> d9d85ca6 (Fix)
=======
>>>>>>> aca90e3 (Rebased)
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
>>>>>>> b832d45 (Featire specs)
=======
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> e3e66f3 (Featire specs)
          
  173. 
            24
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 610b6138 (Featire specs)
=======
=======
=======
          
  174. 
            24
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  175. 
            25
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 57a2e05 (Add login registration pages)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> e3e66f3 (Featire specs)
          
  176. 
            24
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 37e48018 (Featire specs)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
  177. 
            24
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 7d58507 (Add login registration pages)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e60833c (Add login registration pages)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> a624084 (Add login registration pages)
=======
          
  178. 
            25
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> cacbab9 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 56fd9d41 (Add login registration pages)
=======
=======
>>>>>>> a8b17c32 (Add login registration pages)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 8288136d (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
  179. 
            25
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 31d15e66 (Fix)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 932dbec (Featire specs)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> fdab719f (Fix)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 7d58507 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 31507b8 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> a8b17c32 (Add login registration pages)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> 8288136d (Fix)
=======
=======
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> d52f9efe (Featire specs)
=======
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> c12b71de (Featire specs)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
>>>>>>> 2fef4a0 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 0561be1d (Add login registration pages)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> a624084 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e60833c (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 512d1d87 (Add login registration pages)
=======
=======
=======
=======
          
  180. 
            24
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b904d7ae (Featire specs)
=======
=======
=======
=======
          
  181. 
            24
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
  182. 
            25
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 6a9fede (Add login registration pages)
<<<<<<< HEAD
>>>>>>> f416f45 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 4976a174 (Add login registration pages)
=======
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
>>>>>>> ef483b6d (Fix)
            

            

                @categories = Category.all
          
    183. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 56fd9d41 (Add login registration pages)
=======
>>>>>>> 31d15e66 (Fix)
=======
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> 7a08014b (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> a8b17c32 (Add login registration pages)
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> c12b71de (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0561be1d (Add login registration pages)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 512d1d87 (Add login registration pages)
=======
>>>>>>> b904d7ae (Featire specs)
=======
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4976a174 (Add login registration pages)
=======
>>>>>>> ef483b6d (Fix)
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> c51bf93 (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 31507b8 (Add login registration pages)
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> bf05825 (Featire specs)
=======
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7d58507 (Add login registration pages)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2fef4a0 (Add login registration pages)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e60833c (Add login registration pages)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> f416f45 (Add login registration pages)
=======
>>>>>>> 5b7749a (Fix)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
>>>>>>> c8da2e3 (Fix)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> c51bf93 (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 31507b8 (Add login registration pages)
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> bf05825 (Featire specs)
=======
>>>>>>> df37394 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7d58507 (Add login registration pages)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2fef4a0 (Add login registration pages)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e60833c (Add login registration pages)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> f416f45 (Add login registration pages)
=======
>>>>>>> 5b7749a (Fix)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
>>>>>>> c8da2e3 (Fix)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e989024d (Add login registration pages)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8249ff3c (Add login registration pages)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
=======
=======
>>>>>>> df37394 (Featire specs)
>>>>>>> 7a08014b (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6da9530 (Featire specs)
>>>>>>> 0f8241bb (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
          
  183. 
            24
<<<<<<< HEAD
=======
=======
=======
>>>>>>> 22ee41c (Add login registration pages)
=======
>>>>>>> c7a726c5 (Rebased)
          
  184. 
            24
=======
          
  185. 
            25
>>>>>>> 1214e1f (Add login registration pages)
=======
          
  186. 
            24
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
=======
          
  187. 
            25
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 22ee41c (Add login registration pages)
=======
<<<<<<< HEAD
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0561be1d (Add login registration pages)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
>>>>>>> 2fef4a0 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 512d1d87 (Add login registration pages)
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> a624084 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b904d7ae (Featire specs)
>>>>>>> e60833c (Add login registration pages)
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4976a174 (Add login registration pages)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 6a9fede (Add login registration pages)
>>>>>>> f416f45 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ae07231a (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> c12b71de (Featire specs)
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0561be1d (Add login registration pages)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e60833c (Add login registration pages)
>>>>>>> 512d1d87 (Add login registration pages)
=======
>>>>>>> 36356d3 (Featire specs)
>>>>>>> b904d7ae (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4976a174 (Add login registration pages)
=======
=======
>>>>>>> 6da9530 (Featire specs)
>>>>>>> 0f8241bb (Featire specs)
          
  188. 
            25
>>>>>>> c033601 (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57a2e05 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8249ff3c (Add login registration pages)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> cacbab9 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e989024d (Add login registration pages)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
=======
>>>>>>> f8e5c9db (Featire specs)
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> cacbab9 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 7d58507 (Add login registration pages)
>>>>>>> 31507b8 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 29e1af94 (Add login registration pages)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 37e48018 (Featire specs)
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> cacbab9 (Add login registration pages)
>>>>>>> 56fd9d41 (Add login registration pages)
=======
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> cacbab9 (Add login registration pages)
>>>>>>> 7d58507 (Add login registration pages)
>>>>>>> 31507b8 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> a8b17c32 (Add login registration pages)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
          
  189. 
            25
=======
          
  190. 
            25
>>>>>>> 9620751 (Featire specs)
=======
          
  191. 
            
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> d52f9efe (Featire specs)
=======
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> a636fda (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
          
  192. 
            
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> c8da2e3 (Fix)
>>>>>>> fdab719f (Fix)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
=======
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
>>>>>>> c12b71de (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> c8da2e3 (Fix)
=======
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
          
  193. 
            
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c12b71de (Featire specs)
>>>>>>> b832d45 (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b832d45 (Featire specs)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
          
  194. 
            
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
=======
          
  195. 
            
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> 872e675 (Fix)
>>>>>>> ae884b47 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 3723aad (Featire specs)
=======
=======
>>>>>>> 3b03895 (Featire specs)
=======
          
  196. 
            
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 3723aad (Featire specs)
=======
=======
>>>>>>> 3b03895 (Featire specs)
=======
          
  197. 
            
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
          
  198. 
            25
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> ae884b47 (Fix)
=======
>>>>>>> f136376a (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 932dbec (Featire specs)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> ae884b47 (Fix)
=======
=======
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376a (Featire specs)
=======
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0ea (Featire specs)
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4bf888bf (Featire specs)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
=======
          
  199. 
            
>>>>>>> 4552227 (Featire specs)
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 393eff3b (Featire specs)
=======
=======
=======
          
  200. 
            25
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
>>>>>>> d9d85ca6 (Fix)
=======
>>>>>>> b832d45 (Featire specs)
=======
=======
          
  201. 
            
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 610b6138 (Featire specs)
=======
=======
=======
          
  202. 
            
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 37e48018 (Featire specs)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 8288136d (Fix)
=======
          
  203. 
            25
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 31d15e66 (Fix)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> 557c1b8 (Fix)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> fdab719f (Fix)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> 8288136d (Fix)
=======
=======
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> d52f9efe (Featire specs)
=======
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
>>>>>>> c12b71de (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
=======
          
  204. 
            
>>>>>>> 4552227 (Featire specs)
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b904d7ae (Featire specs)
=======
=======
=======
          
  205. 
            25
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
>>>>>>> ef483b6d (Fix)
=======
=======
          
  206. 
            25
=======
          
  207. 
            
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> a636fda (Featire specs)
>>>>>>> 6da9530 (Featire specs)
>>>>>>> 0f8241bb (Featire specs)
            

            

<<<<<<< HEAD
                sorted_books = BookQuery.query(params).paginate(page: params[:page],
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> bf05825 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> bf05825 (Featire specs)
=======
=======
>>>>>>> fdab719f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
>>>>>>> c8da2e3 (Fix)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
>>>>>>> 9440753 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8288136d (Fix)
>>>>>>> ed32b84 (Featire specs)
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d52f9efe (Featire specs)
>>>>>>> 557c1b8 (Fix)
=======
=======
=======
>>>>>>> 9620751 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ae07231a (Featire specs)
>>>>>>> 932dbec (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5b7749a (Fix)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> b904d7ae (Featire specs)
=======
>>>>>>> 5b7749a (Fix)
=======
>>>>>>> ef483b6d (Fix)
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 31d15e66 (Fix)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> c8da2e3 (Fix)
>>>>>>> fdab719f (Fix)
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 557c1b8 (Fix)
>>>>>>> 8288136d (Fix)
=======
>>>>>>> 932dbec (Featire specs)
>>>>>>> d52f9efe (Featire specs)
=======
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> c12b71de (Featire specs)
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
>>>>>>> c12b71de (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> b904d7ae (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
>>>>>>> 0f8241bb (Featire specs)
                sorted_books = BookQuery.query(params).paginate(page: params[:page],
=======
            
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
=======
>>>>>>> 5507b42 (Featire specs)
>>>>>>> d52f9efe (Featire specs)
=======
=======
>>>>>>> ae07231a (Featire specs)
            
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
=======
=======
            
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
            
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fdab719f (Fix)
=======
=======
            
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
            
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
            
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c12b71de (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
            
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
<<<<<<< HEAD
=======
            
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
<<<<<<< HEAD
=======
            
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
            
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
                sorted_books = BookQuery.query(params).paginate(page: params[:page],
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> ae884b47 (Fix)
=======
>>>>>>> f136376a (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 8288136d (Fix)
=======
=======
>>>>>>> 932dbec (Featire specs)
>>>>>>> d52f9efe (Featire specs)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
=======
            
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
            
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> ae884b47 (Fix)
=======
=======
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376a (Featire specs)
=======
=======
=======
=======
=======
>>>>>>> 9620751 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
            
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                sorted_books = BookQuery.query(params).paginate(page: params[:page],
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
=======
>>>>>>> 9620751 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
            
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0ea (Featire specs)
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888bf (Featire specs)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
=======
            
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
=======
            
>>>>>>> 4552227 (Featire specs)
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 393eff3b (Featire specs)
=======
=======
=======
                sorted_books = BookQuery.query(params).paginate(page: params[:page],
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
>>>>>>> d9d85ca6 (Fix)
=======
=======
            
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 610b6138 (Featire specs)
=======
=======
            
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 37e48018 (Featire specs)
=======
=======
                sorted_books = BookQuery.query(params).paginate(page: params[:page],
>>>>>>> a5d032d (Fix)
>>>>>>> 31d15e66 (Fix)
=======
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> fdab719f (Fix)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
=======
            
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
            
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> 8288136d (Fix)
=======
=======
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> d52f9efe (Featire specs)
=======
=======
=======
=======
=======
>>>>>>> 9620751 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
            
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                sorted_books = BookQuery.query(params).paginate(page: params[:page],
>>>>>>> a5d032d (Fix)
=======
>>>>>>> 9620751 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
            
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> c12b71de (Featire specs)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
=======
            
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
=======
            
>>>>>>> 4552227 (Featire specs)
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b904d7ae (Featire specs)
=======
=======
=======
                sorted_books = BookQuery.query(params).paginate(page: params[:page],
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
>>>>>>> ef483b6d (Fix)
=======
=======
>>>>>>> 6da9530 (Featire specs)
>>>>>>> 0f8241bb (Featire specs)
          
    208. 
        
    
      
        
    
<<<<<<< HEAD
          
  208. 
            
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> bf05825 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> bf05825 (Featire specs)
=======
=======
>>>>>>> fdab719f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
>>>>>>> c8da2e3 (Fix)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
>>>>>>> 9440753 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8288136d (Fix)
>>>>>>> ed32b84 (Featire specs)
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d52f9efe (Featire specs)
>>>>>>> 557c1b8 (Fix)
=======
=======
=======
>>>>>>> 9620751 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ae07231a (Featire specs)
>>>>>>> 932dbec (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5b7749a (Fix)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> b904d7ae (Featire specs)
=======
>>>>>>> 5b7749a (Fix)
=======
>>>>>>> ef483b6d (Fix)
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 31d15e66 (Fix)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> c8da2e3 (Fix)
>>>>>>> fdab719f (Fix)
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 557c1b8 (Fix)
>>>>>>> 8288136d (Fix)
=======
>>>>>>> 932dbec (Featire specs)
>>>>>>> d52f9efe (Featire specs)
=======
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> c12b71de (Featire specs)
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
>>>>>>> c12b71de (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> b904d7ae (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
>>>>>>> 0f8241bb (Featire specs)
          
  209. 
            
=======
          
  210. 
            24
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 5507b42 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> 59d75f9 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> efd6af09 (Featire specs)
=======
=======
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
          
  211. 
            24
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> c12b71de (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
=======
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
          
  212. 
            24
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> c12b71de (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
          
  213. 
            24
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> d8abfed3 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
          
  214. 
            24
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 393eff3b (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> b904d7ae (Featire specs)
=======
>>>>>>> 872e675 (Fix)
>>>>>>> ae884b47 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 31d15e66 (Fix)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 8288136d (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 36356d3 (Featire specs)
=======
          
  215. 
            
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> ae884b47 (Fix)
=======
>>>>>>> f136376a (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 932dbec (Featire specs)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> ae884b47 (Fix)
=======
=======
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376a (Featire specs)
=======
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0ea (Featire specs)
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4bf888bf (Featire specs)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
=======
          
  216. 
            24
>>>>>>> 4552227 (Featire specs)
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 393eff3b (Featire specs)
=======
=======
=======
          
  217. 
            
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
>>>>>>> d9d85ca6 (Fix)
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 31d15e66 (Fix)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 932dbec (Featire specs)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> fdab719f (Fix)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> 8288136d (Fix)
=======
=======
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> d52f9efe (Featire specs)
=======
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
>>>>>>> c12b71de (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
=======
          
  218. 
            24
>>>>>>> 4552227 (Featire specs)
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b904d7ae (Featire specs)
=======
=======
=======
          
  219. 
            
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
>>>>>>> ef483b6d (Fix)
=======
=======
>>>>>>> 6da9530 (Featire specs)
>>>>>>> 0f8241bb (Featire specs)
            

            

<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
>>>>>>> 34509eee (Featire specs)
=======
>>>>>>> 67ab5299 (Fix)
=======
>>>>>>> 84809242 (Featire specs)
=======
>>>>>>> 5a2009f1 (Fix)
=======
>>>>>>> 365d41ed (Featire specs)
=======
>>>>>>> c05ee511 (Featire specs)
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
>>>>>>> ae884b47 (Fix)
=======
>>>>>>> f136376a (Featire specs)
=======
>>>>>>> 1ca9c0ea (Featire specs)
=======
>>>>>>> 4bf888bf (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 393eff3b (Featire specs)
=======
>>>>>>> d9d85ca6 (Fix)
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 31d15e66 (Fix)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> c12b71de (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> b904d7ae (Featire specs)
=======
>>>>>>> ef483b6d (Fix)
=======
>>>>>>> 0f8241bb (Featire specs)
                                                                per_page: PAGINATION_PER_PAGE)
>>>>>>> 9bfbd88 (Featire specs)
<<<<<<< HEAD
=======
=======
=======
>>>>>>> 70fcacc (Featire specs)
=======
>>>>>>> ae409ca (Featire specs)
=======
>>>>>>> 379a979 (Featire specs)
=======
>>>>>>> adc21e0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4d90e3d (Featire specs)
=======
>>>>>>> 160fb15 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> bf05825 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> bf05825 (Featire specs)
=======
=======
>>>>>>> fdab719f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
>>>>>>> c8da2e3 (Fix)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
>>>>>>> 9440753 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8288136d (Fix)
>>>>>>> ed32b84 (Featire specs)
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d52f9efe (Featire specs)
>>>>>>> 557c1b8 (Fix)
=======
=======
=======
>>>>>>> 9620751 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ae07231a (Featire specs)
>>>>>>> 932dbec (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5b7749a (Fix)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> b904d7ae (Featire specs)
=======
>>>>>>> 5b7749a (Fix)
=======
>>>>>>> ef483b6d (Fix)
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> 4d90e3d (Featire specs)
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 31d15e66 (Fix)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> c8da2e3 (Fix)
>>>>>>> fdab719f (Fix)
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 557c1b8 (Fix)
>>>>>>> 8288136d (Fix)
=======
>>>>>>> 932dbec (Featire specs)
>>>>>>> d52f9efe (Featire specs)
=======
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> c12b71de (Featire specs)
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
>>>>>>> c12b71de (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> b904d7ae (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
>>>>>>> 0f8241bb (Featire specs)
                                                                per_page: Constants::PAGINATION_PER_PAGE)
=======
                @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE)
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
=======
>>>>>>> 5507b42 (Featire specs)
>>>>>>> d52f9efe (Featire specs)
=======
=======
>>>>>>> ae07231a (Featire specs)
                @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE)
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
=======
=======
                @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE)
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE)
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fdab719f (Fix)
=======
=======
                @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE)
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE)
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
                @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE)
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c12b71de (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
                @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE)
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
                @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE)
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
<<<<<<< HEAD
=======
                @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE)
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
=======
                @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE)
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
                @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE)
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e18eb87 (Fix)
=======
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 49f2e24 (Featire specs)
=======
                @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE)
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                                                                per_page: Constants::PAGINATION_PER_PAGE)
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> 8887ba5b (Fix)
=======
>>>>>>> 53db2224 (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 932dbec (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8288136d (Fix)
=======
=======
>>>>>>> 932dbec (Featire specs)
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> 0c57e4e (Fix)
<<<<<<< HEAD
>>>>>>> 8887ba5b (Fix)
=======
=======
>>>>>>> 5e31aeb (Featire specs)
>>>>>>> 53db2224 (Featire specs)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 0676508 (Featire specs)
=======
=======
                @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE)
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
>>>>>>> 9440753 (Featire specs)
=======
=======
>>>>>>> da3a9a3 (Featire specs)
=======
=======
                @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE)
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> 8887ba5b (Fix)
>>>>>>> ed32b84 (Featire specs)
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> 53db2224 (Featire specs)
>>>>>>> 557c1b8 (Fix)
=======
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
=======
=======
=======
=======
>>>>>>> 9620751 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
<<<<<<< HEAD
                @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE)
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                                                                per_page: Constants::PAGINATION_PER_PAGE)
>>>>>>> a5d032d (Fix)
=======
>>>>>>> 9620751 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE)
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                                                                per_page: Constants::PAGINATION_PER_PAGE)
>>>>>>> a5d032d (Fix)
=======
>>>>>>> 9620751 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE)
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
=======
=======
                @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE)
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
=======
                @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE)
>>>>>>> 4552227 (Featire specs)
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ef483b6d (Fix)
>>>>>>> 36356d3 (Featire specs)
=======
=======
                                                                per_page: Constants::PAGINATION_PER_PAGE)
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
                @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE)
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 610b6138 (Featire specs)
=======
=======
                @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE)
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 31d15e66 (Fix)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> fdab719f (Fix)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 557c1b8 (Fix)
>>>>>>> 8288136d (Fix)
=======
=======
>>>>>>> ae07231a (Featire specs)
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> d52f9efe (Featire specs)
=======
=======
=======
=======
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
                @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE)
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> c12b71de (Featire specs)
=======
=======
=======
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> c4adab0 (Featire specs)
=======
=======
                @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE)
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 36356d3 (Featire specs)
>>>>>>> b904d7ae (Featire specs)
=======
>>>>>>> ef483b6d (Fix)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> b28889f (Fix)
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 0c57e4e (Fix)
<<<<<<< HEAD
>>>>>>> 8887ba5b (Fix)
=======
=======
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5e31aeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 53db2224 (Featire specs)
=======
=======
=======
=======
=======
                @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE)
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
=======
=======
=======
                @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE)
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
=======
=======
=======
                @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE)
>>>>>>> 4552227 (Featire specs)
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 392646b5 (Featire specs)
=======
=======
=======
=======
                                                                per_page: Constants::PAGINATION_PER_PAGE)
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
                @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE)
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
=======
                @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE)
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
=======
                @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE)
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
    220. 
        
    
      
        
    
          
  220. 
            
            

            

            
          
    221. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 9e081dc (Fix)
=======
>>>>>>> 15c51b7 (Featire specs)
=======
>>>>>>> 72b9cab (Featire specs)
=======
>>>>>>> 8181d13 (Featire specs)
=======
>>>>>>> 973ba8c (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> 0c57e4e (Fix)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
=======
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
>>>>>>> 9440753 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> 8887ba5b (Fix)
>>>>>>> ed32b84 (Featire specs)
=======
=======
>>>>>>> 0c57e4e (Fix)
=======
=======
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> 8887ba5b (Fix)
=======
>>>>>>> 53db2224 (Featire specs)
>>>>>>> 557c1b8 (Fix)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 5b7749a (Fix)
=======
<<<<<<< HEAD
=======
>>>>>>> c12b71de (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> b904d7ae (Featire specs)
=======
>>>>>>> ef483b6d (Fix)
>>>>>>> a5d032d (Fix)
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b904d7ae (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ef483b6d (Fix)
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
>>>>>>> a5d032d (Fix)
>>>>>>> 31d15e66 (Fix)
=======
=======
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> b28889f (Fix)
>>>>>>> c8da2e3 (Fix)
>>>>>>> fdab719f (Fix)
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 557c1b8 (Fix)
>>>>>>> 8288136d (Fix)
=======
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
>>>>>>> a5d032d (Fix)
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> d52f9efe (Featire specs)
=======
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c12b71de (Featire specs)
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
>>>>>>> c12b71de (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 36356d3 (Featire specs)
>>>>>>> b904d7ae (Featire specs)
=======
>>>>>>> ef483b6d (Fix)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> b28889f (Fix)
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0c57e4e (Fix)
<<<<<<< HEAD
>>>>>>> 8887ba5b (Fix)
=======
=======
=======
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> a5d032d (Fix)
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5e31aeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 53db2224 (Featire specs)
=======
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 392646b5 (Featire specs)
=======
=======
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
  221. 
            25
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> bae2b7de (Add login registration pages)
=======
>>>>>>> 31d15e66 (Fix)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> ef483b6d (Fix)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
=======
=======
>>>>>>> 0c57e4e (Fix)
>>>>>>> 8887ba5b (Fix)
=======
=======
>>>>>>> 1049b80c (Fix)
=======
>>>>>>> 0c57e4e (Fix)
=======
=======
>>>>>>> f182ac7 (Add login registration pages)
>>>>>>> 1d11874 (Add login registration pages)
>>>>>>> ff4c2fe0 (Add login registration pages)
                @books = BookDecorator.decorate_collection(sorted_books)
<<<<<<< HEAD
>>>>>>> 9a49b7b (Rebased)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> fdab719f (Fix)
=======
=======
>>>>>>> 557c1b8 (Fix)
>>>>>>> 8288136d (Fix)
                @books = BookDecorator.decorate_collection(sorted_books)
=======
                @books = BookDecorator.decorate_collection(sorted_books)
>>>>>>> e18eb87 (Fix)
=======
<<<<<<< HEAD
<<<<<<< HEAD
                @books = BookDecorator.decorate_collection(sorted_books)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5b7749a (Fix)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> 5b7749a (Fix)
=======
>>>>>>> 9e081dc (Fix)
=======
>>>>>>> f182ac7 (Add login registration pages)
                @books = BookDecorator.decorate_collection(sorted_books)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> f182ac7 (Add login registration pages)
                @books = BookDecorator.decorate_collection(sorted_books)
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
              def index
=======
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> 99dad91f (Fix)
              def index
          
    222. 
        
    
      
        
    
          
  222. 
            25
            

            

                @books_count = Book.count
          
    223. 
        
    
      
        
    
          
  223. 
            25
            

            

                @categories = Category.all
          
    224. 
        
    
      
        
    
          
  224. 
            25
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
          
  225. 
            24
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57da3ff (Add login registration pages)
>>>>>>> 0561be1d (Add login registration pages)
=======
=======
>>>>>>> 1d11874 (Add login registration pages)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
=======
          
  226. 
            24
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e18eb87 (Fix)
=======
<<<<<<< HEAD
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
=======
>>>>>>> 57da3ff (Add login registration pages)
>>>>>>> 06e5e41 (Add login registration pages)
=======
          
  227. 
            25
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> 06e5e41 (Add login registration pages)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
=======
          
  228. 
            24
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 512d1d87 (Add login registration pages)
=======
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e011b0df (Add login registration pages)
=======
>>>>>>> b8c2784f (Fix book_spec decrease quantity and price)
=======
>>>>>>> dda81aa9 (Add login registration pages)
=======
>>>>>>> 7d58507 (Add login registration pages)
>>>>>>> a8b17c32 (Add login registration pages)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> a624084 (Add login registration pages)
>>>>>>> e60833c (Add login registration pages)
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7d58507 (Add login registration pages)
>>>>>>> c871248 (Add login registration pages)
=======
=======
>>>>>>> 385136b (Add login registration pages)
=======
>>>>>>> 7d58507 (Add login registration pages)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> a624084 (Add login registration pages)
>>>>>>> ccec311 (Add login registration pages)
=======
          
  229. 
            25
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 56fd9d41 (Add login registration pages)
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 512d1d87 (Add login registration pages)
=======
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> ff4c2fe0 (Add login registration pages)
=======
>>>>>>> dda81aa9 (Add login registration pages)
=======
>>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price)
=======
>>>>>>> c871248 (Add login registration pages)
>>>>>>> e011b0df (Add login registration pages)
=======
>>>>>>> 1d11874 (Add login registration pages)
=======
>>>>>>> 385136b (Add login registration pages)
=======
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7d58507 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a8b17c32 (Add login registration pages)
=======
=======
>>>>>>> e011b0df (Add login registration pages)
=======
>>>>>>> ff4c2fe0 (Add login registration pages)
=======
=======
>>>>>>> f182ac7 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
>>>>>>> 2fef4a0 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 0561be1d (Add login registration pages)
=======
=======
=======
>>>>>>> e60833c (Add login registration pages)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> f182ac7 (Add login registration pages)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57da3ff (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> a624084 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e60833c (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 512d1d87 (Add login registration pages)
=======
=======
=======
=======
          
  230. 
            24
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
  231. 
            25
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 6a9fede (Add login registration pages)
>>>>>>> f416f45 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 4976a174 (Add login registration pages)
=======
=======
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c871248 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e011b0df (Add login registration pages)
=======
=======
=======
=======
>>>>>>> ccec311 (Add login registration pages)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> f182ac7 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 852864e (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 1d11874 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> ff4c2fe0 (Add login registration pages)
=======
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0f24a043 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 551f3c1 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 06e5e41 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 8f1baf1c (Add login registration pages)
=======
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> b8c2784f (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> a624084 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> ccec311 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 385136b (Add login registration pages)
<<<<<<< HEAD
>>>>>>> dda81aa9 (Add login registration pages)
=======
=======
=======
=======
=======
          
  232. 
            24
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
=======
          
  233. 
            25
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 6a9fede (Add login registration pages)
>>>>>>> 8c3e531 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 1c33e01 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 40a3d25f (Add login registration pages)
=======
=======
=======
>>>>>>> 03c0867 (Add login registration pages)
>>>>>>> 8d4ec55 (Add login registration pages)
>>>>>>> 73dcd461 (Add login registration pages)
            

            

                sorted_books = BookQuery.query(params).paginate(page: params[:page],
          
    234. 
        
    
      
        
    
          
  234. 
            
            

            

                                                                per_page: PAGINATION_PER_PAGE)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
>>>>>>> 1d11874 (Add login registration pages)
=======
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 156ffe6 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> bae2b7de (Add login registration pages)
=======
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
          
    235. 
        
    
      
        
    
          
  235. 
            25
            

            

                @books_count = Book.count
          
    236. 
        
    
      
        
    
          
  236. 
            25
            

            

                @categories = Category.all
          
    237. 
        
    
      
        
    
          
  237. 
            25
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> f0e2e12a (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
          
  238. 
            24
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
          
  239. 
            25
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8249ff3c (Add login registration pages)
=======
=======
>>>>>>> f6e20266 (Add login registration pages)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
>>>>>>> a1a479e2 (Fix book_spec decrease quantity and price)
=======
          
  240. 
            24
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> a1a479e2 (Fix book_spec decrease quantity and price)
=======
>>>>>>> ed8ea634 (Add login registration pages)
=======
>>>>>>> 7d58507 (Add login registration pages)
>>>>>>> 29e1af94 (Add login registration pages)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> a624084 (Add login registration pages)
>>>>>>> e60833c (Add login registration pages)
=======
          
  241. 
            25
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e989024d (Add login registration pages)
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> ed8ea634 (Add login registration pages)
=======
>>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7d58507 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 29e1af94 (Add login registration pages)
=======
=======
=======
>>>>>>> f182ac7 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 74240509 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
>>>>>>> 2fef4a0 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> f6e20266 (Add login registration pages)
=======
=======
=======
>>>>>>> e60833c (Add login registration pages)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> f182ac7 (Add login registration pages)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57da3ff (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a1a479e2 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> a624084 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e60833c (Add login registration pages)
<<<<<<< HEAD
>>>>>>> ed8ea634 (Add login registration pages)
=======
=======
=======
=======
          
  242. 
            24
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
  243. 
            25
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 6a9fede (Add login registration pages)
>>>>>>> f416f45 (Add login registration pages)
>>>>>>> 2be0d057 (Add login registration pages)
=======
=======
          
  244. 
            25
>>>>>>> aca90e3 (Rebased)
>>>>>>> c7a726c5 (Rebased)
            

            

                sorted_books = BookQuery.query(params).paginate(page: params[:page],
          
    245. 
        
    
      
        
    
          
  245. 
            
            

            

<<<<<<< HEAD
                                                                per_page: PAGINATION_PER_PAGE)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> 74240509 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
>>>>>>> a1a479e2 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price)
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
=======
>>>>>>> f0e2e12a (Featire specs)
>>>>>>> 156ffe6 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 6066f925 (Add login registration pages)
=======
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 31d15e66 (Fix)
=======
=======
                @books = BookDecorator.decorate_collection(sorted_books)
>>>>>>> a5d032d (Fix)
>>>>>>> 160fb15 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
=======
                @books = BookDecorator.decorate_collection(sorted_books)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fdab719f (Fix)
=======
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 8288136d (Fix)
=======
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8887ba5b (Fix)
=======
>>>>>>> b8c2784f (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e18eb87 (Fix)
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0c57e4e (Fix)
=======
=======
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
                @books = BookDecorator.decorate_collection(sorted_books)
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 0c57e4e (Fix)
=======
=======
                @books = BookDecorator.decorate_collection(sorted_books)
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ae884b47 (Fix)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
                @books = BookDecorator.decorate_collection(sorted_books)
>>>>>>> a5d032d (Fix)
=======
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> f182ac7 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 1214e1f (Add login registration pages)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 74240509 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a1a479e2 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price)
=======
=======
=======
                @books = BookDecorator.decorate_collection(sorted_books)
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
>>>>>>> d9d85ca6 (Fix)
=======
                                                                per_page: Constants::PAGINATION_PER_PAGE)
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> 31d15e66 (Fix)
=======
=======
                @books = BookDecorator.decorate_collection(sorted_books)
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> c8da2e3 (Fix)
>>>>>>> fdab719f (Fix)
=======
>>>>>>> c8da2e3 (Fix)
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
                @books = BookDecorator.decorate_collection(sorted_books)
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
>>>>>>> 557c1b8 (Fix)
>>>>>>> 8288136d (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
=======
=======
=======
                @books = BookDecorator.decorate_collection(sorted_books)
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
>>>>>>> ef483b6d (Fix)
=======
=======
                @books = BookDecorator.decorate_collection(sorted_books)
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0c57e4e (Fix)
<<<<<<< HEAD
>>>>>>> 8887ba5b (Fix)
=======
=======
=======
=======
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> f182ac7 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 852864e (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 1d11874 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> ff4c2fe0 (Add login registration pages)
=======
=======
=======
=======
>>>>>>> 1214e1f (Add login registration pages)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0f24a043 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> b8c2784f (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
                @books = BookDecorator.decorate_collection(sorted_books)
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
>>>>>>> 9e081dc (Fix)
>>>>>>> 1049b80c (Fix)
          
    246. 
        
    
      
        
    
<<<<<<< HEAD
          
  246. 
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
=======
>>>>>>> 5a2009f1 (Fix)
=======
>>>>>>> 4f4ea3f9 (Featire specs)
=======
>>>>>>> ae884b47 (Fix)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84809242 (Featire specs)
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> c51bf93 (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 872e675 (Fix)
>>>>>>> 557c1b8 (Fix)
=======
<<<<<<< HEAD
>>>>>>> ae884b47 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> c8da2e3 (Fix)
=======
<<<<<<< HEAD
>>>>>>> fdab719f (Fix)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c51bf93 (Featire specs)
=======
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> f92a45b (Featire specs)
=======
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 0c57e4e (Fix)
=======
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> f92a45b (Featire specs)
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
>>>>>>> e6fc67c7 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 7a08014b (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> f92a45b (Featire specs)
>>>>>>> e6fc67c7 (Featire specs)
          
  247. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  248. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  249. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> f92a45b (Featire specs)
>>>>>>> e6fc67c7 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
=======
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> e6fc67c7 (Featire specs)
=======
>>>>>>> 8887ba5b (Fix)
=======
<<<<<<< HEAD
=======
>>>>>>> ae884b47 (Fix)
=======
=======
>>>>>>> 7a08014b (Featire specs)
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
=======
>>>>>>> a5d032d (Fix)
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ae884b47 (Fix)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> a5d032d (Fix)
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> a5d032d (Fix)
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
          
  250. 
>>>>>>> c7a726c5 (Rebased)
            
            

            

            
          
    251. 
        
    
      
        
    
          
  251. 
            25
            

            

<<<<<<< HEAD
                @books = BookDecorator.decorate_collection(sorted_books)
=======
<<<<<<< HEAD
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
              def index
          
    252. 
        
    
      
        
    
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
          
  252. 
            24
<<<<<<< HEAD
=======
=======
          
  253. 
            25
>>>>>>> 1214e1f (Add login registration pages)
=======
          
  254. 
            24
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
            

            

                @books_count = Book.count
          
    255. 
        
    
      
        
    
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
          
  255. 
            24
<<<<<<< HEAD
=======
=======
          
  256. 
            25
>>>>>>> 1214e1f (Add login registration pages)
=======
          
  257. 
            24
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
            

            

                @categories = Category.all
          
    258. 
        
    
      
        
    
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
          
  258. 
            24
            

            

                sorted_books = BookQuery.query(params).paginate(page: params[:page],
          
    259. 
        
    
      
        
    
          
  259. 
            
            

            

                                                                per_page: PAGINATION_PER_PAGE)
>>>>>>> 9bfbd88 (Featire specs)
          
    260. 
        
    
      
        
    
          
  260. 
<<<<<<< HEAD
=======
=======
          
  261. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  262. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  263. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
=======
>>>>>>> a5d032d (Fix)
>>>>>>> 31d15e66 (Fix)
=======
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> a5d032d (Fix)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
=======
>>>>>>> a5d032d (Fix)
>>>>>>> c8da2e3 (Fix)
>>>>>>> fdab719f (Fix)
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
=======
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 557c1b8 (Fix)
>>>>>>> 8288136d (Fix)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
>>>>>>> a5d032d (Fix)
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 0c57e4e (Fix)
>>>>>>> 8887ba5b (Fix)
            
            

            

            
          
    264. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> c51bf93 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 31507b8 (Add login registration pages)
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> f92a45b (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
>>>>>>> c871248 (Add login registration pages)
=======
>>>>>>> 0c57e4e (Fix)
=======
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 06e5e41 (Add login registration pages)
=======
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 385136b (Add login registration pages)
=======
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1c33e01 (Add login registration pages)
=======
>>>>>>> 9e081dc (Fix)
=======
>>>>>>> df37394 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
=======
=======
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> c51bf93 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 31507b8 (Add login registration pages)
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> df37394 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8249ff3c (Add login registration pages)
=======
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e989024d (Add login registration pages)
=======
>>>>>>> 67ab5299 (Fix)
=======
>>>>>>> 84809242 (Featire specs)
=======
>>>>>>> ebcdce06 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 56fd9d41 (Add login registration pages)
=======
>>>>>>> 31d15e66 (Fix)
=======
>>>>>>> 84003439 (Featire specs)
          
  264. 
=======
          
  265. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  266. 
>>>>>>> 4e81ea2 (Featire specs)
            24
=======
          
  267. 
            25
>>>>>>> 1214e1f (Add login registration pages)
=======
          
  268. 
            24
>>>>>>> 08edf50 (Featire specs)
=======
          
  269. 
            24
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9a49b7b (Rebased)
=======
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 793a6ed (Add login registration pages)
=======
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
=======
>>>>>>> c5efe8e (Add login registration pages)
=======
>>>>>>> 160fb15 (Fix)
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> b28889f (Fix)
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2fef4a0 (Add login registration pages)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e60833c (Add login registration pages)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> f416f45 (Add login registration pages)
=======
>>>>>>> 5b7749a (Fix)
=======
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> b28889f (Fix)
>>>>>>> e18eb87 (Fix)
=======
<<<<<<< HEAD
>>>>>>> c5efe8e (Add login registration pages)
=======
>>>>>>> 160fb15 (Fix)
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> b28889f (Fix)
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2fef4a0 (Add login registration pages)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e60833c (Add login registration pages)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> f416f45 (Add login registration pages)
=======
>>>>>>> 5b7749a (Fix)
=======
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8249ff3c (Add login registration pages)
<<<<<<< HEAD
=======
>>>>>>> ebcdce06 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 22ee41c (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> ebcdce06 (Featire specs)
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
>>>>>>> 7a08014b (Featire specs)
=======
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
>>>>>>> 8d4ec55 (Add login registration pages)
>>>>>>> 73dcd461 (Add login registration pages)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
>>>>>>> 03c0867 (Add login registration pages)
>>>>>>> 8d4ec55 (Add login registration pages)
>>>>>>> 73dcd461 (Add login registration pages)
          
  270. 
            24
<<<<<<< HEAD
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 84809242 (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57a2e05 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8249ff3c (Add login registration pages)
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> cacbab9 (Add login registration pages)
>>>>>>> e989024d (Add login registration pages)
=======
=======
>>>>>>> 29e1af94 (Add login registration pages)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e011b0df (Add login registration pages)
=======
>>>>>>> cacbab9 (Add login registration pages)
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> c871248 (Add login registration pages)
=======
=======
>>>>>>> cacbab9 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 7d58507 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 31507b8 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 29e1af94 (Add login registration pages)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> cacbab9 (Add login registration pages)
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 74240509 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
>>>>>>> 2fef4a0 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f6e20266 (Add login registration pages)
=======
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> cacbab9 (Add login registration pages)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57da3ff (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a1a479e2 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> a624084 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e60833c (Add login registration pages)
<<<<<<< HEAD
>>>>>>> ed8ea634 (Add login registration pages)
=======
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 6a9fede (Add login registration pages)
>>>>>>> f416f45 (Add login registration pages)
>>>>>>> 2be0d057 (Add login registration pages)
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> cacbab9 (Add login registration pages)
>>>>>>> 56fd9d41 (Add login registration pages)
=======
=======
>>>>>>> a8b17c32 (Add login registration pages)
=======
>>>>>>> cacbab9 (Add login registration pages)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> cacbab9 (Add login registration pages)
>>>>>>> 7d58507 (Add login registration pages)
>>>>>>> 31507b8 (Add login registration pages)
>>>>>>> a8b17c32 (Add login registration pages)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
>>>>>>> 2fef4a0 (Add login registration pages)
>>>>>>> 0561be1d (Add login registration pages)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> a624084 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e60833c (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 512d1d87 (Add login registration pages)
=======
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 6a9fede (Add login registration pages)
>>>>>>> f416f45 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 4976a174 (Add login registration pages)
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c871248 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e011b0df (Add login registration pages)
=======
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0f24a043 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 551f3c1 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 06e5e41 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 8f1baf1c (Add login registration pages)
=======
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> b8c2784f (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> a624084 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> ccec311 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 385136b (Add login registration pages)
<<<<<<< HEAD
>>>>>>> dda81aa9 (Add login registration pages)
=======
=======
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> 6a9fede (Add login registration pages)
>>>>>>> 8c3e531 (Add login registration pages)
>>>>>>> 1c33e01 (Add login registration pages)
>>>>>>> 40a3d25f (Add login registration pages)
          
  271. 
            25
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6066f925 (Add login registration pages)
=======
=======
>>>>>>> 365d41ed (Featire specs)
=======
>>>>>>> f136376a (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 7a08014b (Featire specs)
          
  272. 
            25
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
>>>>>>> 5507b42 (Featire specs)
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f136376a (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
          
  273. 
            25
>>>>>>> ebcdce06 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> bae2b7de (Add login registration pages)
=======
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 5507b42 (Featire specs)
>>>>>>> 932dbec (Featire specs)
>>>>>>> d52f9efe (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
          
  274. 
            25
<<<<<<< HEAD
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
>>>>>>> df37394 (Featire specs)
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
=======
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> 1d11874 (Add login registration pages)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5e31aeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 53db2224 (Featire specs)
=======
=======
=======
>>>>>>> 852864e (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 1d11874 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> ff4c2fe0 (Add login registration pages)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
>>>>>>> 216fe41 (Featire specs)
>>>>>>> f3d746cb (Featire specs)
>>>>>>> 1214e1f (Add login registration pages)
=======
          
  275. 
            24
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 7a08014b (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> f92a45b (Featire specs)
>>>>>>> e6fc67c7 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9bfbd88 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9bfbd88 (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 6da9530 (Featire specs)
=======
=======
          
  276. 
            24
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> bb5c652 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
          
  277. 
            25
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 22ee41c (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 88d49ad (Add login registration pages)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 9bfbd88 (Featire specs)
>>>>>>> ebcdce06 (Featire specs)
=======
>>>>>>> 88d49ad (Add login registration pages)
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 88d49ad (Add login registration pages)
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
>>>>>>> 06e5e41 (Add login registration pages)
=======
>>>>>>> 8d4ec55 (Add login registration pages)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
          
  278. 
            25
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
=======
          
  279. 
            25
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 03c0867 (Add login registration pages)
>>>>>>> 22ee41c (Add login registration pages)
>>>>>>> 6da9530 (Featire specs)
>>>>>>> 0f8241bb (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
                @books = BookDecorator.decorate_collection(sorted_books)
=======
=======
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                @books = BookDecorator.decorate_collection(sorted_books)
=======
=======
>>>>>>> ebcdce06 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
                @books = BookDecorator.decorate_collection(sorted_books)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
>>>>>>> 0f8241bb (Featire specs)
                @books = BookDecorator.decorate_collection(sorted_books)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
>>>>>>> 9bfbd88 (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9bfbd88 (Featire specs)
<<<<<<< HEAD
>>>>>>> ebcdce06 (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
>>>>>>> 0f8241bb (Featire specs)
                @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE)
>>>>>>> 752f0c0 (Featire specs)
=======
                @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE)
>>>>>>> 4e81ea2 (Featire specs)
=======
                @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE)
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> ebcdce06 (Featire specs)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
                @books = BookDecorator.decorate_collection(sorted_books)
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 9bfbd88 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
>>>>>>> 0f8241bb (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
=======
                @books = BookDecorator.decorate_collection(sorted_books)
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bb5c652 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> ebcdce06 (Featire specs)
=======
>>>>>>> bb5c652 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
>>>>>>> bb5c652 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
>>>>>>> 0f8241bb (Featire specs)
          
    280. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
          
  280. 
=======
=======
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  281. 
=======
=======
>>>>>>> ebcdce06 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
          
  282. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
>>>>>>> 0f8241bb (Featire specs)
          
  283. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
>>>>>>> 9bfbd88 (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9bfbd88 (Featire specs)
<<<<<<< HEAD
>>>>>>> ebcdce06 (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
>>>>>>> 0f8241bb (Featire specs)
          
  284. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  285. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  286. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> ebcdce06 (Featire specs)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
          
  287. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 9bfbd88 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
>>>>>>> 0f8241bb (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
=======
          
  288. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bb5c652 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> ebcdce06 (Featire specs)
=======
>>>>>>> bb5c652 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
>>>>>>> bb5c652 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
>>>>>>> 0f8241bb (Featire specs)
            
            

            

            
          
    289. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ebcdce06 (Featire specs)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
          
  289. 
=======
          
  290. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  291. 
>>>>>>> 4e81ea2 (Featire specs)
            24
=======
          
  292. 
            25
>>>>>>> 1214e1f (Add login registration pages)
=======
          
  293. 
            24
>>>>>>> 08edf50 (Featire specs)
=======
          
  294. 
            24
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  295. 
            25
>>>>>>> aca90e3 (Rebased)
<<<<<<< HEAD
=======
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
=======
<<<<<<< HEAD
=======
=======
=======
>>>>>>> ebcdce06 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
          
  296. 
            24
<<<<<<< HEAD
=======
=======
          
  297. 
            25
>>>>>>> 1214e1f (Add login registration pages)
=======
          
  298. 
            24
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9bfbd88 (Featire specs)
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> 9bfbd88 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 9bfbd88 (Featire specs)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> 9bfbd88 (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
>>>>>>> 9bfbd88 (Featire specs)
<<<<<<< HEAD
=======
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
=======
=======
          
  299. 
            24
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
>>>>>>> bb5c652 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
          
  300. 
            25
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 22ee41c (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> 73dcd461 (Add login registration pages)
>>>>>>> 88d49ad (Add login registration pages)
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> 8d4ec55 (Add login registration pages)
=======
>>>>>>> 73dcd461 (Add login registration pages)
          
  301. 
            25
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
>>>>>>> 9a49b7b (Rebased)
=======
=======
=======
>>>>>>> 9ec6862 (Add login registration pages)
=======
          
  302. 
            24
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 70fcacc (Featire specs)
=======
=======
=======
          
  303. 
            24
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> ae409ca (Featire specs)
=======
=======
=======
          
  304. 
            24
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 379a979 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
          
  305. 
            24
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
          
  306. 
            25
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8249ff3c (Add login registration pages)
=======
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
          
  307. 
            24
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> a1a479e2 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> a624084 (Add login registration pages)
>>>>>>> ed8ea634 (Add login registration pages)
=======
>>>>>>> 56fd9d41 (Add login registration pages)
=======
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> a624084 (Add login registration pages)
>>>>>>> 512d1d87 (Add login registration pages)
=======
          
  308. 
            25
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e989024d (Add login registration pages)
=======
=======
>>>>>>> ed8ea634 (Add login registration pages)
=======
>>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> e60833c (Add login registration pages)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
=======
=======
=======
>>>>>>> 0561be1d (Add login registration pages)
=======
=======
=======
>>>>>>> e60833c (Add login registration pages)
=======
>>>>>>> 512d1d87 (Add login registration pages)
=======
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
=======
>>>>>>> f182ac7 (Add login registration pages)
=======
          
  309. 
            24
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57da3ff (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 2fef4a0 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> f6e20266 (Add login registration pages)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a1a479e2 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> a624084 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e60833c (Add login registration pages)
<<<<<<< HEAD
>>>>>>> ed8ea634 (Add login registration pages)
=======
=======
=======
=======
          
  310. 
            24
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
  311. 
            25
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 6a9fede (Add login registration pages)
>>>>>>> f416f45 (Add login registration pages)
>>>>>>> 2be0d057 (Add login registration pages)
=======
>>>>>>> bae2b7de (Add login registration pages)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 56fd9d41 (Add login registration pages)
=======
>>>>>>> 2fef4a0 (Add login registration pages)
>>>>>>> 0561be1d (Add login registration pages)
=======
>>>>>>> 2fef4a0 (Add login registration pages)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> a624084 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e60833c (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 512d1d87 (Add login registration pages)
=======
=======
=======
=======
          
  312. 
            24
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
  313. 
            25
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 6a9fede (Add login registration pages)
>>>>>>> f416f45 (Add login registration pages)
>>>>>>> 4976a174 (Add login registration pages)
            

            

                @books = BookDecorator.decorate_collection(sorted_books)
          
    314. 
        
    
      
        
    
          
  314. 
            
            

            

            
          
    315. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8249ff3c (Add login registration pages)
=======
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e989024d (Add login registration pages)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 56fd9d41 (Add login registration pages)
          
  315. 
            25
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 9ec6862 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 156ffe6 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 6066f925 (Add login registration pages)
=======
=======
=======
=======
          
  316. 
            24
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> adc21e0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  317. 
            24
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  318. 
            25
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 57a2e05 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 793a6ed (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8249ff3c (Add login registration pages)
=======
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
=======
          
  319. 
            24
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d90e3d (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
=======
=======
          
  320. 
            24
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
  321. 
            25
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> cacbab9 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> c5efe8e (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e989024d (Add login registration pages)
=======
=======
=======
          
  322. 
            25
>>>>>>> a5d032d (Fix)
>>>>>>> 160fb15 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
=======
=======
=======
<<<<<<< HEAD
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 9ec6862 (Add login registration pages)
=======
>>>>>>> 9620751 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> f182ac7 (Add login registration pages)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f182ac7 (Add login registration pages)
=======
>>>>>>> e3e66f3 (Featire specs)
          
  323. 
            24
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
          
  324. 
            24
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
=======
          
  325. 
            24
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> b832d45 (Featire specs)
=======
=======
<<<<<<< HEAD
=======
          
  326. 
            24
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  327. 
            25
>>>>>>> 730a8ca (Add login registration pages)
=======
          
  328. 
            24
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 7d58507 (Add login registration pages)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
  329. 
            25
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7d58507 (Add login registration pages)
=======
=======
=======
>>>>>>> f182ac7 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> f182ac7 (Add login registration pages)
>>>>>>> e3e66f3 (Featire specs)
=======
          
  330. 
            24
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
>>>>>>> e3e66f3 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                @books = BookDecorator.decorate_collection(sorted_books)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                @books = BookDecorator.decorate_collection(sorted_books)
=======
                @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE)
>>>>>>> 752f0c0 (Featire specs)
=======
                @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE)
>>>>>>> 4e81ea2 (Featire specs)
=======
                @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE)
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
                @books = BookDecorator.decorate_collection(sorted_books)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
                @books = BookDecorator.decorate_collection(sorted_books)
>>>>>>> e3e66f3 (Featire specs)
          
    331. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  331. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  332. 
=======
          
  333. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  334. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  335. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
          
  336. 
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
          
  337. 
>>>>>>> e3e66f3 (Featire specs)
            
            

            

            
          
    338. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7d58507 (Add login registration pages)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
>>>>>>> 2fef4a0 (Add login registration pages)
=======
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e60833c (Add login registration pages)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> f416f45 (Add login registration pages)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57da3ff (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> a624084 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e60833c (Add login registration pages)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 6a9fede (Add login registration pages)
>>>>>>> f416f45 (Add login registration pages)
          
  338. 
            25
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9ec6862 (Add login registration pages)
=======
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 9ec6862 (Add login registration pages)
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> e3e66f3 (Featire specs)
          
  339. 
            24
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
  340. 
            24
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
          
  341. 
            24
<<<<<<< HEAD
>>>>>>> df37394 (Featire specs)
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
>>>>>>> 2fef4a0 (Add login registration pages)
=======
          
  342. 
            25
<<<<<<< HEAD
=======
          
  343. 
            25
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 57a2e05 (Add login registration pages)
=======
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
          
  344. 
            25
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 57a2e05 (Add login registration pages)
=======
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> e3e66f3 (Featire specs)
          
  345. 
            24
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
>>>>>>> 9c0d812 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
  346. 
            24
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 7d58507 (Add login registration pages)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e60833c (Add login registration pages)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> a624084 (Add login registration pages)
=======
          
  347. 
            25
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> cacbab9 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
  348. 
            25
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
=======
=======
=======
>>>>>>> 1214e1f (Add login registration pages)
=======
          
  349. 
            24
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 7d58507 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 31507b8 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 29e1af94 (Add login registration pages)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> ae884b47 (Fix)
=======
=======
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376a (Featire specs)
=======
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0ea (Featire specs)
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888bf (Featire specs)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
          
  350. 
            25
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> f182ac7 (Add login registration pages)
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 74240509 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
>>>>>>> 2fef4a0 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> f6e20266 (Add login registration pages)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a1a479e2 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> a624084 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e60833c (Add login registration pages)
<<<<<<< HEAD
>>>>>>> ed8ea634 (Add login registration pages)
=======
=======
=======
=======
          
  351. 
            24
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 393eff3b (Featire specs)
=======
=======
=======
=======
          
  352. 
            24
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
  353. 
            25
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 6a9fede (Add login registration pages)
<<<<<<< HEAD
>>>>>>> f416f45 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 2be0d057 (Add login registration pages)
=======
=======
=======
          
  354. 
            25
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
>>>>>>> d9d85ca6 (Fix)
=======
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> 9bfbd88 (Featire specs)
>>>>>>> ebcdce06 (Featire specs)
=======
          
  355. 
            25
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 9ec6862 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 156ffe6 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> bae2b7de (Add login registration pages)
=======
=======
=======
=======
          
  356. 
            24
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 3723aad (Featire specs)
>>>>>>> adc21e0 (Featire specs)
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d90e3d (Featire specs)
<<<<<<< HEAD
>>>>>>> 37e48018 (Featire specs)
=======
=======
=======
=======
          
  357. 
            24
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
  358. 
            25
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> cacbab9 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> c5efe8e (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 56fd9d41 (Add login registration pages)
=======
=======
=======
          
  359. 
            25
>>>>>>> a5d032d (Fix)
>>>>>>> 160fb15 (Fix)
>>>>>>> 31d15e66 (Fix)
=======
=======
=======
=======
<<<<<<< HEAD
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 9ec6862 (Add login registration pages)
=======
>>>>>>> 9620751 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> f182ac7 (Add login registration pages)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f182ac7 (Add login registration pages)
=======
>>>>>>> e3e66f3 (Featire specs)
          
  360. 
            24
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
          
  361. 
            24
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
=======
          
  362. 
            24
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> b832d45 (Featire specs)
=======
=======
<<<<<<< HEAD
=======
          
  363. 
            24
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  364. 
            25
>>>>>>> 730a8ca (Add login registration pages)
=======
          
  365. 
            24
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 7d58507 (Add login registration pages)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
  366. 
            25
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7d58507 (Add login registration pages)
=======
=======
=======
>>>>>>> f182ac7 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> f182ac7 (Add login registration pages)
>>>>>>> e3e66f3 (Featire specs)
=======
          
  367. 
            24
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
>>>>>>> e3e66f3 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                @books = BookDecorator.decorate_collection(sorted_books)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                @books = BookDecorator.decorate_collection(sorted_books)
=======
                @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE)
>>>>>>> 752f0c0 (Featire specs)
=======
                @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE)
>>>>>>> 4e81ea2 (Featire specs)
=======
                @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE)
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
                @books = BookDecorator.decorate_collection(sorted_books)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
                @books = BookDecorator.decorate_collection(sorted_books)
>>>>>>> e3e66f3 (Featire specs)
          
    368. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  368. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  369. 
=======
          
  370. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  371. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  372. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
          
  373. 
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
          
  374. 
>>>>>>> e3e66f3 (Featire specs)
            
            

            

            
          
    375. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7d58507 (Add login registration pages)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
>>>>>>> 2fef4a0 (Add login registration pages)
=======
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e60833c (Add login registration pages)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> f416f45 (Add login registration pages)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57da3ff (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> a624084 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e60833c (Add login registration pages)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 6a9fede (Add login registration pages)
>>>>>>> f416f45 (Add login registration pages)
          
  375. 
            25
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9ec6862 (Add login registration pages)
=======
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 9ec6862 (Add login registration pages)
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> e3e66f3 (Featire specs)
          
  376. 
            24
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
  377. 
            24
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
          
  378. 
            24
<<<<<<< HEAD
>>>>>>> df37394 (Featire specs)
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
>>>>>>> 2fef4a0 (Add login registration pages)
=======
          
  379. 
            25
<<<<<<< HEAD
=======
          
  380. 
            25
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 57a2e05 (Add login registration pages)
=======
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
          
  381. 
            25
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 57a2e05 (Add login registration pages)
=======
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> e3e66f3 (Featire specs)
          
  382. 
            24
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
>>>>>>> 9c0d812 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
  383. 
            24
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 7d58507 (Add login registration pages)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e60833c (Add login registration pages)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> a624084 (Add login registration pages)
=======
          
  384. 
            25
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> cacbab9 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
  385. 
            25
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> fdab719f (Fix)
=======
=======
=======
>>>>>>> 1214e1f (Add login registration pages)
=======
          
  386. 
            24
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 7d58507 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 31507b8 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> a8b17c32 (Add login registration pages)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> 8288136d (Fix)
=======
=======
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> d52f9efe (Featire specs)
=======
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> c12b71de (Featire specs)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
          
  387. 
            25
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> f182ac7 (Add login registration pages)
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
>>>>>>> 2fef4a0 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 0561be1d (Add login registration pages)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> a624084 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e60833c (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 512d1d87 (Add login registration pages)
=======
=======
=======
=======
          
  388. 
            24
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b904d7ae (Featire specs)
=======
=======
=======
=======
          
  389. 
            24
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
  390. 
            25
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 6a9fede (Add login registration pages)
<<<<<<< HEAD
>>>>>>> f416f45 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 4976a174 (Add login registration pages)
=======
=======
=======
          
  391. 
            25
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
>>>>>>> ef483b6d (Fix)
=======
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9ec6862 (Add login registration pages)
=======
>>>>>>> 9620751 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> f182ac7 (Add login registration pages)
=======
>>>>>>> 852864e (Add login registration pages)
          
  392. 
            24
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
          
  393. 
            24
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
=======
          
  394. 
            24
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
=======
<<<<<<< HEAD
=======
          
  395. 
            24
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  396. 
            25
>>>>>>> 730a8ca (Add login registration pages)
=======
          
  397. 
            24
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 7d58507 (Add login registration pages)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> a624084 (Add login registration pages)
>>>>>>> ccec311 (Add login registration pages)
=======
          
  398. 
            25
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7d58507 (Add login registration pages)
=======
=======
>>>>>>> ccec311 (Add login registration pages)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> f182ac7 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 852864e (Add login registration pages)
=======
=======
          
  399. 
            24
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 551f3c1 (Add login registration pages)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> a624084 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> ccec311 (Add login registration pages)
=======
=======
=======
          
  400. 
            24
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  401. 
            25
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 6a9fede (Add login registration pages)
>>>>>>> 8c3e531 (Add login registration pages)
            

            

<<<<<<< HEAD
                @books = BookDecorator.decorate_collection(sorted_books)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                @books = BookDecorator.decorate_collection(sorted_books)
=======
                @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE)
>>>>>>> 752f0c0 (Featire specs)
=======
                @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE)
>>>>>>> 4e81ea2 (Featire specs)
=======
                @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE)
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
          
    402. 
        
    
      
        
    
<<<<<<< HEAD
          
  402. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  403. 
=======
          
  404. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  405. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  406. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
            
            

            

            
          
    407. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7d58507 (Add login registration pages)
=======
>>>>>>> 852864e (Add login registration pages)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> ccec311 (Add login registration pages)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8c3e531 (Add login registration pages)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57da3ff (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 551f3c1 (Add login registration pages)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> a624084 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> ccec311 (Add login registration pages)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 6a9fede (Add login registration pages)
>>>>>>> 8c3e531 (Add login registration pages)
          
  407. 
            25
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9ec6862 (Add login registration pages)
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
          
  408. 
            24
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
  409. 
            24
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
          
  410. 
            24
<<<<<<< HEAD
>>>>>>> df37394 (Featire specs)
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
>>>>>>> 551f3c1 (Add login registration pages)
=======
          
  411. 
            25
<<<<<<< HEAD
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 57a2e05 (Add login registration pages)
=======
=======
>>>>>>> 3b03895 (Featire specs)
=======
          
  412. 
            24
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
>>>>>>> 9c0d812 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
  413. 
            24
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 7d58507 (Add login registration pages)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> ccec311 (Add login registration pages)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> a624084 (Add login registration pages)
=======
          
  414. 
            25
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> cacbab9 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
          
  415. 
            25
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
=======
>>>>>>> 1214e1f (Add login registration pages)
=======
          
  416. 
            24
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 7d58507 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> c871248 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e011b0df (Add login registration pages)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 0c57e4e (Fix)
<<<<<<< HEAD
>>>>>>> 8887ba5b (Fix)
=======
=======
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5e31aeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 53db2224 (Featire specs)
=======
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
=======
=======
          
  417. 
            25
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> f182ac7 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 852864e (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 1d11874 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> ff4c2fe0 (Add login registration pages)
=======
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0f24a043 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 551f3c1 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 06e5e41 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 8f1baf1c (Add login registration pages)
=======
=======
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> b8c2784f (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> a624084 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> ccec311 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 385136b (Add login registration pages)
<<<<<<< HEAD
>>>>>>> dda81aa9 (Add login registration pages)
=======
=======
=======
=======
=======
          
  418. 
            24
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 392646b5 (Featire specs)
=======
=======
=======
=======
=======
          
  419. 
            24
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
=======
          
  420. 
            25
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 6a9fede (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 8c3e531 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 1c33e01 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 40a3d25f (Add login registration pages)
=======
=======
=======
=======
          
  421. 
            25
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
=======
>>>>>>> 03c0867 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 8d4ec55 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 73dcd461 (Add login registration pages)
=======
=======
=======
          
  422. 
            24
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
=======
          
  423. 
            24
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 9ec6862 (Add login registration pages)
=======
=======
          
  424. 
            24
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
=======
=======
          
  425. 
            24
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
          
  426. 
            25
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 57a2e05 (Add login registration pages)
=======
=======
          
  427. 
            24
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            

            

                respond_to do |format|
          
    428. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> c51bf93 (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 31507b8 (Add login registration pages)
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> bf05825 (Featire specs)
=======
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> f92a45b (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
>>>>>>> c871248 (Add login registration pages)
=======
>>>>>>> 0c57e4e (Fix)
=======
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 973ba8c (Featire specs)
=======
>>>>>>> 1d11874 (Add login registration pages)
=======
>>>>>>> 8181d13 (Featire specs)
=======
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 06e5e41 (Add login registration pages)
=======
>>>>>>> 72b9cab (Featire specs)
=======
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 385136b (Add login registration pages)
=======
>>>>>>> 15c51b7 (Featire specs)
=======
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1c33e01 (Add login registration pages)
=======
>>>>>>> 9e081dc (Fix)
=======
=======
=======
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> 2a25e4c (Featire specs)
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> df37394 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
=======
=======
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> c51bf93 (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 31507b8 (Add login registration pages)
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> bf05825 (Featire specs)
=======
>>>>>>> df37394 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6066f925 (Add login registration pages)
=======
>>>>>>> 6e923b9d (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8249ff3c (Add login registration pages)
=======
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e989024d (Add login registration pages)
=======
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> ebcdce06 (Featire specs)
=======
>>>>>>> bae2b7de (Add login registration pages)
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 56fd9d41 (Add login registration pages)
=======
>>>>>>> 31d15e66 (Fix)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
          
  428. 
=======
          
  429. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  430. 
>>>>>>> 4e81ea2 (Featire specs)
            24
=======
          
  431. 
            25
>>>>>>> 1214e1f (Add login registration pages)
=======
          
  432. 
            24
>>>>>>> 08edf50 (Featire specs)
=======
          
  433. 
            24
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  434. 
            25
>>>>>>> aca90e3 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
<<<<<<< HEAD
=======
>>>>>>> 9a49b7b (Rebased)
=======
>>>>>>> 70fcacc (Featire specs)
=======
>>>>>>> ae409ca (Featire specs)
=======
>>>>>>> 379a979 (Featire specs)
=======
>>>>>>> 156ffe6 (Add login registration pages)
=======
>>>>>>> adc21e0 (Featire specs)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> 793a6ed (Add login registration pages)
=======
>>>>>>> 4d90e3d (Featire specs)
=======
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
=======
>>>>>>> c5efe8e (Add login registration pages)
=======
>>>>>>> 160fb15 (Fix)
=======
>>>>>>> c8da2e3 (Fix)
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 37e48018 (Featire specs)
=======
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> cacbab9 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 56fd9d41 (Add login registration pages)
=======
=======
>>>>>>> a8b17c32 (Add login registration pages)
=======
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7d58507 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> a8b17c32 (Add login registration pages)
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> c12b71de (Featire specs)
          
  435. 
            25
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> b28889f (Fix)
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> adc21e0 (Featire specs)
=======
<<<<<<< HEAD
=======
=======
>>>>>>> 793a6ed (Add login registration pages)
=======
>>>>>>> 4d90e3d (Featire specs)
=======
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
=======
>>>>>>> c5efe8e (Add login registration pages)
=======
>>>>>>> 160fb15 (Fix)
=======
>>>>>>> c8da2e3 (Fix)
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> bae2b7de (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2612be03 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
=======
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
>>>>>>> cacbab9 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 7b22ad7e (Featire specs)
=======
>>>>>>> c871248 (Add login registration pages)
>>>>>>> e011b0df (Add login registration pages)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 7d58507 (Add login registration pages)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 973ba8c (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
          
  436. 
            25
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 8249ff3c (Add login registration pages)
=======
>>>>>>> 824bb2b (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
>>>>>>> b28889f (Fix)
>>>>>>> c8da2e3 (Fix)
=======
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> f182ac7 (Add login registration pages)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57da3ff (Add login registration pages)
<<<<<<< HEAD
          
  437. 
            25
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a624084 (Add login registration pages)
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6a9fede (Add login registration pages)
          
  438. 
            25
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7d58507 (Add login registration pages)
>>>>>>> c871248 (Add login registration pages)
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 973ba8c (Featire specs)
=======
=======
=======
>>>>>>> f182ac7 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 852864e (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 1d11874 (Add login registration pages)
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 551f3c1 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 06e5e41 (Add login registration pages)
=======
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> a624084 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> ccec311 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 385136b (Add login registration pages)
=======
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
=======
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 6a9fede (Add login registration pages)
>>>>>>> 8c3e531 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 1c33e01 (Add login registration pages)
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
          
  439. 
            25
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> b28889f (Fix)
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> f182ac7 (Add login registration pages)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57da3ff (Add login registration pages)
<<<<<<< HEAD
          
  440. 
            25
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a624084 (Add login registration pages)
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6a9fede (Add login registration pages)
          
  441. 
            25
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> f0e2e12a (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6066f925 (Add login registration pages)
<<<<<<< HEAD
=======
=======
=======
<<<<<<< HEAD
>>>>>>> ebcdce06 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 22ee41c (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> ebcdce06 (Featire specs)
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
>>>>>>> 7a08014b (Featire specs)
=======
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
>>>>>>> 8d4ec55 (Add login registration pages)
>>>>>>> 73dcd461 (Add login registration pages)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
>>>>>>> 03c0867 (Add login registration pages)
>>>>>>> 8d4ec55 (Add login registration pages)
>>>>>>> 73dcd461 (Add login registration pages)
          
  442. 
            24
<<<<<<< HEAD
=======
=======
          
  443. 
            25
>>>>>>> 1214e1f (Add login registration pages)
=======
          
  444. 
            24
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
=======
=======
=======
<<<<<<< HEAD
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> f7852d17 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 7a08014b (Featire specs)
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 84003439 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
>>>>>>> 4f4ea3f9 (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
>>>>>>> 74240509 (Fix book_spec decrease quantity and price)
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 9bfbd88 (Featire specs)
<<<<<<< HEAD
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> c51bf93 (Featire specs)
=======
>>>>>>> f92a45b (Featire specs)
=======
>>>>>>> 8181d13 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> c51bf93 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 5c33a07 (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 5c33a07 (Featire specs)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
>>>>>>> 0f24a043 (Fix book_spec decrease quantity and price)
          
  445. 
            24
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8249ff3c (Add login registration pages)
=======
>>>>>>> 84809242 (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 74240509 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2fef4a0 (Add login registration pages)
>>>>>>> f6e20266 (Add login registration pages)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
<<<<<<< HEAD
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 2fef4a0 (Add login registration pages)
>>>>>>> 0561be1d (Add login registration pages)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bb5c652 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
          
  446. 
            25
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 0561be1d (Add login registration pages)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 22ee41c (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 88d49ad (Add login registration pages)
=======
=======
=======
>>>>>>> 6da9530 (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
>>>>>>> 551f3c1 (Add login registration pages)
          
  447. 
            25
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 2612be03 (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 551f3c1 (Add login registration pages)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 22ee41c (Add login registration pages)
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 22ee41c (Add login registration pages)
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> 22ee41c (Add login registration pages)
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> 22ee41c (Add login registration pages)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 22ee41c (Add login registration pages)
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
          
  448. 
            25
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
>>>>>>> 9a49b7b (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
=======
<<<<<<< HEAD
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 9ec6862 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 9ec6862 (Add login registration pages)
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> bae2b7de (Add login registration pages)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 610b6138 (Featire specs)
=======
=======
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 9ec6862 (Add login registration pages)
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
          
  449. 
            25
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 9ec6862 (Add login registration pages)
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
          
  450. 
            25
>>>>>>> 9620751 (Featire specs)
=======
=======
          
  451. 
            25
>>>>>>> 6da9530 (Featire specs)
=======
          
  452. 
            25
>>>>>>> 9620751 (Featire specs)
=======
          
  453. 
            25
>>>>>>> 2a25e4c (Featire specs)
=======
          
  454. 
            24
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 53db2224 (Featire specs)
=======
>>>>>>> 7b22ad7e (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
=======
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> d52f9efe (Featire specs)
=======
=======
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> 77d62af (Featire specs)
>>>>>>> ae07231a (Featire specs)
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 70fcacc (Featire specs)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 009401d (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
          
  455. 
            24
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c12b71de (Featire specs)
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
=======
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> 77d62af (Featire specs)
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> c12b71de (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
>>>>>>> ae409ca (Featire specs)
=======
>>>>>>> c8da2e3 (Fix)
=======
<<<<<<< HEAD
>>>>>>> ae409ca (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
          
  456. 
            24
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c12b71de (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 379a979 (Featire specs)
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
=======
>>>>>>> f182ac7 (Add login registration pages)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
=======
>>>>>>> f182ac7 (Add login registration pages)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fdab719f (Fix)
=======
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
=======
>>>>>>> f182ac7 (Add login registration pages)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
=======
>>>>>>> f182ac7 (Add login registration pages)
>>>>>>> e3e66f3 (Featire specs)
=======
          
  457. 
            25
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9ec6862 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 156ffe6 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 6066f925 (Add login registration pages)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
<<<<<<< HEAD
>>>>>>> 9ec6862 (Add login registration pages)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
  458. 
            24
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
>>>>>>> adc21e0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 57a2e05 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 793a6ed (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 8249ff3c (Add login registration pages)
=======
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57a2e05 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
          
  459. 
            24
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4d90e3d (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
  460. 
            24
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 7d58507 (Add login registration pages)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e60833c (Add login registration pages)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> a624084 (Add login registration pages)
=======
          
  461. 
            25
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> cacbab9 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c5efe8e (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e989024d (Add login registration pages)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 31507b8 (Add login registration pages)
=======
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
  462. 
            25
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 160fb15 (Fix)
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 932dbec (Featire specs)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 7d58507 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 31507b8 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 29e1af94 (Add login registration pages)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> ae884b47 (Fix)
=======
=======
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376a (Featire specs)
=======
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0ea (Featire specs)
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888bf (Featire specs)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> f182ac7 (Add login registration pages)
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 74240509 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
>>>>>>> 2fef4a0 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> f6e20266 (Add login registration pages)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a1a479e2 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> a624084 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e60833c (Add login registration pages)
<<<<<<< HEAD
>>>>>>> ed8ea634 (Add login registration pages)
=======
=======
=======
=======
          
  463. 
            24
<<<<<<< HEAD
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 393eff3b (Featire specs)
=======
=======
=======
=======
          
  464. 
            24
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 379a979 (Featire specs)
>>>>>>> bae2b7de (Add login registration pages)
=======
=======
=======
          
  465. 
            25
<<<<<<< HEAD
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 6a9fede (Add login registration pages)
<<<<<<< HEAD
>>>>>>> f416f45 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 2be0d057 (Add login registration pages)
=======
=======
=======
          
  466. 
            25
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
>>>>>>> d9d85ca6 (Fix)
=======
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 9bfbd88 (Featire specs)
>>>>>>> ebcdce06 (Featire specs)
=======
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
>>>>>>> 9ec6862 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 156ffe6 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> bae2b7de (Add login registration pages)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
<<<<<<< HEAD
>>>>>>> 9ec6862 (Add login registration pages)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
  467. 
            24
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> adc21e0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 610b6138 (Featire specs)
=======
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 57a2e05 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 793a6ed (Add login registration pages)
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57a2e05 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
          
  468. 
            24
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4d90e3d (Featire specs)
<<<<<<< HEAD
>>>>>>> 37e48018 (Featire specs)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
  469. 
            24
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 7d58507 (Add login registration pages)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e60833c (Add login registration pages)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> a624084 (Add login registration pages)
=======
          
  470. 
            25
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> cacbab9 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c5efe8e (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 56fd9d41 (Add login registration pages)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 31507b8 (Add login registration pages)
=======
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
  471. 
            25
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 160fb15 (Fix)
<<<<<<< HEAD
>>>>>>> 31d15e66 (Fix)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 932dbec (Featire specs)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> fdab719f (Fix)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 7d58507 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 31507b8 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> a8b17c32 (Add login registration pages)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> 8288136d (Fix)
=======
=======
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> d52f9efe (Featire specs)
=======
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> c12b71de (Featire specs)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> f182ac7 (Add login registration pages)
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
>>>>>>> 2fef4a0 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 0561be1d (Add login registration pages)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> a624084 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e60833c (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 512d1d87 (Add login registration pages)
=======
=======
=======
=======
          
  472. 
            24
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b904d7ae (Featire specs)
=======
=======
=======
=======
          
  473. 
            24
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
  474. 
            25
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 6a9fede (Add login registration pages)
<<<<<<< HEAD
>>>>>>> f416f45 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 4976a174 (Add login registration pages)
=======
=======
=======
          
  475. 
            25
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
>>>>>>> ef483b6d (Fix)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
>>>>>>> 659083f (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 5507b42 (Featire specs)
>>>>>>> 5e31aeb (Featire specs)
=======
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> 51bc18c (Featire specs)
>>>>>>> a636fda (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
          
  476. 
            24
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
=======
          
  477. 
            24
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
=======
>>>>>>> f182ac7 (Add login registration pages)
=======
          
  478. 
            25
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9ec6862 (Add login registration pages)
=======
=======
          
  479. 
            24
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
=======
>>>>>>> 3b03895 (Featire specs)
=======
          
  480. 
            24
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
>>>>>>> 9c0d812 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
  481. 
            24
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 7d58507 (Add login registration pages)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> ccec311 (Add login registration pages)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> a624084 (Add login registration pages)
=======
          
  482. 
            25
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> cacbab9 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
          
  483. 
            25
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 7d58507 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> c871248 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e011b0df (Add login registration pages)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 0c57e4e (Fix)
<<<<<<< HEAD
>>>>>>> 8887ba5b (Fix)
=======
=======
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5e31aeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 53db2224 (Featire specs)
=======
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
=======
=======
>>>>>>> f182ac7 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 852864e (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 1d11874 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> ff4c2fe0 (Add login registration pages)
=======
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0f24a043 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 551f3c1 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 06e5e41 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 8f1baf1c (Add login registration pages)
=======
=======
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> b8c2784f (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> a624084 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> ccec311 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 385136b (Add login registration pages)
<<<<<<< HEAD
>>>>>>> dda81aa9 (Add login registration pages)
=======
=======
=======
=======
=======
          
  484. 
            24
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 392646b5 (Featire specs)
=======
=======
=======
=======
=======
          
  485. 
            24
<<<<<<< HEAD
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 03c0867 (Add login registration pages)
=======
=======
          
  486. 
            25
<<<<<<< HEAD
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 6a9fede (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 8c3e531 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 1c33e01 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 40a3d25f (Add login registration pages)
=======
=======
=======
=======
          
  487. 
            25
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
=======
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 22ee41c (Add login registration pages)
>>>>>>> 03c0867 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 8d4ec55 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 73dcd461 (Add login registration pages)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
=======
=======
          
  488. 
            24
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
=======
=======
          
  489. 
            24
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
=======
          
  490. 
            25
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 9ec6862 (Add login registration pages)
=======
=======
          
  491. 
            24
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
=======
          
  492. 
            24
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            

            

                  format.html
          
    493. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> c51bf93 (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 31507b8 (Add login registration pages)
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> bf05825 (Featire specs)
=======
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> f92a45b (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
>>>>>>> c871248 (Add login registration pages)
=======
>>>>>>> 0c57e4e (Fix)
=======
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 973ba8c (Featire specs)
=======
>>>>>>> 1d11874 (Add login registration pages)
=======
>>>>>>> 8181d13 (Featire specs)
=======
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 06e5e41 (Add login registration pages)
=======
>>>>>>> 72b9cab (Featire specs)
=======
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 385136b (Add login registration pages)
=======
>>>>>>> 15c51b7 (Featire specs)
=======
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1c33e01 (Add login registration pages)
=======
>>>>>>> 9e081dc (Fix)
=======
=======
=======
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> 2a25e4c (Featire specs)
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> df37394 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
=======
=======
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> c51bf93 (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 31507b8 (Add login registration pages)
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> bf05825 (Featire specs)
=======
>>>>>>> df37394 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6066f925 (Add login registration pages)
=======
>>>>>>> 6e923b9d (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8249ff3c (Add login registration pages)
=======
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e989024d (Add login registration pages)
=======
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> ebcdce06 (Featire specs)
=======
>>>>>>> bae2b7de (Add login registration pages)
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 56fd9d41 (Add login registration pages)
=======
>>>>>>> 31d15e66 (Fix)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
          
  493. 
=======
          
  494. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  495. 
>>>>>>> 4e81ea2 (Featire specs)
            24
=======
          
  496. 
            25
>>>>>>> 1214e1f (Add login registration pages)
=======
          
  497. 
            24
>>>>>>> 08edf50 (Featire specs)
=======
          
  498. 
            24
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  499. 
            25
>>>>>>> aca90e3 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
<<<<<<< HEAD
=======
>>>>>>> 9a49b7b (Rebased)
=======
>>>>>>> 70fcacc (Featire specs)
=======
>>>>>>> ae409ca (Featire specs)
=======
>>>>>>> 379a979 (Featire specs)
=======
>>>>>>> 156ffe6 (Add login registration pages)
=======
>>>>>>> adc21e0 (Featire specs)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> 793a6ed (Add login registration pages)
=======
>>>>>>> 4d90e3d (Featire specs)
=======
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
=======
>>>>>>> c5efe8e (Add login registration pages)
=======
>>>>>>> 160fb15 (Fix)
=======
>>>>>>> c8da2e3 (Fix)
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 37e48018 (Featire specs)
=======
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> cacbab9 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 56fd9d41 (Add login registration pages)
=======
=======
>>>>>>> a8b17c32 (Add login registration pages)
=======
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7d58507 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> a8b17c32 (Add login registration pages)
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> c12b71de (Featire specs)
          
  500. 
            25
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> b28889f (Fix)
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> adc21e0 (Featire specs)
=======
<<<<<<< HEAD
=======
=======
>>>>>>> 793a6ed (Add login registration pages)
=======
>>>>>>> 4d90e3d (Featire specs)
=======
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
=======
>>>>>>> c5efe8e (Add login registration pages)
=======
>>>>>>> 160fb15 (Fix)
=======
>>>>>>> c8da2e3 (Fix)
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> bae2b7de (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2612be03 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
=======
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
>>>>>>> cacbab9 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 7b22ad7e (Featire specs)
=======
>>>>>>> c871248 (Add login registration pages)
>>>>>>> e011b0df (Add login registration pages)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 7d58507 (Add login registration pages)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 973ba8c (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
          
  501. 
            25
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 8249ff3c (Add login registration pages)
=======
>>>>>>> 824bb2b (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
>>>>>>> b28889f (Fix)
>>>>>>> c8da2e3 (Fix)
=======
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> f182ac7 (Add login registration pages)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57da3ff (Add login registration pages)
<<<<<<< HEAD
          
  502. 
            25
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a624084 (Add login registration pages)
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6a9fede (Add login registration pages)
          
  503. 
            25
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7d58507 (Add login registration pages)
>>>>>>> c871248 (Add login registration pages)
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 973ba8c (Featire specs)
=======
=======
=======
>>>>>>> f182ac7 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 852864e (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 1d11874 (Add login registration pages)
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 551f3c1 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 06e5e41 (Add login registration pages)
=======
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> a624084 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> ccec311 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 385136b (Add login registration pages)
=======
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
=======
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 6a9fede (Add login registration pages)
>>>>>>> 8c3e531 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 1c33e01 (Add login registration pages)
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
          
  504. 
            25
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> b28889f (Fix)
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> f182ac7 (Add login registration pages)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57da3ff (Add login registration pages)
<<<<<<< HEAD
          
  505. 
            25
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a624084 (Add login registration pages)
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6a9fede (Add login registration pages)
          
  506. 
            25
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> f0e2e12a (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6066f925 (Add login registration pages)
<<<<<<< HEAD
=======
=======
=======
<<<<<<< HEAD
>>>>>>> ebcdce06 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 22ee41c (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> ebcdce06 (Featire specs)
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
>>>>>>> 7a08014b (Featire specs)
=======
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
>>>>>>> 8d4ec55 (Add login registration pages)
>>>>>>> 73dcd461 (Add login registration pages)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
>>>>>>> 03c0867 (Add login registration pages)
>>>>>>> 8d4ec55 (Add login registration pages)
>>>>>>> 73dcd461 (Add login registration pages)
          
  507. 
            24
<<<<<<< HEAD
=======
=======
          
  508. 
            25
>>>>>>> 1214e1f (Add login registration pages)
=======
          
  509. 
            24
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
=======
=======
=======
<<<<<<< HEAD
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> f7852d17 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 7a08014b (Featire specs)
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 84003439 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
>>>>>>> 4f4ea3f9 (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
>>>>>>> 74240509 (Fix book_spec decrease quantity and price)
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 9bfbd88 (Featire specs)
<<<<<<< HEAD
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> c51bf93 (Featire specs)
=======
>>>>>>> f92a45b (Featire specs)
=======
>>>>>>> 8181d13 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> c51bf93 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 5c33a07 (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 5c33a07 (Featire specs)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
>>>>>>> 0f24a043 (Fix book_spec decrease quantity and price)
          
  510. 
            24
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8249ff3c (Add login registration pages)
=======
>>>>>>> 84809242 (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 74240509 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2fef4a0 (Add login registration pages)
>>>>>>> f6e20266 (Add login registration pages)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
<<<<<<< HEAD
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 2fef4a0 (Add login registration pages)
>>>>>>> 0561be1d (Add login registration pages)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bb5c652 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
          
  511. 
            25
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 0561be1d (Add login registration pages)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 22ee41c (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 88d49ad (Add login registration pages)
=======
=======
=======
>>>>>>> 6da9530 (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
>>>>>>> 551f3c1 (Add login registration pages)
          
  512. 
            25
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 2612be03 (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 551f3c1 (Add login registration pages)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 22ee41c (Add login registration pages)
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 22ee41c (Add login registration pages)
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> 22ee41c (Add login registration pages)
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> 22ee41c (Add login registration pages)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 22ee41c (Add login registration pages)
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
          
  513. 
            25
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
>>>>>>> 9a49b7b (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
=======
<<<<<<< HEAD
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 9ec6862 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 9ec6862 (Add login registration pages)
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> bae2b7de (Add login registration pages)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 610b6138 (Featire specs)
=======
=======
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 9ec6862 (Add login registration pages)
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
          
  514. 
            25
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 9ec6862 (Add login registration pages)
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
          
  515. 
            25
>>>>>>> 9620751 (Featire specs)
=======
=======
          
  516. 
            25
>>>>>>> 6da9530 (Featire specs)
=======
          
  517. 
            25
>>>>>>> 9620751 (Featire specs)
=======
          
  518. 
            25
>>>>>>> 2a25e4c (Featire specs)
=======
          
  519. 
            24
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 53db2224 (Featire specs)
=======
>>>>>>> 7b22ad7e (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
=======
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> d52f9efe (Featire specs)
=======
=======
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> 77d62af (Featire specs)
>>>>>>> ae07231a (Featire specs)
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 70fcacc (Featire specs)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 009401d (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
          
  520. 
            24
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c12b71de (Featire specs)
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
=======
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> 77d62af (Featire specs)
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> c12b71de (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
>>>>>>> ae409ca (Featire specs)
=======
>>>>>>> c8da2e3 (Fix)
=======
<<<<<<< HEAD
>>>>>>> ae409ca (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
          
  521. 
            24
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c12b71de (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 379a979 (Featire specs)
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
=======
>>>>>>> f182ac7 (Add login registration pages)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
=======
>>>>>>> f182ac7 (Add login registration pages)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fdab719f (Fix)
=======
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
=======
>>>>>>> f182ac7 (Add login registration pages)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
=======
>>>>>>> f182ac7 (Add login registration pages)
>>>>>>> e3e66f3 (Featire specs)
=======
          
  522. 
            25
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9ec6862 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 156ffe6 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 6066f925 (Add login registration pages)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
<<<<<<< HEAD
>>>>>>> 9ec6862 (Add login registration pages)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
  523. 
            24
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
>>>>>>> adc21e0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 57a2e05 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 793a6ed (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 8249ff3c (Add login registration pages)
=======
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57a2e05 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
          
  524. 
            24
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4d90e3d (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
  525. 
            24
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 7d58507 (Add login registration pages)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e60833c (Add login registration pages)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> a624084 (Add login registration pages)
=======
          
  526. 
            25
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> cacbab9 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c5efe8e (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e989024d (Add login registration pages)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 31507b8 (Add login registration pages)
=======
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
  527. 
            25
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 160fb15 (Fix)
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 932dbec (Featire specs)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 7d58507 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 31507b8 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 29e1af94 (Add login registration pages)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> ae884b47 (Fix)
=======
=======
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376a (Featire specs)
=======
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0ea (Featire specs)
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888bf (Featire specs)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> f182ac7 (Add login registration pages)
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 74240509 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
>>>>>>> 2fef4a0 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> f6e20266 (Add login registration pages)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a1a479e2 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> a624084 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e60833c (Add login registration pages)
<<<<<<< HEAD
>>>>>>> ed8ea634 (Add login registration pages)
=======
=======
=======
=======
          
  528. 
            24
<<<<<<< HEAD
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 393eff3b (Featire specs)
=======
=======
=======
=======
          
  529. 
            24
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 379a979 (Featire specs)
>>>>>>> bae2b7de (Add login registration pages)
=======
=======
=======
          
  530. 
            25
<<<<<<< HEAD
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 6a9fede (Add login registration pages)
<<<<<<< HEAD
>>>>>>> f416f45 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 2be0d057 (Add login registration pages)
=======
=======
=======
          
  531. 
            25
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
>>>>>>> d9d85ca6 (Fix)
=======
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 9bfbd88 (Featire specs)
>>>>>>> ebcdce06 (Featire specs)
=======
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
>>>>>>> 9ec6862 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 156ffe6 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> bae2b7de (Add login registration pages)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
<<<<<<< HEAD
>>>>>>> 9ec6862 (Add login registration pages)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
  532. 
            24
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> adc21e0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 610b6138 (Featire specs)
=======
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 57a2e05 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 793a6ed (Add login registration pages)
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57a2e05 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
          
  533. 
            24
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4d90e3d (Featire specs)
<<<<<<< HEAD
>>>>>>> 37e48018 (Featire specs)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
  534. 
            24
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 7d58507 (Add login registration pages)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e60833c (Add login registration pages)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> a624084 (Add login registration pages)
=======
          
  535. 
            25
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> cacbab9 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c5efe8e (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 56fd9d41 (Add login registration pages)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 31507b8 (Add login registration pages)
=======
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
  536. 
            25
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 160fb15 (Fix)
<<<<<<< HEAD
>>>>>>> 31d15e66 (Fix)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 932dbec (Featire specs)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> fdab719f (Fix)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 7d58507 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 31507b8 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> a8b17c32 (Add login registration pages)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> 8288136d (Fix)
=======
=======
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> d52f9efe (Featire specs)
=======
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> c12b71de (Featire specs)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> f182ac7 (Add login registration pages)
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
>>>>>>> 2fef4a0 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 0561be1d (Add login registration pages)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> a624084 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e60833c (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 512d1d87 (Add login registration pages)
=======
=======
=======
=======
          
  537. 
            24
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b904d7ae (Featire specs)
=======
=======
=======
=======
          
  538. 
            24
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
  539. 
            25
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 6a9fede (Add login registration pages)
<<<<<<< HEAD
>>>>>>> f416f45 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 4976a174 (Add login registration pages)
=======
=======
=======
          
  540. 
            25
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
>>>>>>> ef483b6d (Fix)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
>>>>>>> 659083f (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 5507b42 (Featire specs)
>>>>>>> 5e31aeb (Featire specs)
=======
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> 51bc18c (Featire specs)
>>>>>>> a636fda (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
          
  541. 
            24
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
=======
          
  542. 
            24
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
=======
>>>>>>> f182ac7 (Add login registration pages)
=======
          
  543. 
            25
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9ec6862 (Add login registration pages)
=======
=======
          
  544. 
            24
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
=======
>>>>>>> 3b03895 (Featire specs)
=======
          
  545. 
            24
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
>>>>>>> 9c0d812 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
  546. 
            24
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 7d58507 (Add login registration pages)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> ccec311 (Add login registration pages)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> a624084 (Add login registration pages)
=======
          
  547. 
            25
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> cacbab9 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
          
  548. 
            25
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 7d58507 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> c871248 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e011b0df (Add login registration pages)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 0c57e4e (Fix)
<<<<<<< HEAD
>>>>>>> 8887ba5b (Fix)
=======
=======
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5e31aeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 53db2224 (Featire specs)
=======
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
=======
=======
>>>>>>> f182ac7 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 852864e (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 1d11874 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> ff4c2fe0 (Add login registration pages)
=======
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0f24a043 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 551f3c1 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 06e5e41 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 8f1baf1c (Add login registration pages)
=======
=======
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> b8c2784f (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> a624084 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> ccec311 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 385136b (Add login registration pages)
<<<<<<< HEAD
>>>>>>> dda81aa9 (Add login registration pages)
=======
=======
=======
=======
=======
          
  549. 
            24
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 392646b5 (Featire specs)
=======
=======
=======
=======
=======
          
  550. 
            24
<<<<<<< HEAD
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 03c0867 (Add login registration pages)
=======
=======
          
  551. 
            25
<<<<<<< HEAD
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 6a9fede (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 8c3e531 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 1c33e01 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 40a3d25f (Add login registration pages)
=======
=======
=======
=======
          
  552. 
            25
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
=======
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 22ee41c (Add login registration pages)
>>>>>>> 03c0867 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 8d4ec55 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 73dcd461 (Add login registration pages)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
=======
=======
          
  553. 
            24
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
=======
=======
          
  554. 
            24
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
=======
          
  555. 
            25
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 9ec6862 (Add login registration pages)
=======
=======
          
  556. 
            24
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
=======
          
  557. 
            24
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            

            

                  format.json do
          
    558. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  558. 
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> c51bf93 (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> bf05825 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> c51bf93 (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> bf05825 (Featire specs)
=======
>>>>>>> f92a45b (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0c57e4e (Fix)
=======
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 973ba8c (Featire specs)
=======
>>>>>>> 8181d13 (Featire specs)
=======
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 72b9cab (Featire specs)
=======
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 15c51b7 (Featire specs)
=======
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9e081dc (Fix)
=======
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
          
  559. 
>>>>>>> 2a25e4c (Featire specs)
>>>>>>> 216fe41 (Featire specs)
=======
          
  560. 
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
=======
=======
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  561. 
=======
=======
>>>>>>> 9a49b7b (Rebased)
=======
>>>>>>> 70fcacc (Featire specs)
=======
>>>>>>> ae409ca (Featire specs)
=======
>>>>>>> 379a979 (Featire specs)
=======
>>>>>>> adc21e0 (Featire specs)
=======
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4d90e3d (Featire specs)
=======
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 160fb15 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4d90e3d (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 160fb15 (Fix)
>>>>>>> 67ab5299 (Fix)
<<<<<<< HEAD
=======
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 7a08014b (Featire specs)
=======
>>>>>>> e6fc67c7 (Featire specs)
>>>>>>> c8da2e3 (Fix)
=======
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
>>>>>>> c51bf93 (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
>>>>>>> b28889f (Fix)
>>>>>>> e18eb87 (Fix)
=======
=======
>>>>>>> df37394 (Featire specs)
>>>>>>> f92a45b (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
          
  562. 
=======
          
  563. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
=======
=======
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
          
  564. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
          
  565. 
=======
          
  566. 
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
          
  567. 
>>>>>>> 94841b5 (Featire specs)
=======
          
  568. 
=======
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
          
  569. 
=======
          
  570. 
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
          
  571. 
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
>>>>>>> 94841b5 (Featire specs)
=======
          
  572. 
>>>>>>> b904d7ae (Featire specs)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
  573. 
>>>>>>> 3b03895 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
          
  574. 
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
          
  575. 
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
          
  576. 
=======
          
  577. 
>>>>>>> 3b03895 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
          
  578. 
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
  579. 
>>>>>>> e54deeb (Featire specs)
=======
          
  580. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
  581. 
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
>>>>>>> 9c0d812 (Featire specs)
=======
          
  582. 
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
          
  583. 
>>>>>>> 34509eee (Featire specs)
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  584. 
=======
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
          
  585. 
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
          
  586. 
=======
          
  587. 
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
  588. 
>>>>>>> 9c0d812 (Featire specs)
=======
          
  589. 
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
=======
          
  590. 
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
=======
          
  591. 
=======
=======
>>>>>>> 610b6138 (Featire specs)
<<<<<<< HEAD
=======
=======
>>>>>>> 009401d (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> c8da2e3 (Fix)
>>>>>>> fdab719f (Fix)
=======
>>>>>>> c51bf93 (Featire specs)
>>>>>>> 7a08014b (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
>>>>>>> efd6af09 (Featire specs)
          
  592. 
=======
          
  593. 
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
  594. 
>>>>>>> 9c0d812 (Featire specs)
=======
          
  595. 
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
          
  596. 
=======
          
  597. 
>>>>>>> 9c0d812 (Featire specs)
=======
          
  598. 
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> 5506bd0 (Featire specs)
=======
          
  599. 
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  600. 
=======
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
          
  601. 
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1d59aaa (Fix)
          
  602. 
=======
          
  603. 
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
          
  604. 
>>>>>>> 94841b5 (Featire specs)
=======
          
  605. 
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
  606. 
>>>>>>> 3b03895 (Featire specs)
=======
          
  607. 
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
  608. 
>>>>>>> e54deeb (Featire specs)
=======
          
  609. 
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
  610. 
>>>>>>> 9c0d812 (Featire specs)
=======
          
  611. 
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
=======
          
  612. 
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
          
  613. 
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 904663c (Featire specs)
          
  614. 
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
          
  615. 
=======
          
  616. 
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
  617. 
>>>>>>> 9c0d812 (Featire specs)
=======
          
  618. 
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
=======
          
  619. 
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ebcdce06 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
>>>>>>> df37394 (Featire specs)
>>>>>>> f92a45b (Featire specs)
>>>>>>> e6fc67c7 (Featire specs)
          
  620. 
=======
          
  621. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  622. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  623. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 84003439 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
=======
>>>>>>> afa56d1 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0f24a043 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
>>>>>>> afa56d1 (Featire specs)
>>>>>>> e1ecabbe (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9bfbd88 (Featire specs)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 610b6138 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
<<<<<<< HEAD
=======
>>>>>>> c51bf93 (Featire specs)
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> c51bf93 (Featire specs)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
>>>>>>> 74240509 (Fix book_spec decrease quantity and price)
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 9bfbd88 (Featire specs)
<<<<<<< HEAD
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 6da9530 (Featire specs)
=======
=======
          
  624. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> 21873de0 (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bb5c652 (Fix book_spec decrease quantity and price)
=======
=======
          
  625. 
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> 9a49b7b (Rebased)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
          
  626. 
>>>>>>> c033601 (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 7b22ad7e (Featire specs)
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 7b22ad7e (Featire specs)
=======
>>>>>>> b97bb382 (Featire specs)
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
=======
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> 973ba8c (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bf05825 (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
>>>>>>> c12b71de (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
>>>>>>> 3cf8dd4 (Featire specs)
>>>>>>> aa4361fd (Featire specs)
          
  627. 
=======
          
  628. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 7b22ad7e (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ae07231a (Featire specs)
=======
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
=======
=======
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
>>>>>>> 3cf8dd4 (Featire specs)
>>>>>>> aa4361fd (Featire specs)
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 70fcacc (Featire specs)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 009401d (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
          
  629. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c12b71de (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> c12b71de (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
>>>>>>> ae409ca (Featire specs)
=======
>>>>>>> c8da2e3 (Fix)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
=======
=======
          
  630. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
>>>>>>> 379a979 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
>>>>>>> adc21e0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 9440753 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
=======
          
  631. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
=======
=======
          
  632. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4d90e3d (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e18eb87 (Fix)
=======
=======
          
  633. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  634. 
>>>>>>> a5d032d (Fix)
>>>>>>> 160fb15 (Fix)
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 557c1b8 (Fix)
=======
          
  635. 
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
  636. 
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> ae884b47 (Fix)
=======
=======
=======
=======
=======
          
  637. 
>>>>>>> a5d032d (Fix)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
  638. 
>>>>>>> a5d032d (Fix)
>>>>>>> e3e66f3 (Featire specs)
=======
          
  639. 
=======
          
  640. 
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376a (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
  641. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0ea (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
  642. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888bf (Featire specs)
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
  643. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 74240509 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
  644. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
=======
          
  645. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a1a479e2 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
  646. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 393eff3b (Featire specs)
=======
=======
=======
=======
          
  647. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  648. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
>>>>>>> d9d85ca6 (Fix)
=======
          
  649. 
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 9bfbd88 (Featire specs)
>>>>>>> ebcdce06 (Featire specs)
=======
>>>>>>> adc21e0 (Featire specs)
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> 6b6d1c2d (Featire specs)
>>>>>>> adc21e0 (Featire specs)
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 9440753 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
  650. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
  651. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4d90e3d (Featire specs)
<<<<<<< HEAD
>>>>>>> 37e48018 (Featire specs)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
  652. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  653. 
>>>>>>> a5d032d (Fix)
>>>>>>> 160fb15 (Fix)
<<<<<<< HEAD
>>>>>>> 31d15e66 (Fix)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 557c1b8 (Fix)
=======
          
  654. 
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> fdab719f (Fix)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
  655. 
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> 8288136d (Fix)
=======
=======
=======
=======
=======
          
  656. 
>>>>>>> a5d032d (Fix)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
  657. 
>>>>>>> a5d032d (Fix)
>>>>>>> e3e66f3 (Featire specs)
=======
          
  658. 
=======
          
  659. 
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> d52f9efe (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
  660. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
  661. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> c12b71de (Featire specs)
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
  662. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
  663. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
=======
          
  664. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
  665. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b904d7ae (Featire specs)
=======
=======
=======
=======
          
  666. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  667. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
>>>>>>> ef483b6d (Fix)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 15c51b7 (Featire specs)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  668. 
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
  669. 
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 0c57e4e (Fix)
<<<<<<< HEAD
>>>>>>> 8887ba5b (Fix)
=======
=======
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
          
  670. 
=======
          
  671. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5e31aeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 53db2224 (Featire specs)
=======
=======
=======
=======
=======
          
  672. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
=======
=======
          
  673. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
=======
=======
=======
          
  674. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0f24a043 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
=======
          
  675. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
=======
=======
=======
          
  676. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> b8c2784f (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
=======
          
  677. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 392646b5 (Featire specs)
=======
=======
=======
=======
=======
          
  678. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
  679. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            1
            

            

                    render json: {
          
    680. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  680. 
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> c51bf93 (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> bf05825 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> c51bf93 (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> bf05825 (Featire specs)
=======
>>>>>>> f92a45b (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0c57e4e (Fix)
=======
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 973ba8c (Featire specs)
=======
>>>>>>> 8181d13 (Featire specs)
=======
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 72b9cab (Featire specs)
=======
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 15c51b7 (Featire specs)
=======
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9e081dc (Fix)
=======
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
          
  681. 
>>>>>>> 2a25e4c (Featire specs)
>>>>>>> 216fe41 (Featire specs)
=======
          
  682. 
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
=======
=======
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  683. 
=======
=======
>>>>>>> 9a49b7b (Rebased)
=======
>>>>>>> 70fcacc (Featire specs)
=======
>>>>>>> ae409ca (Featire specs)
=======
>>>>>>> 379a979 (Featire specs)
=======
>>>>>>> adc21e0 (Featire specs)
=======
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4d90e3d (Featire specs)
=======
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 160fb15 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4d90e3d (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 160fb15 (Fix)
>>>>>>> 67ab5299 (Fix)
<<<<<<< HEAD
=======
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 7a08014b (Featire specs)
=======
>>>>>>> e6fc67c7 (Featire specs)
>>>>>>> c8da2e3 (Fix)
=======
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
>>>>>>> c51bf93 (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
>>>>>>> b28889f (Fix)
>>>>>>> e18eb87 (Fix)
=======
=======
>>>>>>> df37394 (Featire specs)
>>>>>>> f92a45b (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
          
  684. 
=======
          
  685. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
=======
=======
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
          
  686. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
          
  687. 
=======
          
  688. 
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
          
  689. 
>>>>>>> 94841b5 (Featire specs)
=======
          
  690. 
=======
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
          
  691. 
=======
          
  692. 
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
          
  693. 
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
>>>>>>> 94841b5 (Featire specs)
=======
          
  694. 
>>>>>>> b904d7ae (Featire specs)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
  695. 
>>>>>>> 3b03895 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
          
  696. 
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
          
  697. 
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
          
  698. 
=======
          
  699. 
>>>>>>> 3b03895 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
          
  700. 
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
  701. 
>>>>>>> e54deeb (Featire specs)
=======
          
  702. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
  703. 
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
>>>>>>> 9c0d812 (Featire specs)
=======
          
  704. 
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
          
  705. 
>>>>>>> 34509eee (Featire specs)
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  706. 
=======
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
          
  707. 
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
          
  708. 
=======
          
  709. 
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
  710. 
>>>>>>> 9c0d812 (Featire specs)
=======
          
  711. 
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
=======
          
  712. 
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
=======
          
  713. 
=======
=======
>>>>>>> 610b6138 (Featire specs)
<<<<<<< HEAD
=======
=======
>>>>>>> 009401d (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> c8da2e3 (Fix)
>>>>>>> fdab719f (Fix)
=======
>>>>>>> c51bf93 (Featire specs)
>>>>>>> 7a08014b (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
>>>>>>> efd6af09 (Featire specs)
          
  714. 
=======
          
  715. 
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
  716. 
>>>>>>> 9c0d812 (Featire specs)
=======
          
  717. 
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
          
  718. 
=======
          
  719. 
>>>>>>> 9c0d812 (Featire specs)
=======
          
  720. 
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> 5506bd0 (Featire specs)
=======
          
  721. 
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  722. 
=======
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
          
  723. 
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1d59aaa (Fix)
          
  724. 
=======
          
  725. 
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
          
  726. 
>>>>>>> 94841b5 (Featire specs)
=======
          
  727. 
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
  728. 
>>>>>>> 3b03895 (Featire specs)
=======
          
  729. 
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
  730. 
>>>>>>> e54deeb (Featire specs)
=======
          
  731. 
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
  732. 
>>>>>>> 9c0d812 (Featire specs)
=======
          
  733. 
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
=======
          
  734. 
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
          
  735. 
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 904663c (Featire specs)
          
  736. 
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
          
  737. 
=======
          
  738. 
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
  739. 
>>>>>>> 9c0d812 (Featire specs)
=======
          
  740. 
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
=======
          
  741. 
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ebcdce06 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
>>>>>>> df37394 (Featire specs)
>>>>>>> f92a45b (Featire specs)
>>>>>>> e6fc67c7 (Featire specs)
          
  742. 
=======
          
  743. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  744. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  745. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 84003439 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
=======
>>>>>>> afa56d1 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0f24a043 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
>>>>>>> afa56d1 (Featire specs)
>>>>>>> e1ecabbe (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9bfbd88 (Featire specs)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 610b6138 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
<<<<<<< HEAD
=======
>>>>>>> c51bf93 (Featire specs)
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> c51bf93 (Featire specs)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
>>>>>>> 74240509 (Fix book_spec decrease quantity and price)
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 9bfbd88 (Featire specs)
<<<<<<< HEAD
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 6da9530 (Featire specs)
=======
=======
          
  746. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> 21873de0 (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bb5c652 (Fix book_spec decrease quantity and price)
=======
=======
          
  747. 
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> 9a49b7b (Rebased)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
          
  748. 
>>>>>>> c033601 (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 7b22ad7e (Featire specs)
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 7b22ad7e (Featire specs)
=======
>>>>>>> b97bb382 (Featire specs)
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
=======
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> 973ba8c (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bf05825 (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
>>>>>>> c12b71de (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
>>>>>>> 3cf8dd4 (Featire specs)
>>>>>>> aa4361fd (Featire specs)
          
  749. 
=======
          
  750. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 7b22ad7e (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ae07231a (Featire specs)
=======
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
=======
=======
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
>>>>>>> 3cf8dd4 (Featire specs)
>>>>>>> aa4361fd (Featire specs)
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 70fcacc (Featire specs)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 009401d (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
          
  751. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c12b71de (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> c12b71de (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
>>>>>>> ae409ca (Featire specs)
=======
>>>>>>> c8da2e3 (Fix)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
=======
=======
          
  752. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
>>>>>>> 379a979 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
>>>>>>> adc21e0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 9440753 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
=======
          
  753. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
=======
=======
          
  754. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4d90e3d (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e18eb87 (Fix)
=======
=======
          
  755. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  756. 
>>>>>>> a5d032d (Fix)
>>>>>>> 160fb15 (Fix)
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 557c1b8 (Fix)
=======
          
  757. 
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
  758. 
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> ae884b47 (Fix)
=======
=======
=======
=======
=======
          
  759. 
>>>>>>> a5d032d (Fix)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
  760. 
>>>>>>> a5d032d (Fix)
>>>>>>> e3e66f3 (Featire specs)
=======
          
  761. 
=======
          
  762. 
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376a (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
  763. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0ea (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
  764. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888bf (Featire specs)
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
  765. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 74240509 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
  766. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
=======
          
  767. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a1a479e2 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
  768. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 393eff3b (Featire specs)
=======
=======
=======
=======
          
  769. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  770. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
>>>>>>> d9d85ca6 (Fix)
=======
          
  771. 
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 9bfbd88 (Featire specs)
>>>>>>> ebcdce06 (Featire specs)
=======
>>>>>>> adc21e0 (Featire specs)
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> 6b6d1c2d (Featire specs)
>>>>>>> adc21e0 (Featire specs)
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 9440753 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
  772. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
  773. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4d90e3d (Featire specs)
<<<<<<< HEAD
>>>>>>> 37e48018 (Featire specs)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
  774. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  775. 
>>>>>>> a5d032d (Fix)
>>>>>>> 160fb15 (Fix)
<<<<<<< HEAD
>>>>>>> 31d15e66 (Fix)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 557c1b8 (Fix)
=======
          
  776. 
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> fdab719f (Fix)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
  777. 
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> 8288136d (Fix)
=======
=======
=======
=======
=======
          
  778. 
>>>>>>> a5d032d (Fix)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
  779. 
>>>>>>> a5d032d (Fix)
>>>>>>> e3e66f3 (Featire specs)
=======
          
  780. 
=======
          
  781. 
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> d52f9efe (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
  782. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
  783. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> c12b71de (Featire specs)
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
  784. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
  785. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
=======
          
  786. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
  787. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b904d7ae (Featire specs)
=======
=======
=======
=======
          
  788. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  789. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
>>>>>>> ef483b6d (Fix)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 15c51b7 (Featire specs)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  790. 
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
  791. 
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 0c57e4e (Fix)
<<<<<<< HEAD
>>>>>>> 8887ba5b (Fix)
=======
=======
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
          
  792. 
=======
          
  793. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5e31aeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 53db2224 (Featire specs)
=======
=======
=======
=======
=======
          
  794. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
=======
=======
          
  795. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
=======
=======
=======
          
  796. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0f24a043 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
=======
          
  797. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
=======
=======
=======
          
  798. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> b8c2784f (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
=======
          
  799. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 392646b5 (Featire specs)
=======
=======
=======
=======
=======
          
  800. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
  801. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
                      entries: render_to_string(partial: 'books/index/books', formats: [:html]),
=======
                      entries: render_to_string(partial: 'books', formats: [:html]),
>>>>>>> 6da9530 (Featire specs)
=======
                      entries: render_to_string(partial: 'books/index/books', formats: [:html]),
>>>>>>> 9e081dc (Fix)
          
    802. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  802. 
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> c51bf93 (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> bf05825 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> c51bf93 (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> bf05825 (Featire specs)
=======
>>>>>>> f92a45b (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0c57e4e (Fix)
=======
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 973ba8c (Featire specs)
=======
>>>>>>> 8181d13 (Featire specs)
=======
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 72b9cab (Featire specs)
=======
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 15c51b7 (Featire specs)
=======
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9e081dc (Fix)
=======
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
          
  803. 
>>>>>>> 2a25e4c (Featire specs)
>>>>>>> 216fe41 (Featire specs)
=======
          
  804. 
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
=======
=======
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  805. 
=======
=======
>>>>>>> 9a49b7b (Rebased)
=======
>>>>>>> 70fcacc (Featire specs)
=======
>>>>>>> ae409ca (Featire specs)
=======
>>>>>>> 379a979 (Featire specs)
=======
>>>>>>> adc21e0 (Featire specs)
=======
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4d90e3d (Featire specs)
=======
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 160fb15 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4d90e3d (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 160fb15 (Fix)
>>>>>>> 67ab5299 (Fix)
<<<<<<< HEAD
=======
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 7a08014b (Featire specs)
=======
>>>>>>> e6fc67c7 (Featire specs)
>>>>>>> c8da2e3 (Fix)
=======
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
>>>>>>> c51bf93 (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
>>>>>>> b28889f (Fix)
>>>>>>> e18eb87 (Fix)
=======
=======
>>>>>>> df37394 (Featire specs)
>>>>>>> f92a45b (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
          
  806. 
=======
          
  807. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
=======
=======
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
          
  808. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
          
  809. 
=======
          
  810. 
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
          
  811. 
>>>>>>> 94841b5 (Featire specs)
=======
          
  812. 
=======
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
          
  813. 
=======
          
  814. 
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
          
  815. 
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
>>>>>>> 94841b5 (Featire specs)
=======
          
  816. 
>>>>>>> b904d7ae (Featire specs)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
  817. 
>>>>>>> 3b03895 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
          
  818. 
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
          
  819. 
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
          
  820. 
=======
          
  821. 
>>>>>>> 3b03895 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
          
  822. 
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
  823. 
>>>>>>> e54deeb (Featire specs)
=======
          
  824. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
  825. 
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
>>>>>>> 9c0d812 (Featire specs)
=======
          
  826. 
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
          
  827. 
>>>>>>> 34509eee (Featire specs)
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  828. 
=======
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
          
  829. 
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
          
  830. 
=======
          
  831. 
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
  832. 
>>>>>>> 9c0d812 (Featire specs)
=======
          
  833. 
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
=======
          
  834. 
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
=======
          
  835. 
=======
=======
>>>>>>> 610b6138 (Featire specs)
<<<<<<< HEAD
=======
=======
>>>>>>> 009401d (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> c8da2e3 (Fix)
>>>>>>> fdab719f (Fix)
=======
>>>>>>> c51bf93 (Featire specs)
>>>>>>> 7a08014b (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
>>>>>>> efd6af09 (Featire specs)
          
  836. 
=======
          
  837. 
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
  838. 
>>>>>>> 9c0d812 (Featire specs)
=======
          
  839. 
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
          
  840. 
=======
          
  841. 
>>>>>>> 9c0d812 (Featire specs)
=======
          
  842. 
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> 5506bd0 (Featire specs)
=======
          
  843. 
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  844. 
=======
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
          
  845. 
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1d59aaa (Fix)
          
  846. 
=======
          
  847. 
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
          
  848. 
>>>>>>> 94841b5 (Featire specs)
=======
          
  849. 
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
  850. 
>>>>>>> 3b03895 (Featire specs)
=======
          
  851. 
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
  852. 
>>>>>>> e54deeb (Featire specs)
=======
          
  853. 
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
  854. 
>>>>>>> 9c0d812 (Featire specs)
=======
          
  855. 
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
=======
          
  856. 
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
          
  857. 
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 904663c (Featire specs)
          
  858. 
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
          
  859. 
=======
          
  860. 
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
  861. 
>>>>>>> 9c0d812 (Featire specs)
=======
          
  862. 
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
=======
          
  863. 
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ebcdce06 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
>>>>>>> df37394 (Featire specs)
>>>>>>> f92a45b (Featire specs)
>>>>>>> e6fc67c7 (Featire specs)
          
  864. 
=======
          
  865. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  866. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  867. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 84003439 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
=======
>>>>>>> afa56d1 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0f24a043 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
>>>>>>> afa56d1 (Featire specs)
>>>>>>> e1ecabbe (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9bfbd88 (Featire specs)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 610b6138 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
<<<<<<< HEAD
=======
>>>>>>> c51bf93 (Featire specs)
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> c51bf93 (Featire specs)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
>>>>>>> 74240509 (Fix book_spec decrease quantity and price)
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 9bfbd88 (Featire specs)
<<<<<<< HEAD
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 6da9530 (Featire specs)
=======
=======
          
  868. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> 21873de0 (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bb5c652 (Fix book_spec decrease quantity and price)
=======
=======
          
  869. 
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> 9a49b7b (Rebased)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
          
  870. 
>>>>>>> c033601 (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 7b22ad7e (Featire specs)
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 7b22ad7e (Featire specs)
=======
>>>>>>> b97bb382 (Featire specs)
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
=======
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> 973ba8c (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bf05825 (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
>>>>>>> c12b71de (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
>>>>>>> 3cf8dd4 (Featire specs)
>>>>>>> aa4361fd (Featire specs)
          
  871. 
=======
          
  872. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 7b22ad7e (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ae07231a (Featire specs)
=======
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
=======
=======
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
>>>>>>> 3cf8dd4 (Featire specs)
>>>>>>> aa4361fd (Featire specs)
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 70fcacc (Featire specs)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 009401d (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
          
  873. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c12b71de (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> c12b71de (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
>>>>>>> ae409ca (Featire specs)
=======
>>>>>>> c8da2e3 (Fix)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
=======
=======
          
  874. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
>>>>>>> 379a979 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
>>>>>>> adc21e0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 9440753 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
=======
          
  875. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
=======
=======
          
  876. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4d90e3d (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e18eb87 (Fix)
=======
=======
          
  877. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  878. 
>>>>>>> a5d032d (Fix)
>>>>>>> 160fb15 (Fix)
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 557c1b8 (Fix)
=======
          
  879. 
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
  880. 
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> ae884b47 (Fix)
=======
=======
=======
=======
=======
          
  881. 
>>>>>>> a5d032d (Fix)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
  882. 
>>>>>>> a5d032d (Fix)
>>>>>>> e3e66f3 (Featire specs)
=======
          
  883. 
=======
          
  884. 
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376a (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
  885. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0ea (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
  886. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888bf (Featire specs)
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
  887. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 74240509 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
  888. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
=======
          
  889. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a1a479e2 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
  890. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 393eff3b (Featire specs)
=======
=======
=======
=======
          
  891. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  892. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
>>>>>>> d9d85ca6 (Fix)
=======
          
  893. 
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 9bfbd88 (Featire specs)
>>>>>>> ebcdce06 (Featire specs)
=======
>>>>>>> adc21e0 (Featire specs)
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> 6b6d1c2d (Featire specs)
>>>>>>> adc21e0 (Featire specs)
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 9440753 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
  894. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
  895. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4d90e3d (Featire specs)
<<<<<<< HEAD
>>>>>>> 37e48018 (Featire specs)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
  896. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  897. 
>>>>>>> a5d032d (Fix)
>>>>>>> 160fb15 (Fix)
<<<<<<< HEAD
>>>>>>> 31d15e66 (Fix)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 557c1b8 (Fix)
=======
          
  898. 
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> fdab719f (Fix)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
  899. 
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> 8288136d (Fix)
=======
=======
=======
=======
=======
          
  900. 
>>>>>>> a5d032d (Fix)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
  901. 
>>>>>>> a5d032d (Fix)
>>>>>>> e3e66f3 (Featire specs)
=======
          
  902. 
=======
          
  903. 
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> d52f9efe (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
  904. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
  905. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> c12b71de (Featire specs)
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
  906. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
  907. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
=======
          
  908. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
  909. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b904d7ae (Featire specs)
=======
=======
=======
=======
          
  910. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  911. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
>>>>>>> ef483b6d (Fix)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 15c51b7 (Featire specs)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  912. 
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
  913. 
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 0c57e4e (Fix)
<<<<<<< HEAD
>>>>>>> 8887ba5b (Fix)
=======
=======
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
          
  914. 
=======
          
  915. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5e31aeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 53db2224 (Featire specs)
=======
=======
=======
=======
=======
          
  916. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
=======
=======
          
  917. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
=======
=======
=======
          
  918. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0f24a043 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
=======
          
  919. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
=======
=======
=======
          
  920. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> b8c2784f (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
=======
          
  921. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 392646b5 (Featire specs)
=======
=======
=======
=======
=======
          
  922. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
  923. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            
            

            

                      pagination: view_context.will_paginate(@books)
          
    924. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  924. 
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> c51bf93 (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> bf05825 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> c51bf93 (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> bf05825 (Featire specs)
=======
>>>>>>> f92a45b (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0c57e4e (Fix)
=======
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 973ba8c (Featire specs)
=======
>>>>>>> 8181d13 (Featire specs)
=======
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 72b9cab (Featire specs)
=======
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 15c51b7 (Featire specs)
=======
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9e081dc (Fix)
=======
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
          
  925. 
>>>>>>> 2a25e4c (Featire specs)
>>>>>>> 216fe41 (Featire specs)
=======
          
  926. 
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
=======
=======
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  927. 
=======
=======
>>>>>>> 9a49b7b (Rebased)
=======
>>>>>>> 70fcacc (Featire specs)
=======
>>>>>>> ae409ca (Featire specs)
=======
>>>>>>> 379a979 (Featire specs)
=======
>>>>>>> adc21e0 (Featire specs)
=======
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4d90e3d (Featire specs)
=======
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 160fb15 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4d90e3d (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 160fb15 (Fix)
>>>>>>> 67ab5299 (Fix)
<<<<<<< HEAD
=======
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 7a08014b (Featire specs)
=======
>>>>>>> e6fc67c7 (Featire specs)
>>>>>>> c8da2e3 (Fix)
=======
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
>>>>>>> c51bf93 (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
>>>>>>> b28889f (Fix)
>>>>>>> e18eb87 (Fix)
=======
=======
>>>>>>> df37394 (Featire specs)
>>>>>>> f92a45b (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
          
  928. 
=======
          
  929. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
=======
=======
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
          
  930. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
          
  931. 
=======
          
  932. 
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
          
  933. 
>>>>>>> 94841b5 (Featire specs)
=======
          
  934. 
=======
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
          
  935. 
=======
          
  936. 
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
          
  937. 
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
>>>>>>> 94841b5 (Featire specs)
=======
          
  938. 
>>>>>>> b904d7ae (Featire specs)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
  939. 
>>>>>>> 3b03895 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
          
  940. 
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
          
  941. 
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
          
  942. 
=======
          
  943. 
>>>>>>> 3b03895 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
          
  944. 
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
  945. 
>>>>>>> e54deeb (Featire specs)
=======
          
  946. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
  947. 
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
>>>>>>> 9c0d812 (Featire specs)
=======
          
  948. 
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
          
  949. 
>>>>>>> 34509eee (Featire specs)
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  950. 
=======
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
          
  951. 
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
          
  952. 
=======
          
  953. 
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
  954. 
>>>>>>> 9c0d812 (Featire specs)
=======
          
  955. 
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
=======
          
  956. 
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
=======
          
  957. 
=======
=======
>>>>>>> 610b6138 (Featire specs)
<<<<<<< HEAD
=======
=======
>>>>>>> 009401d (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> c8da2e3 (Fix)
>>>>>>> fdab719f (Fix)
=======
>>>>>>> c51bf93 (Featire specs)
>>>>>>> 7a08014b (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
>>>>>>> efd6af09 (Featire specs)
          
  958. 
=======
          
  959. 
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
  960. 
>>>>>>> 9c0d812 (Featire specs)
=======
          
  961. 
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
          
  962. 
=======
          
  963. 
>>>>>>> 9c0d812 (Featire specs)
=======
          
  964. 
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> 5506bd0 (Featire specs)
=======
          
  965. 
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  966. 
=======
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
          
  967. 
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1d59aaa (Fix)
          
  968. 
=======
          
  969. 
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
          
  970. 
>>>>>>> 94841b5 (Featire specs)
=======
          
  971. 
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
  972. 
>>>>>>> 3b03895 (Featire specs)
=======
          
  973. 
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
  974. 
>>>>>>> e54deeb (Featire specs)
=======
          
  975. 
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
  976. 
>>>>>>> 9c0d812 (Featire specs)
=======
          
  977. 
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
=======
          
  978. 
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
          
  979. 
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 904663c (Featire specs)
          
  980. 
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
          
  981. 
=======
          
  982. 
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
  983. 
>>>>>>> 9c0d812 (Featire specs)
=======
          
  984. 
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
=======
          
  985. 
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ebcdce06 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
>>>>>>> df37394 (Featire specs)
>>>>>>> f92a45b (Featire specs)
>>>>>>> e6fc67c7 (Featire specs)
          
  986. 
=======
          
  987. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  988. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  989. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 84003439 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
=======
>>>>>>> afa56d1 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0f24a043 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
>>>>>>> afa56d1 (Featire specs)
>>>>>>> e1ecabbe (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9bfbd88 (Featire specs)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 610b6138 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
<<<<<<< HEAD
=======
>>>>>>> c51bf93 (Featire specs)
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> c51bf93 (Featire specs)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
>>>>>>> 74240509 (Fix book_spec decrease quantity and price)
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 9bfbd88 (Featire specs)
<<<<<<< HEAD
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 6da9530 (Featire specs)
=======
=======
          
  990. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> 21873de0 (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bb5c652 (Fix book_spec decrease quantity and price)
=======
=======
          
  991. 
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> 9a49b7b (Rebased)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
          
  992. 
>>>>>>> c033601 (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 7b22ad7e (Featire specs)
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 7b22ad7e (Featire specs)
=======
>>>>>>> b97bb382 (Featire specs)
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
=======
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> 973ba8c (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bf05825 (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
>>>>>>> c12b71de (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
>>>>>>> 3cf8dd4 (Featire specs)
>>>>>>> aa4361fd (Featire specs)
          
  993. 
=======
          
  994. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 7b22ad7e (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ae07231a (Featire specs)
=======
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
=======
=======
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
>>>>>>> 3cf8dd4 (Featire specs)
>>>>>>> aa4361fd (Featire specs)
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 70fcacc (Featire specs)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 009401d (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
          
  995. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c12b71de (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> c12b71de (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
>>>>>>> ae409ca (Featire specs)
=======
>>>>>>> c8da2e3 (Fix)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
=======
=======
          
  996. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
>>>>>>> 379a979 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
>>>>>>> adc21e0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 9440753 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
=======
          
  997. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
=======
=======
          
  998. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4d90e3d (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e18eb87 (Fix)
=======
=======
          
  999. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  1000. 
>>>>>>> a5d032d (Fix)
>>>>>>> 160fb15 (Fix)
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 557c1b8 (Fix)
=======
          
  1001. 
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
  1002. 
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> ae884b47 (Fix)
=======
=======
=======
=======
=======
          
  1003. 
>>>>>>> a5d032d (Fix)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
  1004. 
>>>>>>> a5d032d (Fix)
>>>>>>> e3e66f3 (Featire specs)
=======
          
  1005. 
=======
          
  1006. 
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376a (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
  1007. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0ea (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
  1008. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888bf (Featire specs)
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
  1009. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 74240509 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
  1010. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
=======
          
  1011. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a1a479e2 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
  1012. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 393eff3b (Featire specs)
=======
=======
=======
=======
          
  1013. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  1014. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
>>>>>>> d9d85ca6 (Fix)
=======
          
  1015. 
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 9bfbd88 (Featire specs)
>>>>>>> ebcdce06 (Featire specs)
=======
>>>>>>> adc21e0 (Featire specs)
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> 6b6d1c2d (Featire specs)
>>>>>>> adc21e0 (Featire specs)
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 9440753 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
  1016. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
  1017. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4d90e3d (Featire specs)
<<<<<<< HEAD
>>>>>>> 37e48018 (Featire specs)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
  1018. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  1019. 
>>>>>>> a5d032d (Fix)
>>>>>>> 160fb15 (Fix)
<<<<<<< HEAD
>>>>>>> 31d15e66 (Fix)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 557c1b8 (Fix)
=======
          
  1020. 
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> fdab719f (Fix)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
  1021. 
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> 8288136d (Fix)
=======
=======
=======
=======
=======
          
  1022. 
>>>>>>> a5d032d (Fix)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
  1023. 
>>>>>>> a5d032d (Fix)
>>>>>>> e3e66f3 (Featire specs)
=======
          
  1024. 
=======
          
  1025. 
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> d52f9efe (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
  1026. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
  1027. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> c12b71de (Featire specs)
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
  1028. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
  1029. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
=======
          
  1030. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
  1031. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b904d7ae (Featire specs)
=======
=======
=======
=======
          
  1032. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  1033. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
>>>>>>> ef483b6d (Fix)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 15c51b7 (Featire specs)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  1034. 
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
  1035. 
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 0c57e4e (Fix)
<<<<<<< HEAD
>>>>>>> 8887ba5b (Fix)
=======
=======
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
          
  1036. 
=======
          
  1037. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5e31aeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 53db2224 (Featire specs)
=======
=======
=======
=======
=======
          
  1038. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
=======
=======
          
  1039. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
=======
=======
=======
          
  1040. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0f24a043 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
=======
          
  1041. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
=======
=======
=======
          
  1042. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> b8c2784f (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
=======
          
  1043. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 392646b5 (Featire specs)
=======
=======
=======
=======
=======
          
  1044. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
  1045. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            
            

            

                    }
          
    1046. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  1046. 
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> c51bf93 (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> bf05825 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> c51bf93 (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> bf05825 (Featire specs)
=======
>>>>>>> f92a45b (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0c57e4e (Fix)
=======
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 973ba8c (Featire specs)
=======
>>>>>>> 8181d13 (Featire specs)
=======
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 72b9cab (Featire specs)
=======
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 15c51b7 (Featire specs)
=======
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9e081dc (Fix)
=======
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
          
  1047. 
>>>>>>> 2a25e4c (Featire specs)
>>>>>>> 216fe41 (Featire specs)
=======
          
  1048. 
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
=======
=======
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  1049. 
=======
=======
>>>>>>> 9a49b7b (Rebased)
=======
>>>>>>> 70fcacc (Featire specs)
=======
>>>>>>> ae409ca (Featire specs)
=======
>>>>>>> 379a979 (Featire specs)
=======
>>>>>>> adc21e0 (Featire specs)
=======
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4d90e3d (Featire specs)
=======
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 160fb15 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4d90e3d (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 160fb15 (Fix)
>>>>>>> 67ab5299 (Fix)
<<<<<<< HEAD
=======
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 7a08014b (Featire specs)
=======
>>>>>>> e6fc67c7 (Featire specs)
>>>>>>> c8da2e3 (Fix)
=======
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
>>>>>>> c51bf93 (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
>>>>>>> b28889f (Fix)
>>>>>>> e18eb87 (Fix)
=======
=======
>>>>>>> df37394 (Featire specs)
>>>>>>> f92a45b (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
          
  1050. 
=======
          
  1051. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
=======
=======
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
          
  1052. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
          
  1053. 
=======
          
  1054. 
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
          
  1055. 
>>>>>>> 94841b5 (Featire specs)
=======
          
  1056. 
=======
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
          
  1057. 
=======
          
  1058. 
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
          
  1059. 
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
>>>>>>> 94841b5 (Featire specs)
=======
          
  1060. 
>>>>>>> b904d7ae (Featire specs)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
  1061. 
>>>>>>> 3b03895 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
          
  1062. 
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
          
  1063. 
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
          
  1064. 
=======
          
  1065. 
>>>>>>> 3b03895 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
          
  1066. 
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
  1067. 
>>>>>>> e54deeb (Featire specs)
=======
          
  1068. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
  1069. 
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
>>>>>>> 9c0d812 (Featire specs)
=======
          
  1070. 
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
          
  1071. 
>>>>>>> 34509eee (Featire specs)
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  1072. 
=======
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
          
  1073. 
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
          
  1074. 
=======
          
  1075. 
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
  1076. 
>>>>>>> 9c0d812 (Featire specs)
=======
          
  1077. 
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
=======
          
  1078. 
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
=======
          
  1079. 
=======
=======
>>>>>>> 610b6138 (Featire specs)
<<<<<<< HEAD
=======
=======
>>>>>>> 009401d (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> c8da2e3 (Fix)
>>>>>>> fdab719f (Fix)
=======
>>>>>>> c51bf93 (Featire specs)
>>>>>>> 7a08014b (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
>>>>>>> efd6af09 (Featire specs)
          
  1080. 
=======
          
  1081. 
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
  1082. 
>>>>>>> 9c0d812 (Featire specs)
=======
          
  1083. 
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
          
  1084. 
=======
          
  1085. 
>>>>>>> 9c0d812 (Featire specs)
=======
          
  1086. 
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> 5506bd0 (Featire specs)
=======
          
  1087. 
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  1088. 
=======
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
          
  1089. 
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1d59aaa (Fix)
          
  1090. 
=======
          
  1091. 
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
          
  1092. 
>>>>>>> 94841b5 (Featire specs)
=======
          
  1093. 
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
  1094. 
>>>>>>> 3b03895 (Featire specs)
=======
          
  1095. 
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
  1096. 
>>>>>>> e54deeb (Featire specs)
=======
          
  1097. 
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
  1098. 
>>>>>>> 9c0d812 (Featire specs)
=======
          
  1099. 
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
=======
          
  1100. 
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
          
  1101. 
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 904663c (Featire specs)
          
  1102. 
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
          
  1103. 
=======
          
  1104. 
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
  1105. 
>>>>>>> 9c0d812 (Featire specs)
=======
          
  1106. 
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
=======
          
  1107. 
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ebcdce06 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
>>>>>>> df37394 (Featire specs)
>>>>>>> f92a45b (Featire specs)
>>>>>>> e6fc67c7 (Featire specs)
          
  1108. 
=======
          
  1109. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  1110. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  1111. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 84003439 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
=======
>>>>>>> afa56d1 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0f24a043 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
>>>>>>> afa56d1 (Featire specs)
>>>>>>> e1ecabbe (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9bfbd88 (Featire specs)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 610b6138 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
<<<<<<< HEAD
=======
>>>>>>> c51bf93 (Featire specs)
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> c51bf93 (Featire specs)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
>>>>>>> 74240509 (Fix book_spec decrease quantity and price)
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 9bfbd88 (Featire specs)
<<<<<<< HEAD
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 6da9530 (Featire specs)
=======
=======
          
  1112. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> 21873de0 (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bb5c652 (Fix book_spec decrease quantity and price)
=======
=======
          
  1113. 
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> 9a49b7b (Rebased)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
          
  1114. 
>>>>>>> c033601 (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 7b22ad7e (Featire specs)
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 7b22ad7e (Featire specs)
=======
>>>>>>> b97bb382 (Featire specs)
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
=======
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> 973ba8c (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bf05825 (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
>>>>>>> c12b71de (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
>>>>>>> 3cf8dd4 (Featire specs)
>>>>>>> aa4361fd (Featire specs)
          
  1115. 
=======
          
  1116. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 7b22ad7e (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ae07231a (Featire specs)
=======
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
=======
=======
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
>>>>>>> 3cf8dd4 (Featire specs)
>>>>>>> aa4361fd (Featire specs)
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 70fcacc (Featire specs)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 009401d (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
          
  1117. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c12b71de (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> c12b71de (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
>>>>>>> ae409ca (Featire specs)
=======
>>>>>>> c8da2e3 (Fix)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
=======
=======
          
  1118. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
>>>>>>> 379a979 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
>>>>>>> adc21e0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 9440753 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
=======
          
  1119. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
=======
=======
          
  1120. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4d90e3d (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e18eb87 (Fix)
=======
=======
          
  1121. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  1122. 
>>>>>>> a5d032d (Fix)
>>>>>>> 160fb15 (Fix)
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 557c1b8 (Fix)
=======
          
  1123. 
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
  1124. 
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> ae884b47 (Fix)
=======
=======
=======
=======
=======
          
  1125. 
>>>>>>> a5d032d (Fix)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
  1126. 
>>>>>>> a5d032d (Fix)
>>>>>>> e3e66f3 (Featire specs)
=======
          
  1127. 
=======
          
  1128. 
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376a (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
  1129. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0ea (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
  1130. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888bf (Featire specs)
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
  1131. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 74240509 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
  1132. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
=======
          
  1133. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a1a479e2 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
  1134. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 393eff3b (Featire specs)
=======
=======
=======
=======
          
  1135. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  1136. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
>>>>>>> d9d85ca6 (Fix)
=======
          
  1137. 
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 9bfbd88 (Featire specs)
>>>>>>> ebcdce06 (Featire specs)
=======
>>>>>>> adc21e0 (Featire specs)
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> 6b6d1c2d (Featire specs)
>>>>>>> adc21e0 (Featire specs)
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 9440753 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
  1138. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
  1139. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4d90e3d (Featire specs)
<<<<<<< HEAD
>>>>>>> 37e48018 (Featire specs)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
  1140. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  1141. 
>>>>>>> a5d032d (Fix)
>>>>>>> 160fb15 (Fix)
<<<<<<< HEAD
>>>>>>> 31d15e66 (Fix)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 557c1b8 (Fix)
=======
          
  1142. 
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> fdab719f (Fix)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
  1143. 
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> 8288136d (Fix)
=======
=======
=======
=======
=======
          
  1144. 
>>>>>>> a5d032d (Fix)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
  1145. 
>>>>>>> a5d032d (Fix)
>>>>>>> e3e66f3 (Featire specs)
=======
          
  1146. 
=======
          
  1147. 
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> d52f9efe (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
  1148. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
  1149. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> c12b71de (Featire specs)
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
  1150. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
  1151. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
=======
          
  1152. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
  1153. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b904d7ae (Featire specs)
=======
=======
=======
=======
          
  1154. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  1155. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
>>>>>>> ef483b6d (Fix)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 15c51b7 (Featire specs)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  1156. 
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
  1157. 
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 0c57e4e (Fix)
<<<<<<< HEAD
>>>>>>> 8887ba5b (Fix)
=======
=======
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
          
  1158. 
=======
          
  1159. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5e31aeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 53db2224 (Featire specs)
=======
=======
=======
=======
=======
          
  1160. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
=======
=======
          
  1161. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
=======
=======
=======
          
  1162. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0f24a043 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
=======
          
  1163. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
=======
=======
=======
          
  1164. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> b8c2784f (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
=======
          
  1165. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 392646b5 (Featire specs)
=======
=======
=======
=======
=======
          
  1166. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
  1167. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            
            

            

                  end
          
    1168. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  1168. 
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> c51bf93 (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> bf05825 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> c51bf93 (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> bf05825 (Featire specs)
=======
>>>>>>> f92a45b (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0c57e4e (Fix)
=======
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 973ba8c (Featire specs)
=======
>>>>>>> 8181d13 (Featire specs)
=======
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 72b9cab (Featire specs)
=======
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 15c51b7 (Featire specs)
=======
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9e081dc (Fix)
=======
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
          
  1169. 
>>>>>>> 2a25e4c (Featire specs)
>>>>>>> 216fe41 (Featire specs)
=======
          
  1170. 
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
=======
=======
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  1171. 
=======
=======
>>>>>>> 9a49b7b (Rebased)
=======
>>>>>>> 70fcacc (Featire specs)
=======
>>>>>>> ae409ca (Featire specs)
=======
>>>>>>> 379a979 (Featire specs)
=======
>>>>>>> adc21e0 (Featire specs)
=======
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4d90e3d (Featire specs)
=======
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 160fb15 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4d90e3d (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 160fb15 (Fix)
>>>>>>> 67ab5299 (Fix)
<<<<<<< HEAD
=======
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 7a08014b (Featire specs)
=======
>>>>>>> e6fc67c7 (Featire specs)
>>>>>>> c8da2e3 (Fix)
=======
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
>>>>>>> c51bf93 (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
>>>>>>> b28889f (Fix)
>>>>>>> e18eb87 (Fix)
=======
=======
>>>>>>> df37394 (Featire specs)
>>>>>>> f92a45b (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
          
  1172. 
=======
          
  1173. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
=======
=======
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
          
  1174. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
          
  1175. 
=======
          
  1176. 
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
          
  1177. 
>>>>>>> 94841b5 (Featire specs)
=======
          
  1178. 
=======
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
          
  1179. 
=======
          
  1180. 
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
          
  1181. 
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
>>>>>>> 94841b5 (Featire specs)
=======
          
  1182. 
>>>>>>> b904d7ae (Featire specs)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
  1183. 
>>>>>>> 3b03895 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
          
  1184. 
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
          
  1185. 
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
          
  1186. 
=======
          
  1187. 
>>>>>>> 3b03895 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
          
  1188. 
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
  1189. 
>>>>>>> e54deeb (Featire specs)
=======
          
  1190. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
  1191. 
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
>>>>>>> 9c0d812 (Featire specs)
=======
          
  1192. 
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
          
  1193. 
>>>>>>> 34509eee (Featire specs)
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  1194. 
=======
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
          
  1195. 
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
          
  1196. 
=======
          
  1197. 
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
  1198. 
>>>>>>> 9c0d812 (Featire specs)
=======
          
  1199. 
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
=======
          
  1200. 
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
=======
          
  1201. 
=======
=======
>>>>>>> 610b6138 (Featire specs)
<<<<<<< HEAD
=======
=======
>>>>>>> 009401d (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> c8da2e3 (Fix)
>>>>>>> fdab719f (Fix)
=======
>>>>>>> c51bf93 (Featire specs)
>>>>>>> 7a08014b (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
>>>>>>> efd6af09 (Featire specs)
          
  1202. 
=======
          
  1203. 
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
  1204. 
>>>>>>> 9c0d812 (Featire specs)
=======
          
  1205. 
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
          
  1206. 
=======
          
  1207. 
>>>>>>> 9c0d812 (Featire specs)
=======
          
  1208. 
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> 5506bd0 (Featire specs)
=======
          
  1209. 
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  1210. 
=======
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
          
  1211. 
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1d59aaa (Fix)
          
  1212. 
=======
          
  1213. 
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
          
  1214. 
>>>>>>> 94841b5 (Featire specs)
=======
          
  1215. 
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
  1216. 
>>>>>>> 3b03895 (Featire specs)
=======
          
  1217. 
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
  1218. 
>>>>>>> e54deeb (Featire specs)
=======
          
  1219. 
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
  1220. 
>>>>>>> 9c0d812 (Featire specs)
=======
          
  1221. 
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
=======
          
  1222. 
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
          
  1223. 
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 904663c (Featire specs)
          
  1224. 
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
          
  1225. 
=======
          
  1226. 
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
  1227. 
>>>>>>> 9c0d812 (Featire specs)
=======
          
  1228. 
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
=======
          
  1229. 
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ebcdce06 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
>>>>>>> df37394 (Featire specs)
>>>>>>> f92a45b (Featire specs)
>>>>>>> e6fc67c7 (Featire specs)
          
  1230. 
=======
          
  1231. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  1232. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  1233. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 84003439 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
=======
>>>>>>> afa56d1 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0f24a043 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
>>>>>>> afa56d1 (Featire specs)
>>>>>>> e1ecabbe (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9bfbd88 (Featire specs)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 610b6138 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
<<<<<<< HEAD
=======
>>>>>>> c51bf93 (Featire specs)
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> c51bf93 (Featire specs)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
>>>>>>> 74240509 (Fix book_spec decrease quantity and price)
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 9bfbd88 (Featire specs)
<<<<<<< HEAD
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 6da9530 (Featire specs)
=======
=======
          
  1234. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> 21873de0 (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bb5c652 (Fix book_spec decrease quantity and price)
=======
=======
          
  1235. 
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> 9a49b7b (Rebased)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
          
  1236. 
>>>>>>> c033601 (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 7b22ad7e (Featire specs)
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 7b22ad7e (Featire specs)
=======
>>>>>>> b97bb382 (Featire specs)
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
=======
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> 973ba8c (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bf05825 (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
>>>>>>> c12b71de (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
>>>>>>> 3cf8dd4 (Featire specs)
>>>>>>> aa4361fd (Featire specs)
          
  1237. 
=======
          
  1238. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 7b22ad7e (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ae07231a (Featire specs)
=======
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
=======
=======
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
>>>>>>> 3cf8dd4 (Featire specs)
>>>>>>> aa4361fd (Featire specs)
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 70fcacc (Featire specs)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 009401d (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
          
  1239. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c12b71de (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> c12b71de (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
>>>>>>> ae409ca (Featire specs)
=======
>>>>>>> c8da2e3 (Fix)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
=======
=======
          
  1240. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
>>>>>>> 379a979 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
>>>>>>> adc21e0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 9440753 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
=======
          
  1241. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
=======
=======
          
  1242. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4d90e3d (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e18eb87 (Fix)
=======
=======
          
  1243. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  1244. 
>>>>>>> a5d032d (Fix)
>>>>>>> 160fb15 (Fix)
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 557c1b8 (Fix)
=======
          
  1245. 
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
  1246. 
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> ae884b47 (Fix)
=======
=======
=======
=======
=======
          
  1247. 
>>>>>>> a5d032d (Fix)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
  1248. 
>>>>>>> a5d032d (Fix)
>>>>>>> e3e66f3 (Featire specs)
=======
          
  1249. 
=======
          
  1250. 
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376a (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
  1251. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0ea (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
  1252. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888bf (Featire specs)
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
  1253. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 74240509 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
  1254. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
=======
          
  1255. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a1a479e2 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
  1256. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 393eff3b (Featire specs)
=======
=======
=======
=======
          
  1257. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  1258. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
>>>>>>> d9d85ca6 (Fix)
=======
          
  1259. 
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 9bfbd88 (Featire specs)
>>>>>>> ebcdce06 (Featire specs)
=======
>>>>>>> adc21e0 (Featire specs)
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> 6b6d1c2d (Featire specs)
>>>>>>> adc21e0 (Featire specs)
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 9440753 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
  1260. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
  1261. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4d90e3d (Featire specs)
<<<<<<< HEAD
>>>>>>> 37e48018 (Featire specs)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
  1262. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  1263. 
>>>>>>> a5d032d (Fix)
>>>>>>> 160fb15 (Fix)
<<<<<<< HEAD
>>>>>>> 31d15e66 (Fix)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 557c1b8 (Fix)
=======
          
  1264. 
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> fdab719f (Fix)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
  1265. 
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> 8288136d (Fix)
=======
=======
=======
=======
=======
          
  1266. 
>>>>>>> a5d032d (Fix)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
  1267. 
>>>>>>> a5d032d (Fix)
>>>>>>> e3e66f3 (Featire specs)
=======
          
  1268. 
=======
          
  1269. 
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> d52f9efe (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
  1270. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
  1271. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> c12b71de (Featire specs)
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
  1272. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
  1273. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
=======
          
  1274. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
  1275. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b904d7ae (Featire specs)
=======
=======
=======
=======
          
  1276. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  1277. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
>>>>>>> ef483b6d (Fix)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 15c51b7 (Featire specs)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  1278. 
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
  1279. 
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 0c57e4e (Fix)
<<<<<<< HEAD
>>>>>>> 8887ba5b (Fix)
=======
=======
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
          
  1280. 
=======
          
  1281. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5e31aeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 53db2224 (Featire specs)
=======
=======
=======
=======
=======
          
  1282. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
=======
=======
          
  1283. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
=======
=======
=======
          
  1284. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0f24a043 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
=======
          
  1285. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
=======
=======
=======
          
  1286. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> b8c2784f (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
=======
          
  1287. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 392646b5 (Featire specs)
=======
=======
=======
=======
=======
          
  1288. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
  1289. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            
            

            

                end
          
    1290. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  1290. 
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> c51bf93 (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> bf05825 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> c51bf93 (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> bf05825 (Featire specs)
=======
>>>>>>> f92a45b (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0c57e4e (Fix)
=======
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 973ba8c (Featire specs)
=======
>>>>>>> 8181d13 (Featire specs)
=======
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 72b9cab (Featire specs)
=======
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 15c51b7 (Featire specs)
=======
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9e081dc (Fix)
=======
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
          
  1291. 
>>>>>>> 2a25e4c (Featire specs)
>>>>>>> 216fe41 (Featire specs)
=======
          
  1292. 
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
=======
=======
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  1293. 
=======
=======
>>>>>>> 9a49b7b (Rebased)
=======
>>>>>>> 70fcacc (Featire specs)
=======
>>>>>>> ae409ca (Featire specs)
=======
>>>>>>> 379a979 (Featire specs)
=======
>>>>>>> adc21e0 (Featire specs)
=======
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4d90e3d (Featire specs)
=======
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 160fb15 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4d90e3d (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 160fb15 (Fix)
>>>>>>> 67ab5299 (Fix)
<<<<<<< HEAD
=======
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 7a08014b (Featire specs)
=======
>>>>>>> e6fc67c7 (Featire specs)
>>>>>>> c8da2e3 (Fix)
=======
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
>>>>>>> c51bf93 (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
>>>>>>> b28889f (Fix)
>>>>>>> e18eb87 (Fix)
=======
=======
>>>>>>> df37394 (Featire specs)
>>>>>>> f92a45b (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
          
  1294. 
=======
          
  1295. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
=======
=======
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
          
  1296. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
          
  1297. 
=======
          
  1298. 
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
          
  1299. 
>>>>>>> 94841b5 (Featire specs)
=======
          
  1300. 
=======
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
          
  1301. 
=======
          
  1302. 
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
          
  1303. 
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
>>>>>>> 94841b5 (Featire specs)
=======
          
  1304. 
>>>>>>> b904d7ae (Featire specs)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
  1305. 
>>>>>>> 3b03895 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
          
  1306. 
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
          
  1307. 
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
          
  1308. 
=======
          
  1309. 
>>>>>>> 3b03895 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
          
  1310. 
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
  1311. 
>>>>>>> e54deeb (Featire specs)
=======
          
  1312. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
  1313. 
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
>>>>>>> 9c0d812 (Featire specs)
=======
          
  1314. 
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
          
  1315. 
>>>>>>> 34509eee (Featire specs)
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  1316. 
=======
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
          
  1317. 
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
          
  1318. 
=======
          
  1319. 
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
  1320. 
>>>>>>> 9c0d812 (Featire specs)
=======
          
  1321. 
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
=======
          
  1322. 
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
=======
          
  1323. 
=======
=======
>>>>>>> 610b6138 (Featire specs)
<<<<<<< HEAD
=======
=======
>>>>>>> 009401d (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> c8da2e3 (Fix)
>>>>>>> fdab719f (Fix)
=======
>>>>>>> c51bf93 (Featire specs)
>>>>>>> 7a08014b (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
>>>>>>> efd6af09 (Featire specs)
          
  1324. 
=======
          
  1325. 
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
  1326. 
>>>>>>> 9c0d812 (Featire specs)
=======
          
  1327. 
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
          
  1328. 
=======
          
  1329. 
>>>>>>> 9c0d812 (Featire specs)
=======
          
  1330. 
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> 5506bd0 (Featire specs)
=======
          
  1331. 
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  1332. 
=======
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
          
  1333. 
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1d59aaa (Fix)
          
  1334. 
=======
          
  1335. 
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
          
  1336. 
>>>>>>> 94841b5 (Featire specs)
=======
          
  1337. 
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
  1338. 
>>>>>>> 3b03895 (Featire specs)
=======
          
  1339. 
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
  1340. 
>>>>>>> e54deeb (Featire specs)
=======
          
  1341. 
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
  1342. 
>>>>>>> 9c0d812 (Featire specs)
=======
          
  1343. 
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
=======
          
  1344. 
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
          
  1345. 
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 904663c (Featire specs)
          
  1346. 
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
          
  1347. 
=======
          
  1348. 
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
  1349. 
>>>>>>> 9c0d812 (Featire specs)
=======
          
  1350. 
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
=======
          
  1351. 
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ebcdce06 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
>>>>>>> df37394 (Featire specs)
>>>>>>> f92a45b (Featire specs)
>>>>>>> e6fc67c7 (Featire specs)
          
  1352. 
=======
          
  1353. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  1354. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  1355. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 84003439 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
=======
>>>>>>> afa56d1 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0f24a043 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
>>>>>>> afa56d1 (Featire specs)
>>>>>>> e1ecabbe (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9bfbd88 (Featire specs)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 610b6138 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
<<<<<<< HEAD
=======
>>>>>>> c51bf93 (Featire specs)
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> c51bf93 (Featire specs)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
>>>>>>> 74240509 (Fix book_spec decrease quantity and price)
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 9bfbd88 (Featire specs)
<<<<<<< HEAD
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 6da9530 (Featire specs)
=======
=======
          
  1356. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> 21873de0 (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bb5c652 (Fix book_spec decrease quantity and price)
=======
=======
          
  1357. 
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> 9a49b7b (Rebased)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
          
  1358. 
>>>>>>> c033601 (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 7b22ad7e (Featire specs)
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 7b22ad7e (Featire specs)
=======
>>>>>>> b97bb382 (Featire specs)
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
=======
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> 973ba8c (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bf05825 (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
>>>>>>> c12b71de (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
>>>>>>> 3cf8dd4 (Featire specs)
>>>>>>> aa4361fd (Featire specs)
          
  1359. 
=======
          
  1360. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 7b22ad7e (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ae07231a (Featire specs)
=======
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
=======
=======
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
>>>>>>> 3cf8dd4 (Featire specs)
>>>>>>> aa4361fd (Featire specs)
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 70fcacc (Featire specs)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 009401d (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
          
  1361. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c12b71de (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> c12b71de (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
>>>>>>> ae409ca (Featire specs)
=======
>>>>>>> c8da2e3 (Fix)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
=======
=======
          
  1362. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
>>>>>>> 379a979 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
>>>>>>> adc21e0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 9440753 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
=======
          
  1363. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
=======
=======
          
  1364. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4d90e3d (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e18eb87 (Fix)
=======
=======
          
  1365. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  1366. 
>>>>>>> a5d032d (Fix)
>>>>>>> 160fb15 (Fix)
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 557c1b8 (Fix)
=======
          
  1367. 
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
  1368. 
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> ae884b47 (Fix)
=======
=======
=======
=======
=======
          
  1369. 
>>>>>>> a5d032d (Fix)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
  1370. 
>>>>>>> a5d032d (Fix)
>>>>>>> e3e66f3 (Featire specs)
=======
          
  1371. 
=======
          
  1372. 
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376a (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
  1373. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0ea (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
  1374. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888bf (Featire specs)
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
  1375. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 74240509 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
  1376. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
=======
          
  1377. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a1a479e2 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
  1378. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 393eff3b (Featire specs)
=======
=======
=======
=======
          
  1379. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  1380. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
>>>>>>> d9d85ca6 (Fix)
=======
          
  1381. 
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 9bfbd88 (Featire specs)
>>>>>>> ebcdce06 (Featire specs)
=======
>>>>>>> adc21e0 (Featire specs)
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> 6b6d1c2d (Featire specs)
>>>>>>> adc21e0 (Featire specs)
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 9440753 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
  1382. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
  1383. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4d90e3d (Featire specs)
<<<<<<< HEAD
>>>>>>> 37e48018 (Featire specs)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
  1384. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  1385. 
>>>>>>> a5d032d (Fix)
>>>>>>> 160fb15 (Fix)
<<<<<<< HEAD
>>>>>>> 31d15e66 (Fix)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 557c1b8 (Fix)
=======
          
  1386. 
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> fdab719f (Fix)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
  1387. 
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> 8288136d (Fix)
=======
=======
=======
=======
=======
          
  1388. 
>>>>>>> a5d032d (Fix)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
  1389. 
>>>>>>> a5d032d (Fix)
>>>>>>> e3e66f3 (Featire specs)
=======
          
  1390. 
=======
          
  1391. 
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> d52f9efe (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
  1392. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
  1393. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> c12b71de (Featire specs)
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
  1394. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
  1395. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
=======
          
  1396. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
  1397. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b904d7ae (Featire specs)
=======
=======
=======
=======
          
  1398. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  1399. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
>>>>>>> ef483b6d (Fix)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 15c51b7 (Featire specs)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  1400. 
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
  1401. 
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 0c57e4e (Fix)
<<<<<<< HEAD
>>>>>>> 8887ba5b (Fix)
=======
=======
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
          
  1402. 
=======
          
  1403. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5e31aeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 53db2224 (Featire specs)
=======
=======
=======
=======
=======
          
  1404. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
=======
=======
          
  1405. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
=======
=======
=======
          
  1406. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0f24a043 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
=======
          
  1407. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
=======
=======
=======
          
  1408. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> b8c2784f (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
=======
          
  1409. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 392646b5 (Featire specs)
=======
=======
=======
=======
=======
          
  1410. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
  1411. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            
            

            

              end
          
    1412. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  1412. 
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> c51bf93 (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> bf05825 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> c51bf93 (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> bf05825 (Featire specs)
=======
>>>>>>> f92a45b (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0c57e4e (Fix)
=======
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 973ba8c (Featire specs)
=======
>>>>>>> 8181d13 (Featire specs)
=======
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 72b9cab (Featire specs)
=======
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 15c51b7 (Featire specs)
=======
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9e081dc (Fix)
=======
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
          
  1413. 
>>>>>>> 2a25e4c (Featire specs)
>>>>>>> 216fe41 (Featire specs)
=======
          
  1414. 
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
=======
=======
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  1415. 
=======
=======
>>>>>>> 9a49b7b (Rebased)
=======
>>>>>>> 70fcacc (Featire specs)
=======
>>>>>>> ae409ca (Featire specs)
=======
>>>>>>> 379a979 (Featire specs)
=======
>>>>>>> adc21e0 (Featire specs)
=======
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4d90e3d (Featire specs)
=======
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 160fb15 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4d90e3d (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 160fb15 (Fix)
>>>>>>> 67ab5299 (Fix)
<<<<<<< HEAD
=======
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 7a08014b (Featire specs)
=======
>>>>>>> e6fc67c7 (Featire specs)
>>>>>>> c8da2e3 (Fix)
=======
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
>>>>>>> c51bf93 (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
>>>>>>> b28889f (Fix)
>>>>>>> e18eb87 (Fix)
=======
=======
>>>>>>> df37394 (Featire specs)
>>>>>>> f92a45b (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
          
  1416. 
=======
          
  1417. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
=======
=======
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
          
  1418. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
          
  1419. 
=======
          
  1420. 
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
          
  1421. 
>>>>>>> 94841b5 (Featire specs)
=======
          
  1422. 
=======
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
          
  1423. 
=======
          
  1424. 
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
          
  1425. 
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
>>>>>>> 94841b5 (Featire specs)
=======
          
  1426. 
>>>>>>> b904d7ae (Featire specs)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
  1427. 
>>>>>>> 3b03895 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
          
  1428. 
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
          
  1429. 
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
          
  1430. 
=======
          
  1431. 
>>>>>>> 3b03895 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
          
  1432. 
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
  1433. 
>>>>>>> e54deeb (Featire specs)
=======
          
  1434. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
  1435. 
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
>>>>>>> 9c0d812 (Featire specs)
=======
          
  1436. 
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
          
  1437. 
>>>>>>> 34509eee (Featire specs)
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  1438. 
=======
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
          
  1439. 
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
          
  1440. 
=======
          
  1441. 
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
  1442. 
>>>>>>> 9c0d812 (Featire specs)
=======
          
  1443. 
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
=======
          
  1444. 
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
=======
          
  1445. 
=======
=======
>>>>>>> 610b6138 (Featire specs)
<<<<<<< HEAD
=======
=======
>>>>>>> 009401d (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> c8da2e3 (Fix)
>>>>>>> fdab719f (Fix)
=======
>>>>>>> c51bf93 (Featire specs)
>>>>>>> 7a08014b (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
>>>>>>> efd6af09 (Featire specs)
          
  1446. 
=======
          
  1447. 
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
  1448. 
>>>>>>> 9c0d812 (Featire specs)
=======
          
  1449. 
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
          
  1450. 
=======
          
  1451. 
>>>>>>> 9c0d812 (Featire specs)
=======
          
  1452. 
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> 5506bd0 (Featire specs)
=======
          
  1453. 
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  1454. 
=======
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
          
  1455. 
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1d59aaa (Fix)
          
  1456. 
=======
          
  1457. 
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
          
  1458. 
>>>>>>> 94841b5 (Featire specs)
=======
          
  1459. 
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
  1460. 
>>>>>>> 3b03895 (Featire specs)
=======
          
  1461. 
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
  1462. 
>>>>>>> e54deeb (Featire specs)
=======
          
  1463. 
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
  1464. 
>>>>>>> 9c0d812 (Featire specs)
=======
          
  1465. 
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
=======
          
  1466. 
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
          
  1467. 
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 904663c (Featire specs)
          
  1468. 
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
          
  1469. 
=======
          
  1470. 
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
  1471. 
>>>>>>> 9c0d812 (Featire specs)
=======
          
  1472. 
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
=======
          
  1473. 
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ebcdce06 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
>>>>>>> df37394 (Featire specs)
>>>>>>> f92a45b (Featire specs)
>>>>>>> e6fc67c7 (Featire specs)
          
  1474. 
=======
          
  1475. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  1476. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  1477. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 84003439 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
=======
>>>>>>> afa56d1 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0f24a043 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
>>>>>>> afa56d1 (Featire specs)
>>>>>>> e1ecabbe (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9bfbd88 (Featire specs)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 610b6138 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
<<<<<<< HEAD
=======
>>>>>>> c51bf93 (Featire specs)
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> c51bf93 (Featire specs)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
>>>>>>> 74240509 (Fix book_spec decrease quantity and price)
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 9bfbd88 (Featire specs)
<<<<<<< HEAD
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 6da9530 (Featire specs)
=======
=======
          
  1478. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> 21873de0 (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bb5c652 (Fix book_spec decrease quantity and price)
=======
=======
          
  1479. 
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> 9a49b7b (Rebased)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
          
  1480. 
>>>>>>> c033601 (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 7b22ad7e (Featire specs)
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 7b22ad7e (Featire specs)
=======
>>>>>>> b97bb382 (Featire specs)
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
=======
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> 973ba8c (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bf05825 (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
>>>>>>> c12b71de (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
>>>>>>> 3cf8dd4 (Featire specs)
>>>>>>> aa4361fd (Featire specs)
          
  1481. 
=======
          
  1482. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 7b22ad7e (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ae07231a (Featire specs)
=======
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
=======
=======
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
>>>>>>> 3cf8dd4 (Featire specs)
>>>>>>> aa4361fd (Featire specs)
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 70fcacc (Featire specs)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 009401d (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
          
  1483. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c12b71de (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> c12b71de (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
>>>>>>> ae409ca (Featire specs)
=======
>>>>>>> c8da2e3 (Fix)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
=======
=======
          
  1484. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
>>>>>>> 379a979 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
>>>>>>> adc21e0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 9440753 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
=======
          
  1485. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
=======
=======
          
  1486. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4d90e3d (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e18eb87 (Fix)
=======
=======
          
  1487. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  1488. 
>>>>>>> a5d032d (Fix)
>>>>>>> 160fb15 (Fix)
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 557c1b8 (Fix)
=======
          
  1489. 
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
  1490. 
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> ae884b47 (Fix)
=======
=======
=======
=======
=======
          
  1491. 
>>>>>>> a5d032d (Fix)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
  1492. 
>>>>>>> a5d032d (Fix)
>>>>>>> e3e66f3 (Featire specs)
=======
          
  1493. 
=======
          
  1494. 
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376a (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
  1495. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0ea (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
  1496. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888bf (Featire specs)
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
  1497. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 74240509 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
  1498. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
=======
          
  1499. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a1a479e2 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
  1500. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 393eff3b (Featire specs)
=======
=======
=======
=======
          
  1501. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  1502. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
>>>>>>> d9d85ca6 (Fix)
=======
          
  1503. 
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 9bfbd88 (Featire specs)
>>>>>>> ebcdce06 (Featire specs)
=======
>>>>>>> adc21e0 (Featire specs)
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> 6b6d1c2d (Featire specs)
>>>>>>> adc21e0 (Featire specs)
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 9440753 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
  1504. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
  1505. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4d90e3d (Featire specs)
<<<<<<< HEAD
>>>>>>> 37e48018 (Featire specs)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
  1506. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  1507. 
>>>>>>> a5d032d (Fix)
>>>>>>> 160fb15 (Fix)
<<<<<<< HEAD
>>>>>>> 31d15e66 (Fix)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 557c1b8 (Fix)
=======
          
  1508. 
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> fdab719f (Fix)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
  1509. 
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> 8288136d (Fix)
=======
=======
=======
=======
=======
          
  1510. 
>>>>>>> a5d032d (Fix)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
  1511. 
>>>>>>> a5d032d (Fix)
>>>>>>> e3e66f3 (Featire specs)
=======
          
  1512. 
=======
          
  1513. 
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> d52f9efe (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
  1514. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
  1515. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> c12b71de (Featire specs)
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
  1516. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
  1517. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
=======
          
  1518. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
  1519. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b904d7ae (Featire specs)
=======
=======
=======
=======
          
  1520. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  1521. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
>>>>>>> ef483b6d (Fix)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 15c51b7 (Featire specs)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  1522. 
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
  1523. 
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 0c57e4e (Fix)
<<<<<<< HEAD
>>>>>>> 8887ba5b (Fix)
=======
=======
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
          
  1524. 
=======
          
  1525. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5e31aeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 53db2224 (Featire specs)
=======
=======
=======
=======
=======
          
  1526. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
=======
=======
          
  1527. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
=======
=======
=======
          
  1528. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0f24a043 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
=======
          
  1529. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
=======
=======
=======
          
  1530. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> b8c2784f (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
=======
          
  1531. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 392646b5 (Featire specs)
=======
=======
=======
=======
=======
          
  1532. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
  1533. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            
            

            

            
          
    1534. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  1534. 
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> c51bf93 (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> bf05825 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> c51bf93 (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> bf05825 (Featire specs)
=======
>>>>>>> f92a45b (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0c57e4e (Fix)
=======
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 973ba8c (Featire specs)
=======
>>>>>>> 8181d13 (Featire specs)
=======
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 72b9cab (Featire specs)
=======
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 15c51b7 (Featire specs)
=======
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9e081dc (Fix)
=======
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
          
  1535. 
>>>>>>> 2a25e4c (Featire specs)
>>>>>>> 216fe41 (Featire specs)
=======
          
  1536. 
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
=======
=======
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  1537. 
=======
=======
>>>>>>> 9a49b7b (Rebased)
=======
>>>>>>> 70fcacc (Featire specs)
=======
>>>>>>> ae409ca (Featire specs)
=======
>>>>>>> 379a979 (Featire specs)
=======
>>>>>>> adc21e0 (Featire specs)
=======
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4d90e3d (Featire specs)
=======
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 160fb15 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4d90e3d (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 160fb15 (Fix)
>>>>>>> 67ab5299 (Fix)
<<<<<<< HEAD
=======
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 7a08014b (Featire specs)
=======
>>>>>>> e6fc67c7 (Featire specs)
>>>>>>> c8da2e3 (Fix)
=======
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
>>>>>>> c51bf93 (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
>>>>>>> b28889f (Fix)
>>>>>>> e18eb87 (Fix)
=======
=======
>>>>>>> df37394 (Featire specs)
>>>>>>> f92a45b (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
          
  1538. 
=======
          
  1539. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
=======
=======
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
          
  1540. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
          
  1541. 
=======
          
  1542. 
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
          
  1543. 
>>>>>>> 94841b5 (Featire specs)
=======
          
  1544. 
=======
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
          
  1545. 
=======
          
  1546. 
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
          
  1547. 
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
>>>>>>> 94841b5 (Featire specs)
=======
          
  1548. 
>>>>>>> b904d7ae (Featire specs)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
  1549. 
>>>>>>> 3b03895 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
          
  1550. 
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
          
  1551. 
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
          
  1552. 
=======
          
  1553. 
>>>>>>> 3b03895 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
          
  1554. 
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
  1555. 
>>>>>>> e54deeb (Featire specs)
=======
          
  1556. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
  1557. 
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
>>>>>>> 9c0d812 (Featire specs)
=======
          
  1558. 
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
          
  1559. 
>>>>>>> 34509eee (Featire specs)
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  1560. 
=======
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
          
  1561. 
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
          
  1562. 
=======
          
  1563. 
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
  1564. 
>>>>>>> 9c0d812 (Featire specs)
=======
          
  1565. 
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
=======
          
  1566. 
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
=======
          
  1567. 
=======
=======
>>>>>>> 610b6138 (Featire specs)
<<<<<<< HEAD
=======
=======
>>>>>>> 009401d (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> c8da2e3 (Fix)
>>>>>>> fdab719f (Fix)
=======
>>>>>>> c51bf93 (Featire specs)
>>>>>>> 7a08014b (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
>>>>>>> efd6af09 (Featire specs)
          
  1568. 
=======
          
  1569. 
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
  1570. 
>>>>>>> 9c0d812 (Featire specs)
=======
          
  1571. 
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
          
  1572. 
=======
          
  1573. 
>>>>>>> 9c0d812 (Featire specs)
=======
          
  1574. 
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> 5506bd0 (Featire specs)
=======
          
  1575. 
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  1576. 
=======
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
          
  1577. 
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1d59aaa (Fix)
          
  1578. 
=======
          
  1579. 
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
          
  1580. 
>>>>>>> 94841b5 (Featire specs)
=======
          
  1581. 
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
  1582. 
>>>>>>> 3b03895 (Featire specs)
=======
          
  1583. 
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
  1584. 
>>>>>>> e54deeb (Featire specs)
=======
          
  1585. 
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
  1586. 
>>>>>>> 9c0d812 (Featire specs)
=======
          
  1587. 
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
=======
          
  1588. 
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
          
  1589. 
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 904663c (Featire specs)
          
  1590. 
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
          
  1591. 
=======
          
  1592. 
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
  1593. 
>>>>>>> 9c0d812 (Featire specs)
=======
          
  1594. 
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
=======
          
  1595. 
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ebcdce06 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
>>>>>>> df37394 (Featire specs)
>>>>>>> f92a45b (Featire specs)
>>>>>>> e6fc67c7 (Featire specs)
          
  1596. 
=======
          
  1597. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  1598. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  1599. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 84003439 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
=======
>>>>>>> afa56d1 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0f24a043 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
>>>>>>> afa56d1 (Featire specs)
>>>>>>> e1ecabbe (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9bfbd88 (Featire specs)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 610b6138 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
<<<<<<< HEAD
=======
>>>>>>> c51bf93 (Featire specs)
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> c51bf93 (Featire specs)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
>>>>>>> 74240509 (Fix book_spec decrease quantity and price)
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 9bfbd88 (Featire specs)
<<<<<<< HEAD
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 6da9530 (Featire specs)
=======
=======
          
  1600. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> 21873de0 (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bb5c652 (Fix book_spec decrease quantity and price)
=======
=======
          
  1601. 
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> 9a49b7b (Rebased)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
          
  1602. 
>>>>>>> c033601 (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 7b22ad7e (Featire specs)
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 7b22ad7e (Featire specs)
=======
>>>>>>> b97bb382 (Featire specs)
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
=======
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> 973ba8c (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bf05825 (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
>>>>>>> c12b71de (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
>>>>>>> 3cf8dd4 (Featire specs)
>>>>>>> aa4361fd (Featire specs)
          
  1603. 
=======
          
  1604. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 7b22ad7e (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ae07231a (Featire specs)
=======
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
=======
=======
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
>>>>>>> 3cf8dd4 (Featire specs)
>>>>>>> aa4361fd (Featire specs)
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 70fcacc (Featire specs)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 009401d (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
          
  1605. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c12b71de (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> c12b71de (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
>>>>>>> ae409ca (Featire specs)
=======
>>>>>>> c8da2e3 (Fix)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
=======
=======
          
  1606. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
>>>>>>> 379a979 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
>>>>>>> adc21e0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 9440753 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
=======
          
  1607. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
=======
=======
          
  1608. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4d90e3d (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e18eb87 (Fix)
=======
=======
          
  1609. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  1610. 
>>>>>>> a5d032d (Fix)
>>>>>>> 160fb15 (Fix)
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 557c1b8 (Fix)
=======
          
  1611. 
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
  1612. 
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> ae884b47 (Fix)
=======
=======
=======
=======
=======
          
  1613. 
>>>>>>> a5d032d (Fix)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
  1614. 
>>>>>>> a5d032d (Fix)
>>>>>>> e3e66f3 (Featire specs)
=======
          
  1615. 
=======
          
  1616. 
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376a (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
  1617. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0ea (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
  1618. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888bf (Featire specs)
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
  1619. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 74240509 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
  1620. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
=======
          
  1621. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a1a479e2 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
  1622. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 393eff3b (Featire specs)
=======
=======
=======
=======
          
  1623. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  1624. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
>>>>>>> d9d85ca6 (Fix)
=======
          
  1625. 
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 9bfbd88 (Featire specs)
>>>>>>> ebcdce06 (Featire specs)
=======
>>>>>>> adc21e0 (Featire specs)
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> 6b6d1c2d (Featire specs)
>>>>>>> adc21e0 (Featire specs)
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 9440753 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
  1626. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
  1627. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4d90e3d (Featire specs)
<<<<<<< HEAD
>>>>>>> 37e48018 (Featire specs)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
  1628. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  1629. 
>>>>>>> a5d032d (Fix)
>>>>>>> 160fb15 (Fix)
<<<<<<< HEAD
>>>>>>> 31d15e66 (Fix)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 557c1b8 (Fix)
=======
          
  1630. 
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> fdab719f (Fix)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
  1631. 
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> 8288136d (Fix)
=======
=======
=======
=======
=======
          
  1632. 
>>>>>>> a5d032d (Fix)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
  1633. 
>>>>>>> a5d032d (Fix)
>>>>>>> e3e66f3 (Featire specs)
=======
          
  1634. 
=======
          
  1635. 
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> d52f9efe (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
  1636. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
  1637. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> c12b71de (Featire specs)
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
  1638. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
  1639. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
=======
          
  1640. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
  1641. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b904d7ae (Featire specs)
=======
=======
=======
=======
          
  1642. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  1643. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
>>>>>>> ef483b6d (Fix)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 15c51b7 (Featire specs)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  1644. 
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
  1645. 
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 0c57e4e (Fix)
<<<<<<< HEAD
>>>>>>> 8887ba5b (Fix)
=======
=======
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
          
  1646. 
=======
          
  1647. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5e31aeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 53db2224 (Featire specs)
=======
=======
=======
=======
=======
          
  1648. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
=======
=======
          
  1649. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
=======
=======
=======
          
  1650. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0f24a043 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
=======
          
  1651. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
=======
=======
=======
          
  1652. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> b8c2784f (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
=======
          
  1653. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 392646b5 (Featire specs)
=======
=======
=======
=======
=======
          
  1654. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
  1655. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            1
            

            

              def show
          
    1656. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  1656. 
            11
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> c51bf93 (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> bf05825 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> c51bf93 (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> bf05825 (Featire specs)
=======
>>>>>>> f92a45b (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0c57e4e (Fix)
=======
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 973ba8c (Featire specs)
=======
>>>>>>> 8181d13 (Featire specs)
=======
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 72b9cab (Featire specs)
=======
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 15c51b7 (Featire specs)
=======
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9e081dc (Fix)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
=======
=======
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  1657. 
            11
=======
=======
>>>>>>> 9a49b7b (Rebased)
=======
>>>>>>> 70fcacc (Featire specs)
=======
>>>>>>> ae409ca (Featire specs)
=======
>>>>>>> 379a979 (Featire specs)
=======
>>>>>>> adc21e0 (Featire specs)
=======
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4d90e3d (Featire specs)
=======
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 160fb15 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4d90e3d (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 160fb15 (Fix)
>>>>>>> 67ab5299 (Fix)
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
=======
=======
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
=======
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
=======
          
  1658. 
            11
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
=======
=======
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
=======
=======
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> bf05825 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
=======
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
>>>>>>> b28889f (Fix)
>>>>>>> e18eb87 (Fix)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 0c57e4e (Fix)
=======
=======
>>>>>>> 5507b42 (Featire specs)
>>>>>>> 5e31aeb (Featire specs)
=======
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> 51bc18c (Featire specs)
=======
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> 973ba8c (Featire specs)
=======
=======
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
=======
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
=======
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
=======
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
          
  1659. 
>>>>>>> 84003439 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> ebcdce06 (Featire specs)
          
  1660. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  1661. 
=======
          
  1662. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  1663. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  1664. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
            7
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9bfbd88 (Featire specs)
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> 9bfbd88 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 9bfbd88 (Featire specs)
>>>>>>> f7852d17 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 84003439 (Featire specs)
>>>>>>> 9bfbd88 (Featire specs)
<<<<<<< HEAD
=======
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> c12b71de (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
>>>>>>> 51bc18c (Featire specs)
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
>>>>>>> 4a2f2ad8 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> 8181d13 (Featire specs)
>>>>>>> 4a2f2ad8 (Featire specs)
          
  1665. 
            11
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9a49b7b (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b904d7ae (Featire specs)
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
>>>>>>> b904d7ae (Featire specs)
=======
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 6da9530 (Featire specs)
>>>>>>> 0f8241bb (Featire specs)
          
  1666. 
            11
>>>>>>> c033601 (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
          
  1667. 
            11
=======
          
  1668. 
            11
>>>>>>> 9620751 (Featire specs)
=======
          
  1669. 
            7
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
=======
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> d52f9efe (Featire specs)
=======
=======
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> 77d62af (Featire specs)
>>>>>>> ae07231a (Featire specs)
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 70fcacc (Featire specs)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 009401d (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
          
  1670. 
            7
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c12b71de (Featire specs)
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
=======
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> 77d62af (Featire specs)
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> c12b71de (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
>>>>>>> ae409ca (Featire specs)
=======
>>>>>>> c8da2e3 (Fix)
=======
<<<<<<< HEAD
>>>>>>> ae409ca (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
          
  1671. 
            7
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c12b71de (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 379a979 (Featire specs)
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
=======
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 379a979 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> fdab719f (Fix)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
          
  1672. 
            7
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> 74240509 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> adc21e0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
=======
=======
>>>>>>> df37394 (Featire specs)
          
  1673. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  1674. 
=======
          
  1675. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  1676. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  1677. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
=======
=======
          
  1678. 
>>>>>>> 0d6dd12 (Manifest_cache true)
            7
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
  1679. 
            7
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
          
  1680. 
            7
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
          
  1681. 
            7
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b904d7ae (Featire specs)
=======
          
  1682. 
            7
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
=======
          
  1683. 
            7
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ef483b6d (Fix)
=======
          
  1684. 
            15
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
=======
>>>>>>> 9bfbd88 (Featire specs)
>>>>>>> ebcdce06 (Featire specs)
=======
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6b6d1c2d (Featire specs)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> adc21e0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 610b6138 (Featire specs)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
=======
=======
>>>>>>> df37394 (Featire specs)
          
  1685. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  1686. 
=======
          
  1687. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  1688. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  1689. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
=======
=======
          
  1690. 
>>>>>>> 0d6dd12 (Manifest_cache true)
            7
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
>>>>>>> b904d7ae (Featire specs)
=======
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
=======
>>>>>>> ef483b6d (Fix)
            

            

                book = Book.find(params[:id])
<<<<<<< HEAD
>>>>>>> 3b03895 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
          
  1691. 
            7
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4d90e3d (Featire specs)
<<<<<<< HEAD
>>>>>>> 37e48018 (Featire specs)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
  1692. 
            7
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
=======
          
  1693. 
            7
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> e3e66f3 (Featire specs)
=======
          
  1694. 
            11
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 160fb15 (Fix)
<<<<<<< HEAD
>>>>>>> 31d15e66 (Fix)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 932dbec (Featire specs)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> fdab719f (Fix)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
          
  1695. 
            7
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> 8288136d (Fix)
=======
=======
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> d52f9efe (Featire specs)
=======
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> c12b71de (Featire specs)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
          
  1696. 
            11
=======
          
  1697. 
            7
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
=======
          
  1698. 
            7
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
<<<<<<< HEAD
=======
=======
=======
          
  1699. 
            7
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
=======
          
  1700. 
            7
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
=======
=======
          
  1701. 
            7
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
          
  1702. 
            7
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
=======
=======
          
  1703. 
            7
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
  1704. 
            11
>>>>>>> a5d032d (Fix)
>>>>>>> b28889f (Fix)
>>>>>>> e18eb87 (Fix)
>>>>>>> 99dad91f (Fix)
            

            

<<<<<<< HEAD
                book = Book.find(params[:id])
<<<<<<< HEAD
>>>>>>> 3b03895 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
  1705. 
            7
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4d90e3d (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
  1706. 
            7
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
=======
          
  1707. 
            7
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> e3e66f3 (Featire specs)
=======
          
  1708. 
            11
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 160fb15 (Fix)
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 932dbec (Featire specs)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
          
  1709. 
            7
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> ae884b47 (Fix)
=======
=======
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376a (Featire specs)
=======
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0ea (Featire specs)
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888bf (Featire specs)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 74240509 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
          
  1710. 
            11
>>>>>>> c033601 (Rebased)
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
          
  1711. 
            11
=======
          
  1712. 
            11
>>>>>>> 9620751 (Featire specs)
=======
          
  1713. 
            11
>>>>>>> 2a25e4c (Featire specs)
=======
          
  1714. 
            7
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 6da9530 (Featire specs)
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
          
  1715. 
            7
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0ed7f7c (Featire specs)
=======
=======
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
=======
          
  1716. 
            7
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
          
  1717. 
            7
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
          
  1718. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  1719. 
=======
          
  1720. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  1721. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  1722. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
            7
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
          
  1723. 
            7
>>>>>>> 7a02bbe (Featire specs)
=======
          
  1724. 
            7
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
          
  1725. 
            7
>>>>>>> 4552227 (Featire specs)
=======
          
  1726. 
            7
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
=======
          
  1727. 
            15
>>>>>>> 7c4ea7f (Fix)
            

            

                book = Book.find(params[:id])
<<<<<<< HEAD
>>>>>>> 3b03895 (Featire specs)
=======
=======
          
  1728. 
            7
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
=======
=======
          
  1729. 
            7
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> e6fc67c7 (Featire specs)
=======
          
  1730. 
            11
<<<<<<< HEAD
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> e18eb87 (Fix)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
          
  1731. 
            7
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 0c57e4e (Fix)
<<<<<<< HEAD
>>>>>>> 8887ba5b (Fix)
=======
=======
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5e31aeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 53db2224 (Featire specs)
=======
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0f24a043 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
=======
=======
          
  1732. 
            7
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
=======
=======
          
  1733. 
            7
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
=======
          
  1734. 
            7
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
=======
=======
          
  1735. 
            7
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
          
  1736. 
            7
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                book = Book.find_by(id: params[:id])
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
                @book = Book.find(params[:id]).decorate
>>>>>>> 2a25e4c (Featire specs)
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8181d13 (Featire specs)
=======
>>>>>>> 973ba8c (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> 0c57e4e (Fix)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
>>>>>>> f92a45b (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
=======
=======
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                book = Book.find_by(id: params[:id])
=======
=======
>>>>>>> 9a49b7b (Rebased)
=======
>>>>>>> 70fcacc (Featire specs)
=======
>>>>>>> ae409ca (Featire specs)
=======
>>>>>>> 379a979 (Featire specs)
=======
>>>>>>> adc21e0 (Featire specs)
=======
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4d90e3d (Featire specs)
=======
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 160fb15 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4d90e3d (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 160fb15 (Fix)
>>>>>>> 67ab5299 (Fix)
<<<<<<< HEAD
=======
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 7a08014b (Featire specs)
=======
>>>>>>> e6fc67c7 (Featire specs)
>>>>>>> c8da2e3 (Fix)
=======
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
>>>>>>> c51bf93 (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> b28889f (Fix)
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
=======
>>>>>>> df37394 (Featire specs)
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
>>>>>>> a2206025 (Featire specs)
                @book = Book.find(params[:id]).decorate
=======
                book = Book.find_by(id: params[:id])
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
                book = Book.find_by(id: params[:id])
>>>>>>> 9c0d812 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
=======
>>>>>>> 3e9f99d (Featire specs)
                @book = Book.find(params[:id]).decorate
=======
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2ee03d3 (Featire specs)
                @book = Book.find(params[:id]).decorate
=======
                book = Book.find_by(id: params[:id])
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
                book = Book.find_by(id: params[:id])
=======
                @book = Book.find(params[:id]).decorate
=======
                book = Book.find_by(id: params[:id])
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
                @book = Book.find(params[:id]).decorate
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
                @book = Book.find(params[:id]).decorate
=======
                book = Book.find_by(id: params[:id])
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
                book = Book.find_by(id: params[:id])
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
<<<<<<< HEAD
                book = Book.find_by(id: params[:id])
=======
=======
>>>>>>> 610b6138 (Featire specs)
<<<<<<< HEAD
=======
=======
>>>>>>> 009401d (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> c8da2e3 (Fix)
>>>>>>> fdab719f (Fix)
=======
>>>>>>> c51bf93 (Featire specs)
>>>>>>> 7a08014b (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
>>>>>>> fd3f47ab (Featire specs)
                @book = Book.find(params[:id]).decorate
=======
                book = Book.find_by(id: params[:id])
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
                book = Book.find_by(id: params[:id])
>>>>>>> 9c0d812 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
                @book = Book.find(params[:id]).decorate
=======
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
                @book = Book.find(params[:id]).decorate
=======
                book = Book.find_by(id: params[:id])
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
                book = Book.find_by(id: params[:id])
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ebcdce06 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
>>>>>>> df37394 (Featire specs)
>>>>>>> f92a45b (Featire specs)
>>>>>>> e6fc67c7 (Featire specs)
                @book = Book.find(params[:id]).decorate
=======
                @book = Book.find_by(id: params[:id])
>>>>>>> 752f0c0 (Featire specs)
=======
                @book = Book.find_by(id: params[:id])
>>>>>>> 4e81ea2 (Featire specs)
=======
                @book = Book.find_by(id: params[:id])
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 7a08014b (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> f92a45b (Featire specs)
>>>>>>> e6fc67c7 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 9bfbd88 (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
>>>>>>> 9bfbd88 (Featire specs)
<<<<<<< HEAD
=======
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 6da9530 (Featire specs)
=======
=======
                @book = Book.find(params[:id]).decorate
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> 21873de0 (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bb5c652 (Fix book_spec decrease quantity and price)
=======
=======
                book = Book.find_by(id: params[:id])
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> 9a49b7b (Rebased)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
                book = Book.find_by(id: params[:id])
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
                book = Book.find_by(id: params[:id])
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
                book = Book.find_by(id: params[:id])
>>>>>>> c033601 (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
>>>>>>> afa56d1 (Featire specs)
>>>>>>> e1ecabbe (Featire specs)
                book = Book.find_by(id: params[:id])
=======
                @book = Book.find_by(id: params[:id])
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
=======
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
>>>>>>> 3cf8dd4 (Featire specs)
>>>>>>> aa4361fd (Featire specs)
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 70fcacc (Featire specs)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 009401d (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
                @book = Book.find_by(id: params[:id])
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
>>>>>>> ae409ca (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> c8da2e3 (Fix)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
=======
=======
                @book = Book.find_by(id: params[:id])
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 99dad91f (Fix)
>>>>>>> 379a979 (Featire specs)
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
=======
=======
                @book = Book.find_by(id: params[:id])
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
=======
=======
>>>>>>> 416166f (Featire specs)
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> e1ecabbe (Featire specs)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
>>>>>>> adc21e0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> e18eb87 (Fix)
=======
=======
                @book = Book.find(params[:id]).decorate
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
=======
=======
                @book = Book.find_by(id: params[:id])
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4d90e3d (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e18eb87 (Fix)
=======
=======
                @book = Book.find(params[:id]).decorate
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
=======
                book = Book.find(params[:id])
>>>>>>> a5d032d (Fix)
>>>>>>> 160fb15 (Fix)
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 557c1b8 (Fix)
=======
                book = Book.find(params[:id])
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
                book = Book.find(params[:id])
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> ae884b47 (Fix)
=======
=======
=======
=======
=======
                book = Book.find(params[:id])
>>>>>>> a5d032d (Fix)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                book = Book.find(params[:id])
>>>>>>> a5d032d (Fix)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> e3e66f3 (Featire specs)
                book = Book.find(params[:id])
=======
                @book = Book.find_by(id: params[:id])
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376a (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                @book = Book.find_by(id: params[:id])
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0ea (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                @book = Book.find_by(id: params[:id])
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888bf (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                @book = Book.find_by(id: params[:id])
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                @book = Book.find(params[:id]).decorate
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 74240509 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
                @book = Book.find_by(id: params[:id])
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
=======
                @book = Book.find(params[:id]).decorate
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a1a479e2 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
                @book = Book.find_by(id: params[:id])
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 393eff3b (Featire specs)
=======
=======
=======
=======
                @book = Book.find(params[:id]).decorate
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
>>>>>>> d9d85ca6 (Fix)
=======
                book = Book.find_by(id: params[:id])
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 9bfbd88 (Featire specs)
>>>>>>> ebcdce06 (Featire specs)
=======
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 379a979 (Featire specs)
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                @book = Book.find_by(id: params[:id])
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> adc21e0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 610b6138 (Featire specs)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                @book = Book.find(params[:id]).decorate
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                @book = Book.find_by(id: params[:id])
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4d90e3d (Featire specs)
<<<<<<< HEAD
>>>>>>> 37e48018 (Featire specs)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                @book = Book.find(params[:id]).decorate
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
=======
                book = Book.find(params[:id])
>>>>>>> a5d032d (Fix)
>>>>>>> 160fb15 (Fix)
<<<<<<< HEAD
>>>>>>> 31d15e66 (Fix)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 557c1b8 (Fix)
=======
                book = Book.find(params[:id])
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> fdab719f (Fix)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
                book = Book.find(params[:id])
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> 8288136d (Fix)
=======
=======
=======
=======
=======
                book = Book.find(params[:id])
>>>>>>> a5d032d (Fix)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                book = Book.find(params[:id])
>>>>>>> a5d032d (Fix)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> e3e66f3 (Featire specs)
                book = Book.find(params[:id])
=======
                @book = Book.find_by(id: params[:id])
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> d52f9efe (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                @book = Book.find_by(id: params[:id])
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                @book = Book.find_by(id: params[:id])
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> c12b71de (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                @book = Book.find_by(id: params[:id])
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                @book = Book.find(params[:id]).decorate
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
                @book = Book.find_by(id: params[:id])
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
=======
                @book = Book.find(params[:id]).decorate
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
                @book = Book.find_by(id: params[:id])
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b904d7ae (Featire specs)
=======
=======
=======
=======
                @book = Book.find(params[:id]).decorate
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
>>>>>>> ef483b6d (Fix)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 15c51b7 (Featire specs)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                book = Book.find(params[:id])
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
                book = Book.find(params[:id])
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 0c57e4e (Fix)
<<<<<<< HEAD
>>>>>>> 8887ba5b (Fix)
=======
=======
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
                book = Book.find(params[:id])
=======
                @book = Book.find_by(id: params[:id])
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5e31aeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 53db2224 (Featire specs)
=======
=======
=======
=======
=======
                @book = Book.find_by(id: params[:id])
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
=======
=======
                @book = Book.find_by(id: params[:id])
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
=======
=======
=======
                @book = Book.find_by(id: params[:id])
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
=======
=======
=======
                @book = Book.find(params[:id]).decorate
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0f24a043 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
=======
                @book = Book.find_by(id: params[:id])
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
=======
=======
=======
                @book = Book.find(params[:id]).decorate
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> b8c2784f (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
=======
                @book = Book.find_by(id: params[:id])
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 392646b5 (Featire specs)
=======
=======
=======
=======
=======
                @book = Book.find(params[:id]).decorate
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
    1737. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  1737. 
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> c51bf93 (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> bf05825 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> c51bf93 (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> bf05825 (Featire specs)
=======
>>>>>>> f92a45b (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0c57e4e (Fix)
=======
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 973ba8c (Featire specs)
=======
>>>>>>> 8181d13 (Featire specs)
=======
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 72b9cab (Featire specs)
=======
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 15c51b7 (Featire specs)
=======
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9e081dc (Fix)
=======
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
          
  1738. 
>>>>>>> 2a25e4c (Featire specs)
>>>>>>> 216fe41 (Featire specs)
=======
          
  1739. 
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
=======
=======
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  1740. 
=======
=======
>>>>>>> 9a49b7b (Rebased)
=======
>>>>>>> 70fcacc (Featire specs)
=======
>>>>>>> ae409ca (Featire specs)
=======
>>>>>>> 379a979 (Featire specs)
=======
>>>>>>> adc21e0 (Featire specs)
=======
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4d90e3d (Featire specs)
=======
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 160fb15 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4d90e3d (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 160fb15 (Fix)
>>>>>>> 67ab5299 (Fix)
<<<<<<< HEAD
=======
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 7a08014b (Featire specs)
=======
>>>>>>> e6fc67c7 (Featire specs)
>>>>>>> c8da2e3 (Fix)
=======
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
>>>>>>> c51bf93 (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
>>>>>>> b28889f (Fix)
>>>>>>> e18eb87 (Fix)
=======
=======
>>>>>>> df37394 (Featire specs)
>>>>>>> f92a45b (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
          
  1741. 
=======
          
  1742. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
=======
=======
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
          
  1743. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
          
  1744. 
=======
          
  1745. 
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
          
  1746. 
>>>>>>> 94841b5 (Featire specs)
=======
          
  1747. 
=======
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
          
  1748. 
=======
          
  1749. 
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
          
  1750. 
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
>>>>>>> 94841b5 (Featire specs)
=======
          
  1751. 
>>>>>>> b904d7ae (Featire specs)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
  1752. 
>>>>>>> 3b03895 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
          
  1753. 
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
          
  1754. 
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
          
  1755. 
=======
          
  1756. 
>>>>>>> 3b03895 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
          
  1757. 
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
  1758. 
>>>>>>> e54deeb (Featire specs)
=======
          
  1759. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
  1760. 
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
>>>>>>> 9c0d812 (Featire specs)
=======
          
  1761. 
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
          
  1762. 
>>>>>>> 34509eee (Featire specs)
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  1763. 
=======
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
          
  1764. 
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
          
  1765. 
=======
          
  1766. 
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
  1767. 
>>>>>>> 9c0d812 (Featire specs)
=======
          
  1768. 
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
=======
          
  1769. 
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
=======
          
  1770. 
=======
=======
>>>>>>> 610b6138 (Featire specs)
<<<<<<< HEAD
=======
=======
>>>>>>> 009401d (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> c8da2e3 (Fix)
>>>>>>> fdab719f (Fix)
=======
>>>>>>> c51bf93 (Featire specs)
>>>>>>> 7a08014b (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
>>>>>>> efd6af09 (Featire specs)
          
  1771. 
=======
          
  1772. 
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
  1773. 
>>>>>>> 9c0d812 (Featire specs)
=======
          
  1774. 
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
          
  1775. 
=======
          
  1776. 
>>>>>>> 9c0d812 (Featire specs)
=======
          
  1777. 
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> 5506bd0 (Featire specs)
=======
          
  1778. 
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  1779. 
=======
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
          
  1780. 
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1d59aaa (Fix)
          
  1781. 
=======
          
  1782. 
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
          
  1783. 
>>>>>>> 94841b5 (Featire specs)
=======
          
  1784. 
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
  1785. 
>>>>>>> 3b03895 (Featire specs)
=======
          
  1786. 
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
  1787. 
>>>>>>> e54deeb (Featire specs)
=======
          
  1788. 
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
  1789. 
>>>>>>> 9c0d812 (Featire specs)
=======
          
  1790. 
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
=======
          
  1791. 
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
          
  1792. 
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 904663c (Featire specs)
          
  1793. 
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
          
  1794. 
=======
          
  1795. 
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
  1796. 
>>>>>>> 9c0d812 (Featire specs)
=======
          
  1797. 
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
=======
          
  1798. 
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ebcdce06 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
>>>>>>> df37394 (Featire specs)
>>>>>>> f92a45b (Featire specs)
>>>>>>> e6fc67c7 (Featire specs)
          
  1799. 
=======
          
  1800. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  1801. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  1802. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 84003439 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
=======
>>>>>>> afa56d1 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0f24a043 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
>>>>>>> afa56d1 (Featire specs)
>>>>>>> e1ecabbe (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9bfbd88 (Featire specs)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 610b6138 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
<<<<<<< HEAD
=======
>>>>>>> c51bf93 (Featire specs)
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> c51bf93 (Featire specs)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
>>>>>>> 74240509 (Fix book_spec decrease quantity and price)
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 9bfbd88 (Featire specs)
<<<<<<< HEAD
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 6da9530 (Featire specs)
=======
=======
          
  1803. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> 21873de0 (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bb5c652 (Fix book_spec decrease quantity and price)
=======
=======
          
  1804. 
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> 9a49b7b (Rebased)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
          
  1805. 
>>>>>>> c033601 (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 7b22ad7e (Featire specs)
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 7b22ad7e (Featire specs)
=======
>>>>>>> b97bb382 (Featire specs)
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
=======
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> 973ba8c (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bf05825 (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
>>>>>>> c12b71de (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
>>>>>>> 3cf8dd4 (Featire specs)
>>>>>>> aa4361fd (Featire specs)
          
  1806. 
=======
          
  1807. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 7b22ad7e (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ae07231a (Featire specs)
=======
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
=======
=======
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
>>>>>>> 3cf8dd4 (Featire specs)
>>>>>>> aa4361fd (Featire specs)
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 70fcacc (Featire specs)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 009401d (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
          
  1808. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c12b71de (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> c12b71de (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
>>>>>>> ae409ca (Featire specs)
=======
>>>>>>> c8da2e3 (Fix)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
=======
=======
          
  1809. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
>>>>>>> 379a979 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
>>>>>>> adc21e0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 9440753 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
=======
          
  1810. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
=======
=======
          
  1811. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4d90e3d (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e18eb87 (Fix)
=======
=======
          
  1812. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  1813. 
>>>>>>> a5d032d (Fix)
>>>>>>> 160fb15 (Fix)
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 557c1b8 (Fix)
=======
          
  1814. 
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
  1815. 
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> ae884b47 (Fix)
=======
=======
=======
=======
=======
          
  1816. 
>>>>>>> a5d032d (Fix)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
  1817. 
>>>>>>> a5d032d (Fix)
>>>>>>> e3e66f3 (Featire specs)
=======
          
  1818. 
=======
          
  1819. 
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376a (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
  1820. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0ea (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
  1821. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888bf (Featire specs)
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
  1822. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 74240509 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
  1823. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
=======
          
  1824. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a1a479e2 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
  1825. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 393eff3b (Featire specs)
=======
=======
=======
=======
          
  1826. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  1827. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
>>>>>>> d9d85ca6 (Fix)
=======
          
  1828. 
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 9bfbd88 (Featire specs)
>>>>>>> ebcdce06 (Featire specs)
=======
>>>>>>> adc21e0 (Featire specs)
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> 6b6d1c2d (Featire specs)
>>>>>>> adc21e0 (Featire specs)
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 9440753 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
  1829. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
  1830. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4d90e3d (Featire specs)
<<<<<<< HEAD
>>>>>>> 37e48018 (Featire specs)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
  1831. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  1832. 
>>>>>>> a5d032d (Fix)
>>>>>>> 160fb15 (Fix)
<<<<<<< HEAD
>>>>>>> 31d15e66 (Fix)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 557c1b8 (Fix)
=======
          
  1833. 
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> fdab719f (Fix)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
  1834. 
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> 8288136d (Fix)
=======
=======
=======
=======
=======
          
  1835. 
>>>>>>> a5d032d (Fix)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
  1836. 
>>>>>>> a5d032d (Fix)
>>>>>>> e3e66f3 (Featire specs)
=======
          
  1837. 
=======
          
  1838. 
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> d52f9efe (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
  1839. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
  1840. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> c12b71de (Featire specs)
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
  1841. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
  1842. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
=======
          
  1843. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
  1844. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b904d7ae (Featire specs)
=======
=======
=======
=======
          
  1845. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  1846. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
>>>>>>> ef483b6d (Fix)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 15c51b7 (Featire specs)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  1847. 
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
  1848. 
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 0c57e4e (Fix)
<<<<<<< HEAD
>>>>>>> 8887ba5b (Fix)
=======
=======
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
          
  1849. 
=======
          
  1850. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5e31aeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 53db2224 (Featire specs)
=======
=======
=======
=======
=======
          
  1851. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
=======
=======
          
  1852. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
=======
=======
=======
          
  1853. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0f24a043 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
=======
          
  1854. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
=======
=======
=======
          
  1855. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> b8c2784f (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
=======
          
  1856. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 392646b5 (Featire specs)
=======
=======
=======
=======
=======
          
  1857. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
  1858. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            
            

            

            
          
    1859. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  1859. 
            11
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> c51bf93 (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> bf05825 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> c51bf93 (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> bf05825 (Featire specs)
=======
>>>>>>> f92a45b (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0c57e4e (Fix)
=======
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 973ba8c (Featire specs)
=======
>>>>>>> 8181d13 (Featire specs)
=======
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 72b9cab (Featire specs)
=======
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 15c51b7 (Featire specs)
=======
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9e081dc (Fix)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
=======
=======
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  1860. 
            11
=======
=======
>>>>>>> 9a49b7b (Rebased)
=======
>>>>>>> 70fcacc (Featire specs)
=======
>>>>>>> ae409ca (Featire specs)
=======
>>>>>>> 379a979 (Featire specs)
=======
>>>>>>> adc21e0 (Featire specs)
=======
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4d90e3d (Featire specs)
=======
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 160fb15 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4d90e3d (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 160fb15 (Fix)
>>>>>>> 67ab5299 (Fix)
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
=======
=======
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
=======
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
=======
          
  1861. 
            11
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
=======
=======
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
=======
=======
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> bf05825 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
=======
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
>>>>>>> b28889f (Fix)
>>>>>>> e18eb87 (Fix)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 0c57e4e (Fix)
=======
=======
>>>>>>> 5507b42 (Featire specs)
>>>>>>> 5e31aeb (Featire specs)
=======
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> 51bc18c (Featire specs)
=======
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> 973ba8c (Featire specs)
=======
=======
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
=======
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
=======
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
=======
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
          
  1862. 
>>>>>>> 84003439 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> ebcdce06 (Featire specs)
          
  1863. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  1864. 
=======
          
  1865. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  1866. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  1867. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
            7
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9bfbd88 (Featire specs)
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> 9bfbd88 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 9bfbd88 (Featire specs)
>>>>>>> f7852d17 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 84003439 (Featire specs)
>>>>>>> 9bfbd88 (Featire specs)
<<<<<<< HEAD
=======
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> c12b71de (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
>>>>>>> 51bc18c (Featire specs)
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
>>>>>>> 4a2f2ad8 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> 8181d13 (Featire specs)
>>>>>>> 4a2f2ad8 (Featire specs)
          
  1868. 
            11
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9a49b7b (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b904d7ae (Featire specs)
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
>>>>>>> b904d7ae (Featire specs)
=======
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 6da9530 (Featire specs)
>>>>>>> 0f8241bb (Featire specs)
          
  1869. 
            11
>>>>>>> c033601 (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
          
  1870. 
            11
=======
          
  1871. 
            11
>>>>>>> 9620751 (Featire specs)
=======
          
  1872. 
            7
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
=======
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> d52f9efe (Featire specs)
=======
=======
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> 77d62af (Featire specs)
>>>>>>> ae07231a (Featire specs)
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 70fcacc (Featire specs)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 009401d (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
          
  1873. 
            7
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c12b71de (Featire specs)
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
=======
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> 77d62af (Featire specs)
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> c12b71de (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> efd6af09 (Featire specs)
>>>>>>> ae409ca (Featire specs)
=======
>>>>>>> c8da2e3 (Fix)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
          
  1874. 
            7
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 379a979 (Featire specs)
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
=======
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
          
  1875. 
            7
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> 74240509 (Fix book_spec decrease quantity and price)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
>>>>>>> adc21e0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
=======
=======
>>>>>>> df37394 (Featire specs)
          
  1876. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  1877. 
=======
          
  1878. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  1879. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  1880. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
=======
=======
          
  1881. 
>>>>>>> 0d6dd12 (Manifest_cache true)
            7
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
=======
          
  1882. 
            7
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4d90e3d (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
  1883. 
            7
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
=======
          
  1884. 
            7
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
  1885. 
            7
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> e3e66f3 (Featire specs)
=======
          
  1886. 
            11
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 160fb15 (Fix)
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 932dbec (Featire specs)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
          
  1887. 
            7
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> ae884b47 (Fix)
=======
=======
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376a (Featire specs)
=======
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0ea (Featire specs)
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888bf (Featire specs)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 74240509 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a1a479e2 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> fdab719f (Fix)
=======
=======
          
  1888. 
            7
<<<<<<< HEAD
>>>>>>> 4552227 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 379a979 (Featire specs)
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
=======
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
          
  1889. 
            7
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> adc21e0 (Featire specs)
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
=======
=======
>>>>>>> df37394 (Featire specs)
          
  1890. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  1891. 
=======
          
  1892. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  1893. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  1894. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
=======
=======
          
  1895. 
>>>>>>> 0d6dd12 (Manifest_cache true)
            7
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
  1896. 
            7
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4d90e3d (Featire specs)
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
  1897. 
            7
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
=======
          
  1898. 
            7
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
  1899. 
            7
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> e3e66f3 (Featire specs)
=======
          
  1900. 
            11
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 160fb15 (Fix)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
=======
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 932dbec (Featire specs)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
          
  1901. 
            7
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
=======
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  1902. 
            7
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
=======
          
  1903. 
            7
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
=======
          
  1904. 
            15
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
          
  1905. 
            11
>>>>>>> c033601 (Rebased)
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
          
  1906. 
            11
=======
          
  1907. 
            11
>>>>>>> 9620751 (Featire specs)
=======
          
  1908. 
            11
>>>>>>> 2a25e4c (Featire specs)
=======
          
  1909. 
            7
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 6da9530 (Featire specs)
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
          
  1910. 
            7
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0ed7f7c (Featire specs)
=======
=======
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
=======
          
  1911. 
            7
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
          
  1912. 
            7
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
          
  1913. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  1914. 
=======
          
  1915. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  1916. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  1917. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
            7
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
=======
          
  1918. 
            7
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
  1919. 
            7
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
  1920. 
            11
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> e18eb87 (Fix)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 659083f (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
          
  1921. 
            7
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 0c57e4e (Fix)
=======
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5e31aeb (Featire specs)
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 51bc18c (Featire specs)
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 973ba8c (Featire specs)
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
  1922. 
            7
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
=======
=======
=======
=======
          
  1923. 
            7
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  1924. 
            15
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
=======
=======
>>>>>>> a636fda (Featire specs)
=======
=======
          
  1925. 
            7
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
=======
=======
=======
=======
          
  1926. 
            7
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
=======
          
  1927. 
            7
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
=======
=======
=======
=======
          
  1928. 
            7
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
          
  1929. 
            7
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
            

            

>>>>>>> 610b6138 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 393eff3b (Featire specs)
=======
=======
=======
=======
          
  1930. 
            7
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  1931. 
            15
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
>>>>>>> d9d85ca6 (Fix)
=======
          
  1932. 
            11
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> 9bfbd88 (Featire specs)
>>>>>>> ebcdce06 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                if book.nil?
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 9e081dc (Fix)
=======
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 15c51b7 (Featire specs)
=======
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 72b9cab (Featire specs)
=======
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8181d13 (Featire specs)
=======
>>>>>>> 973ba8c (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 0c57e4e (Fix)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> bf05825 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> bf05825 (Featire specs)
=======
<<<<<<< HEAD
=======
=======
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> f8e5c9db (Featire specs)
<<<<<<< HEAD
=======
=======
=======
>>>>>>> e18eb87 (Fix)
>>>>>>> 99dad91f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> 2274daf2 (Featire specs)
>>>>>>> c8da2e3 (Fix)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
>>>>>>> 9440753 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> 8887ba5b (Fix)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> 53db2224 (Featire specs)
>>>>>>> 557c1b8 (Fix)
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> bf05825 (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
=======
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
>>>>>>> b904d7ae (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
=======
>>>>>>> ef483b6d (Fix)
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b904d7ae (Featire specs)
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> c8da2e3 (Fix)
>>>>>>> fdab719f (Fix)
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 557c1b8 (Fix)
>>>>>>> 8288136d (Fix)
=======
=======
>>>>>>> ae07231a (Featire specs)
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> d52f9efe (Featire specs)
=======
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c12b71de (Featire specs)
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
>>>>>>> c12b71de (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
>>>>>>> b904d7ae (Featire specs)
=======
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 0c57e4e (Fix)
<<<<<<< HEAD
>>>>>>> 8887ba5b (Fix)
=======
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5e31aeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 53db2224 (Featire specs)
=======
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0f24a043 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> b8c2784f (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 392646b5 (Featire specs)
=======
=======
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
                if book.nil?
=======
                redirect_to books_path if @book.nil?
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 53db2224 (Featire specs)
=======
>>>>>>> 7b22ad7e (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> 5507b42 (Featire specs)
>>>>>>> 932dbec (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
>>>>>>> 5507b42 (Featire specs)
>>>>>>> 5e31aeb (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 53db2224 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 7b22ad7e (Featire specs)
                redirect_to books_path if @book.nil?
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
=======
=======
                redirect_to books_path if @book.nil?
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                redirect_to books_path if @book.nil?
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fdab719f (Fix)
=======
=======
                redirect_to books_path if @book.nil?
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                redirect_to books_path if @book.nil?
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
                redirect_to books_path if @book.nil?
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c12b71de (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
                redirect_to books_path if @book.nil?
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
<<<<<<< HEAD
=======
                redirect_to books_path if @book.nil?
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
<<<<<<< HEAD
=======
                redirect_to books_path if @book.nil?
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
                redirect_to books_path if @book.nil?
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
                redirect_to books_path if @book.nil?
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> d8abfed3 (Featire specs)
=======
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
<<<<<<< HEAD
=======
                redirect_to books_path if @book.nil?
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
<<<<<<< HEAD
=======
                redirect_to books_path if @book.nil?
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
                redirect_to books_path if @book.nil?
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> a1a479e2 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 393eff3b (Featire specs)
=======
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
>>>>>>> b904d7ae (Featire specs)
=======
                if book.nil?
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
=======
>>>>>>> 5a2009f1 (Fix)
=======
>>>>>>> ae884b47 (Fix)
=======
>>>>>>> f136376a (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
                redirect_to books_path if @book.nil?
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 557c1b8 (Fix)
>>>>>>> 8288136d (Fix)
=======
>>>>>>> d52f9efe (Featire specs)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
=======
                redirect_to books_path if @book.nil?
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
=======
                redirect_to books_path if @book.nil?
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> ae884b47 (Fix)
=======
=======
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376a (Featire specs)
=======
=======
=======
=======
=======
>>>>>>> 9620751 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 9620751 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                redirect_to books_path if @book.nil?
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0ea (Featire specs)
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888bf (Featire specs)
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                redirect_to books_path if @book.nil?
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 74240509 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
                redirect_to books_path if @book.nil?
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a1a479e2 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
                redirect_to books_path if @book.nil?
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 393eff3b (Featire specs)
=======
=======
=======
=======
                redirect_to books_path if @book.nil?
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price)
=======
=======
=======
                if book.nil?
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
>>>>>>> d9d85ca6 (Fix)
=======
=======
                redirect_to books_path if @book.nil?
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 610b6138 (Featire specs)
=======
=======
                redirect_to books_path if @book.nil?
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
=======
                redirect_to books_path if @book.nil?
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 37e48018 (Featire specs)
=======
=======
                redirect_to books_path if @book.nil?
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
                if book.nil?
>>>>>>> a5d032d (Fix)
>>>>>>> 31d15e66 (Fix)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> fdab719f (Fix)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
=======
                redirect_to books_path if @book.nil?
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
                redirect_to books_path if @book.nil?
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> 8288136d (Fix)
=======
=======
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> d52f9efe (Featire specs)
=======
=======
=======
=======
=======
>>>>>>> 9620751 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 9620751 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                redirect_to books_path if @book.nil?
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> c12b71de (Featire specs)
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                redirect_to books_path if @book.nil?
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
                redirect_to books_path if @book.nil?
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
                redirect_to books_path if @book.nil?
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b904d7ae (Featire specs)
=======
=======
=======
=======
                redirect_to books_path if @book.nil?
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
=======
=======
=======
                if book.nil?
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
>>>>>>> ef483b6d (Fix)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
                redirect_to books_path if @book.nil?
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
                redirect_to books_path if @book.nil?
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
                redirect_to books_path if @book.nil?
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
=======
                redirect_to books_path if @book.nil?
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
                redirect_to books_path if @book.nil?
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                redirect_to books_path if @book.nil?
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                if book.nil?
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
=======
                redirect_to books_path if @book.nil?
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
=======
                redirect_to books_path if @book.nil?
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 0c57e4e (Fix)
<<<<<<< HEAD
>>>>>>> 8887ba5b (Fix)
=======
=======
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5e31aeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 53db2224 (Featire specs)
=======
=======
=======
=======
=======
                redirect_to books_path if @book.nil?
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
=======
=======
=======
                redirect_to books_path if @book.nil?
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0f24a043 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
=======
                redirect_to books_path if @book.nil?
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> b8c2784f (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
=======
                redirect_to books_path if @book.nil?
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 392646b5 (Featire specs)
=======
=======
=======
=======
=======
                redirect_to books_path if @book.nil?
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
                if book.nil?
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
                redirect_to books_path if @book.nil?
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
=======
                redirect_to books_path if @book.nil?
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
=======
                redirect_to books_path if @book.nil?
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
    1933. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> 009401d (Featire specs)
=======
=======
=======
>>>>>>> f92a45b (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0c57e4e (Fix)
=======
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 973ba8c (Featire specs)
=======
>>>>>>> 8181d13 (Featire specs)
=======
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 72b9cab (Featire specs)
=======
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 15c51b7 (Featire specs)
=======
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9e081dc (Fix)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> e18eb87 (Fix)
=======
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> f92a45b (Featire specs)
          
  1933. 
>>>>>>> 0ed7f7c (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
=======
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
=======
=======
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
=======
=======
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> bf05825 (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 0c57e4e (Fix)
=======
=======
>>>>>>> 5507b42 (Featire specs)
>>>>>>> 5e31aeb (Featire specs)
=======
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> 51bc18c (Featire specs)
=======
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> 973ba8c (Featire specs)
=======
=======
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
=======
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
=======
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
=======
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
          
  1934. 
=======
>>>>>>> 824bb2b (Featire specs)
=======
          
  1935. 
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
=======
>>>>>>> df37394 (Featire specs)
>>>>>>> c51bf93 (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
=======
=======
>>>>>>> df37394 (Featire specs)
>>>>>>> f92a45b (Featire specs)
          
  1936. 
=======
          
  1937. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  1938. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  1939. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> f92a45b (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
=======
          
  1940. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> e18eb87 (Fix)
=======
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0c57e4e (Fix)
=======
>>>>>>> 5e31aeb (Featire specs)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 6da9530 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
=======
>>>>>>> b28889f (Fix)
>>>>>>> e18eb87 (Fix)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 659083f (Featire specs)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
=======
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 0c57e4e (Fix)
=======
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5e31aeb (Featire specs)
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 51bc18c (Featire specs)
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 973ba8c (Featire specs)
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
=======
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
          
  1941. 
            
            

            

                  redirect_to books_path
          
    1942. 
        
    
      
        
    
          
  1942. 
            
            

            

                else
          
    1943. 
        
    
      
        
    
          
  1943. 
            15
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
                  @reviews = ReviewDecorator.decorate_collection(Review.where(book_id: book.id).order(created_at: :desc))
=======
=======
                  @reviews = ReviewDecorator.decorate_collection(Review.where(book_id: book.id).order(created_at: :desc))
          
    1944. 
        
    
      
        
    
          
  1944. 
            15
            

            

>>>>>>> a5d032d (Fix)
                  @book = book.decorate
>>>>>>> e18eb87 (Fix)
          
    1945. 
        
    
      
        
    
<<<<<<< HEAD
          
  1945. 
            11
            

            

>>>>>>> a5d032d (Fix)
                  @book = book.decorate
=======
=======
>>>>>>> c4adab0 (Featire specs)
=======
=======
                redirect_to books_path if @book.nil?
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54deeb (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
=======
                redirect_to books_path if @book.nil?
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
                  @book = book.decorate
>>>>>>> 6da9530 (Featire specs)
          
    1946. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
          
  1946. 
=======
          
  1947. 
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
=======
          
  1948. 
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
            
            

            

                end
          
    1949. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  1949. 
<<<<<<< HEAD
=======
=======
>>>>>>> 9a49b7b (Rebased)
=======
>>>>>>> 70fcacc (Featire specs)
=======
>>>>>>> ae409ca (Featire specs)
=======
>>>>>>> 379a979 (Featire specs)
=======
>>>>>>> adc21e0 (Featire specs)
=======
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4d90e3d (Featire specs)
=======
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 160fb15 (Fix)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> 009401d (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
=======
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
=======
=======
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
=======
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
          
  1950. 
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
>>>>>>> c51bf93 (Featire specs)
          
  1951. 
=======
          
  1952. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  1953. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  1954. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
=======
          
  1955. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
<<<<<<< HEAD
=======
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
>>>>>>> 5a2009f1 (Fix)
=======
>>>>>>> ebcdce06 (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 31d15e66 (Fix)
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
  1956. 
            
            

            

                  redirect_to books_path
          
    1957. 
        
    
      
        
    
          
  1957. 
            
            

            

                else
          
    1958. 
        
    
      
        
    
          
  1958. 
            11
            

            

<<<<<<< HEAD
=======
                  @reviews = ReviewDecorator.decorate_collection(Review.where(book_id: book.id).order(created_at: :desc))
          
    1959. 
        
    
      
        
    
          
  1959. 
            11
            

            

>>>>>>> a5d032d (Fix)
                  @book = book.decorate
=======
=======
>>>>>>> c4adab0 (Featire specs)
=======
=======
                redirect_to books_path if @book.nil?
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54deeb (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
=======
                redirect_to books_path if @book.nil?
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
                if book.nil?
>>>>>>> c7a726c5 (Rebased)
          
    1960. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  1960. 
=======
          
  1961. 
>>>>>>> a5d032d (Fix)
            
            

            

                end
          
    1962. 
        
    
      
        
    
<<<<<<< HEAD
          
  1962. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
=======
>>>>>>> 9a49b7b (Rebased)
=======
>>>>>>> 70fcacc (Featire specs)
=======
>>>>>>> ae409ca (Featire specs)
=======
>>>>>>> 379a979 (Featire specs)
=======
>>>>>>> adc21e0 (Featire specs)
=======
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4d90e3d (Featire specs)
=======
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 160fb15 (Fix)
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4d90e3d (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 160fb15 (Fix)
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
=======
=======
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
<<<<<<< HEAD
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
          
  1963. 
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 5b7749a (Fix)
          
  1964. 
>>>>>>> b904d7ae (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 5b7749a (Fix)
=======
=======
<<<<<<< HEAD
>>>>>>> ebcdce06 (Featire specs)
          
  1965. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  1966. 
=======
          
  1967. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  1968. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  1969. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9bfbd88 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 9bfbd88 (Featire specs)
>>>>>>> f7852d17 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
>>>>>>> 9bfbd88 (Featire specs)
<<<<<<< HEAD
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
  1970. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> bb5c652 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a636fda (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> ae884b47 (Fix)
=======
=======
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376a (Featire specs)
=======
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0ea (Featire specs)
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4bf888bf (Featire specs)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 74240509 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a1a479e2 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 393eff3b (Featire specs)
=======
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
>>>>>>> d9d85ca6 (Fix)
=======
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> a5d032d (Fix)
>>>>>>> 31d15e66 (Fix)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> 8288136d (Fix)
=======
=======
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> d52f9efe (Featire specs)
=======
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
>>>>>>> c12b71de (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b904d7ae (Featire specs)
=======
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
>>>>>>> ef483b6d (Fix)
          
  1971. 
            
            

            

                  redirect_to books_path
          
    1972. 
        
    
      
        
    
          
  1972. 
            
            

            

                else
          
    1973. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
          
  1973. 
            15
=======
          
  1974. 
            11
>>>>>>> c7a726c5 (Rebased)
=======
          
  1975. 
            15
>>>>>>> ef483b6d (Fix)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 31d15e66 (Fix)
=======
                  @reviews = ReviewDecorator.decorate_collection(Review.where(book_id: book.id).order(created_at: :desc))
          
    1976. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
          
  1976. 
            15
=======
          
  1977. 
            11
>>>>>>> 31d15e66 (Fix)
=======
          
  1978. 
            15
>>>>>>> ef483b6d (Fix)
            

            

>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
=======
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> 31d15e66 (Fix)
                  @book = book.decorate
          
    1979. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 31d15e66 (Fix)
          
  1979. 
=======
          
  1980. 
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
=======
          
  1981. 
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> 31d15e66 (Fix)
            
            

            

                end
          
    1982. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 31d15e66 (Fix)
=======
>>>>>>> ef483b6d (Fix)
=======
=======
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
>>>>>>> 9e081dc (Fix)
>>>>>>> 1049b80c (Fix)
          
  1982. 
<<<<<<< HEAD
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 9a49b7b (Rebased)
=======
=======
<<<<<<< HEAD
>>>>>>> c033601 (Rebased)
>>>>>>> 824bb2b (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
          
  1983. 
<<<<<<< HEAD
>>>>>>> c033601 (Rebased)
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
          
  1984. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 7b22ad7e (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ae07231a (Featire specs)
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
=======
=======
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
>>>>>>> 3cf8dd4 (Featire specs)
>>>>>>> aa4361fd (Featire specs)
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 70fcacc (Featire specs)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 009401d (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
          
  1985. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c12b71de (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> c12b71de (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
>>>>>>> ae409ca (Featire specs)
=======
>>>>>>> c8da2e3 (Fix)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
=======
=======
          
  1986. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 99dad91f (Fix)
=======
=======
>>>>>>> 8181d13 (Featire specs)
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
>>>>>>> 8181d13 (Featire specs)
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
>>>>>>> afa56d1 (Featire specs)
>>>>>>> e1ecabbe (Featire specs)
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 379a979 (Featire specs)
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
>>>>>>> e18eb87 (Fix)
=======
=======
          
  1987. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
>>>>>>> 74240509 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> e1ecabbe (Featire specs)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
>>>>>>> adc21e0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> e18eb87 (Fix)
=======
=======
          
  1988. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 72b9cab (Featire specs)
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> e18eb87 (Fix)
=======
=======
          
  1989. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4d90e3d (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e18eb87 (Fix)
=======
=======
          
  1990. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  1991. 
>>>>>>> a5d032d (Fix)
>>>>>>> 160fb15 (Fix)
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
  1992. 
<<<<<<< HEAD
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
  1993. 
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> ae884b47 (Fix)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
  1994. 
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376a (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
  1995. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0ea (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
  1996. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888bf (Featire specs)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
  1997. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
  1998. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 74240509 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
  1999. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
=======
          
  2000. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a1a479e2 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
  2001. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 393eff3b (Featire specs)
=======
=======
=======
=======
          
  2002. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  2003. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
>>>>>>> d9d85ca6 (Fix)
=======
          
  2004. 
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> 9bfbd88 (Featire specs)
>>>>>>> ebcdce06 (Featire specs)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 379a979 (Featire specs)
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
  2005. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> adc21e0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 610b6138 (Featire specs)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
  2006. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
  2007. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4d90e3d (Featire specs)
<<<<<<< HEAD
>>>>>>> 37e48018 (Featire specs)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
  2008. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  2009. 
>>>>>>> a5d032d (Fix)
>>>>>>> 160fb15 (Fix)
<<<<<<< HEAD
>>>>>>> 31d15e66 (Fix)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
  2010. 
<<<<<<< HEAD
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> fdab719f (Fix)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
  2011. 
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> 8288136d (Fix)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
  2012. 
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> d52f9efe (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
  2013. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
  2014. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> c12b71de (Featire specs)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
  2015. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
  2016. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
  2017. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
=======
          
  2018. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
  2019. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b904d7ae (Featire specs)
=======
=======
=======
=======
          
  2020. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  2021. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
>>>>>>> ef483b6d (Fix)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 15c51b7 (Featire specs)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  2022. 
<<<<<<< HEAD
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
  2023. 
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 0c57e4e (Fix)
<<<<<<< HEAD
>>>>>>> 8887ba5b (Fix)
=======
=======
=======
=======
=======
          
  2024. 
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5e31aeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 53db2224 (Featire specs)
=======
=======
=======
=======
=======
          
  2025. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
=======
=======
          
  2026. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
=======
=======
=======
          
  2027. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
=======
=======
=======
          
  2028. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0f24a043 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
=======
          
  2029. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
=======
=======
=======
          
  2030. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> b8c2784f (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
=======
          
  2031. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 392646b5 (Featire specs)
=======
=======
=======
=======
=======
          
  2032. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
  2033. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            
            

            

              end
          
    2034. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  2034. 
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> c51bf93 (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> bf05825 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> c51bf93 (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> bf05825 (Featire specs)
=======
>>>>>>> f92a45b (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0c57e4e (Fix)
=======
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 973ba8c (Featire specs)
=======
>>>>>>> 8181d13 (Featire specs)
=======
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 72b9cab (Featire specs)
=======
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 15c51b7 (Featire specs)
=======
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9e081dc (Fix)
=======
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
          
  2035. 
>>>>>>> 2a25e4c (Featire specs)
>>>>>>> 216fe41 (Featire specs)
=======
          
  2036. 
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
=======
=======
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  2037. 
=======
=======
>>>>>>> 9a49b7b (Rebased)
=======
>>>>>>> 70fcacc (Featire specs)
=======
>>>>>>> ae409ca (Featire specs)
=======
>>>>>>> 379a979 (Featire specs)
=======
>>>>>>> adc21e0 (Featire specs)
=======
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4d90e3d (Featire specs)
=======
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 160fb15 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4d90e3d (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 160fb15 (Fix)
>>>>>>> 67ab5299 (Fix)
<<<<<<< HEAD
=======
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 7a08014b (Featire specs)
=======
>>>>>>> e6fc67c7 (Featire specs)
>>>>>>> c8da2e3 (Fix)
=======
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
>>>>>>> c51bf93 (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
>>>>>>> b28889f (Fix)
>>>>>>> e18eb87 (Fix)
=======
=======
>>>>>>> df37394 (Featire specs)
>>>>>>> f92a45b (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
          
  2038. 
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
          
  2039. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
          
  2040. 
=======
          
  2041. 
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
          
  2042. 
>>>>>>> 94841b5 (Featire specs)
=======
          
  2043. 
=======
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
          
  2044. 
=======
          
  2045. 
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
          
  2046. 
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
>>>>>>> 94841b5 (Featire specs)
=======
          
  2047. 
>>>>>>> b904d7ae (Featire specs)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
  2048. 
>>>>>>> 3b03895 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
          
  2049. 
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
  2050. 
>>>>>>> e54deeb (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
          
  2051. 
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
  2052. 
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
>>>>>>> 9c0d812 (Featire specs)
=======
          
  2053. 
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
          
  2054. 
>>>>>>> 34509eee (Featire specs)
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  2055. 
=======
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
          
  2056. 
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
          
  2057. 
=======
          
  2058. 
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
  2059. 
>>>>>>> 9c0d812 (Featire specs)
=======
          
  2060. 
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
=======
          
  2061. 
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
=======
          
  2062. 
=======
=======
>>>>>>> 610b6138 (Featire specs)
<<<<<<< HEAD
=======
=======
>>>>>>> 009401d (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> c8da2e3 (Fix)
>>>>>>> fdab719f (Fix)
=======
>>>>>>> c51bf93 (Featire specs)
>>>>>>> 7a08014b (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
>>>>>>> efd6af09 (Featire specs)
          
  2063. 
=======
=======
=======
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
          
  2064. 
=======
=======
          
  2065. 
=======
          
  2066. 
>>>>>>> 3b03895 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
          
  2067. 
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
  2068. 
>>>>>>> e54deeb (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
          
  2069. 
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
  2070. 
>>>>>>> 9c0d812 (Featire specs)
=======
          
  2071. 
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
          
  2072. 
=======
          
  2073. 
>>>>>>> 9c0d812 (Featire specs)
=======
          
  2074. 
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> 5506bd0 (Featire specs)
=======
          
  2075. 
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  2076. 
=======
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
          
  2077. 
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1d59aaa (Fix)
          
  2078. 
=======
          
  2079. 
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
          
  2080. 
>>>>>>> 94841b5 (Featire specs)
=======
          
  2081. 
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
  2082. 
>>>>>>> 3b03895 (Featire specs)
=======
          
  2083. 
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
  2084. 
>>>>>>> e54deeb (Featire specs)
=======
          
  2085. 
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
  2086. 
>>>>>>> 9c0d812 (Featire specs)
=======
          
  2087. 
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
=======
          
  2088. 
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
          
  2089. 
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 904663c (Featire specs)
          
  2090. 
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
          
  2091. 
=======
          
  2092. 
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
  2093. 
>>>>>>> 9c0d812 (Featire specs)
=======
          
  2094. 
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
=======
          
  2095. 
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ebcdce06 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
>>>>>>> df37394 (Featire specs)
>>>>>>> f92a45b (Featire specs)
>>>>>>> e6fc67c7 (Featire specs)
          
  2096. 
=======
          
  2097. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  2098. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  2099. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 84003439 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
=======
>>>>>>> afa56d1 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0f24a043 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
>>>>>>> afa56d1 (Featire specs)
>>>>>>> e1ecabbe (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9bfbd88 (Featire specs)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 610b6138 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
<<<<<<< HEAD
=======
>>>>>>> c51bf93 (Featire specs)
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> c51bf93 (Featire specs)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
>>>>>>> 74240509 (Fix book_spec decrease quantity and price)
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 9bfbd88 (Featire specs)
<<<<<<< HEAD
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 6da9530 (Featire specs)
=======
=======
          
  2100. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> 21873de0 (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bb5c652 (Fix book_spec decrease quantity and price)
=======
=======
          
  2101. 
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> 9a49b7b (Rebased)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
          
  2102. 
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
          
  2103. 
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
          
  2104. 
>>>>>>> c033601 (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 0676508 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
>>>>>>> 6cdb2e1 (Featire specs)
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
>>>>>>> 3cf8dd4 (Featire specs)
>>>>>>> aa4361fd (Featire specs)
          
  2105. 
=======
          
  2106. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
=======
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
>>>>>>> 3cf8dd4 (Featire specs)
>>>>>>> aa4361fd (Featire specs)
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 70fcacc (Featire specs)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 009401d (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
          
  2107. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
>>>>>>> ae409ca (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> c8da2e3 (Fix)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
=======
=======
          
  2108. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
>>>>>>> 379a979 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
>>>>>>> adc21e0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 9440753 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
=======
          
  2109. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
=======
=======
          
  2110. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4d90e3d (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e18eb87 (Fix)
=======
=======
          
  2111. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  2112. 
>>>>>>> a5d032d (Fix)
>>>>>>> 160fb15 (Fix)
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 557c1b8 (Fix)
=======
          
  2113. 
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
  2114. 
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> ae884b47 (Fix)
=======
=======
=======
=======
=======
          
  2115. 
>>>>>>> a5d032d (Fix)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
  2116. 
>>>>>>> a5d032d (Fix)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
          
  2117. 
=======
          
  2118. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376a (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
  2119. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0ea (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
  2120. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888bf (Featire specs)
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
  2121. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 74240509 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
  2122. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
=======
          
  2123. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a1a479e2 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
  2124. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 393eff3b (Featire specs)
=======
=======
=======
=======
          
  2125. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  2126. 
            
            

            

            end
          
    2127.

app/controllers/coupons_controller.rb

100.0% lines covered

8 relevant lines. 8 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            require_relative '../services/coupon_service'
          
    2. 
        
    
      
        
    
          
  2. 
            
            

            

            
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

            class CouponsController < ApplicationController
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              def find
          
    5. 
        
    
      
        
    
          
  5. 
            4
            

            

                coupon = Coupon.find_by(code: params[:code])
          
    6. 
        
    
      
        
    
          
  6. 
            4
            

            

                order = Order.find(session[:order_id])
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

            
          
    8. 
        
    
      
        
    
          
  8. 
            4
            

            

                respond_to do |format|
          
    9. 
        
    
      
        
    
          
  9. 
            4
            

            

                  format.json do
          
    10. 
        
    
      
        
    
          
  10. 
            4
            

            

                    render json: CouponService.find_coupon(params, order, coupon)
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

                  end
          
    12. 
        
    
      
        
    
          
  12. 
            
            

            

                end
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

              end
          
    14. 
        
    
      
        
    
          
  14. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
>>>>>>> d9d85ca6 (Fix)
=======
          
  15. 
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 9bfbd88 (Featire specs)
>>>>>>> ebcdce06 (Featire specs)
=======
>>>>>>> adc21e0 (Featire specs)
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> 6b6d1c2d (Featire specs)
>>>>>>> adc21e0 (Featire specs)
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 9440753 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
  16. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
  17. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4d90e3d (Featire specs)
<<<<<<< HEAD
>>>>>>> 37e48018 (Featire specs)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
  18. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  19. 
>>>>>>> a5d032d (Fix)
>>>>>>> 160fb15 (Fix)
<<<<<<< HEAD
>>>>>>> 31d15e66 (Fix)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 557c1b8 (Fix)
=======
          
  20. 
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> fdab719f (Fix)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
  21. 
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> 8288136d (Fix)
=======
=======
=======
=======
=======
          
  22. 
>>>>>>> a5d032d (Fix)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
  23. 
>>>>>>> a5d032d (Fix)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
          
  24. 
=======
          
  25. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> d52f9efe (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
  26. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
  27. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> c12b71de (Featire specs)
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
  28. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
  29. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
=======
          
  30. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
  31. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b904d7ae (Featire specs)
=======
=======
=======
=======
          
  32. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  33. 
            
            

            

            end
          
    34.

app/controllers/coupons_controller.rb

100.0% lines covered

8 relevant lines. 8 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            require_relative '../services/coupon_service'
          
    2. 
        
    
      
        
    
          
  2. 
            
            

            

            
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

            class CouponsController < ApplicationController
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              def find
          
    5. 
        
    
      
        
    
          
  5. 
            4
            

            

                coupon = Coupon.find_by(code: params[:code])
          
    6. 
        
    
      
        
    
          
  6. 
            4
            

            

                order = Order.find(session[:order_id])
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

            
          
    8. 
        
    
      
        
    
          
  8. 
            4
            

            

                respond_to do |format|
          
    9. 
        
    
      
        
    
          
  9. 
            4
            

            

                  format.json do
          
    10. 
        
    
      
        
    
          
  10. 
            4
            

            

                    render json: CouponService.find_coupon(params, order, coupon)
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

                  end
          
    12. 
        
    
      
        
    
          
  12. 
            
            

            

                end
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

              end
          
    14. 
        
    
      
        
    
          
  14. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
>>>>>>> ef483b6d (Fix)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 15c51b7 (Featire specs)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  15. 
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
  16. 
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 0c57e4e (Fix)
<<<<<<< HEAD
>>>>>>> 8887ba5b (Fix)
=======
=======
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
          
  17. 
=======
          
  18. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5e31aeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 53db2224 (Featire specs)
=======
=======
=======
=======
=======
          
  19. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
=======
=======
          
  20. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
=======
=======
=======
          
  21. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0f24a043 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
=======
          
  22. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
=======
=======
=======
          
  23. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> b8c2784f (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
=======
          
  24. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 392646b5 (Featire specs)
=======
=======
=======
=======
=======
          
  25. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
  26. 
            
            

            

            end
          
    27.

app/controllers/coupons_controller.rb

100.0% lines covered

8 relevant lines. 8 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            require_relative '../services/coupon_service'
          
    2. 
        
    
      
        
    
          
  2. 
            
            

            

            
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

            class CouponsController < ApplicationController
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              def find
          
    5. 
        
    
      
        
    
          
  5. 
            4
            

            

                coupon = Coupon.find_by(code: params[:code])
          
    6. 
        
    
      
        
    
          
  6. 
            4
            

            

                order = Order.find(session[:order_id])
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

            
          
    8. 
        
    
      
        
    
          
  8. 
            4
            

            

                respond_to do |format|
          
    9. 
        
    
      
        
    
          
  9. 
            4
            

            

                  format.json do
          
    10. 
        
    
      
        
    
          
  10. 
            4
            

            

                    render json: CouponService.find_coupon(params, order, coupon)
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

                  end
          
    12. 
        
    
      
        
    
          
  12. 
            
            

            

                end
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

              end
          
    14. 
        
    
      
        
    
          
  14. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            
            

            

            end
          
    15.

app/controllers/home_controller.rb

100.0% lines covered

7 relevant lines. 7 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class HomeController < ApplicationController
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              def index
          
    3. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
          
  3. 
            13
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
          
  4. 
            13
=======
          
  5. 
            3
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  6. 
            3
>>>>>>> 752f0c0 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3))
>>>>>>> 2a25e4c (Featire specs)
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 9e081dc (Fix)
=======
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 15c51b7 (Featire specs)
=======
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 72b9cab (Featire specs)
=======
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8181d13 (Featire specs)
=======
>>>>>>> 973ba8c (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 0c57e4e (Fix)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> bf05825 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> bf05825 (Featire specs)
=======
<<<<<<< HEAD
=======
=======
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> f8e5c9db (Featire specs)
<<<<<<< HEAD
=======
=======
=======
>>>>>>> e18eb87 (Fix)
>>>>>>> 99dad91f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> 2274daf2 (Featire specs)
>>>>>>> c8da2e3 (Fix)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
>>>>>>> 9440753 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> 8887ba5b (Fix)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> 53db2224 (Featire specs)
>>>>>>> 557c1b8 (Fix)
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> bf05825 (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
=======
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
>>>>>>> b904d7ae (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
=======
>>>>>>> ef483b6d (Fix)
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b904d7ae (Featire specs)
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 31d15e66 (Fix)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> c8da2e3 (Fix)
>>>>>>> fdab719f (Fix)
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 557c1b8 (Fix)
>>>>>>> 8288136d (Fix)
=======
=======
>>>>>>> ae07231a (Featire specs)
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> d52f9efe (Featire specs)
=======
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c12b71de (Featire specs)
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
>>>>>>> c12b71de (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
>>>>>>> b904d7ae (Featire specs)
=======
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 0c57e4e (Fix)
<<<<<<< HEAD
>>>>>>> 8887ba5b (Fix)
=======
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5e31aeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 53db2224 (Featire specs)
=======
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0f24a043 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> b8c2784f (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 392646b5 (Featire specs)
=======
=======
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
>>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price)
          
  7. 
            13
=======
          
  8. 
            3
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 53db2224 (Featire specs)
=======
>>>>>>> 7b22ad7e (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 6cdb2e1 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> 59d75f9 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 5507b42 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 53db2224 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 7b22ad7e (Featire specs)
          
  9. 
            3
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> c12b71de (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 7b22ad7e (Featire specs)
=======
>>>>>>> b97bb382 (Featire specs)
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> af057e3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> fdab719f (Fix)
=======
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> c12b71de (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
          
  10. 
            3
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> c12b71de (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 973ba8c (Featire specs)
=======
=======
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
          
  11. 
            3
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e18eb87 (Fix)
>>>>>>> 99dad91f (Fix)
=======
<<<<<<< HEAD
>>>>>>> 973ba8c (Featire specs)
=======
=======
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> 8181d13 (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
          
  12. 
            3
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> 0f24a043 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
          
  13. 
            3
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
          
  14. 
            3
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 37e48018 (Featire specs)
=======
=======
>>>>>>> fd3f47ab (Featire specs)
=======
          
  15. 
            3
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
          
  16. 
            13
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 31d15e66 (Fix)
=======
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT))
=======
=======
=======
>>>>>>> fc3774fd (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 74240509 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> 416166f (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
=======
          
  17. 
            3
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
=======
          
  18. 
            3
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e18eb87 (Fix)
=======
          
  19. 
            3
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
>>>>>>> b904d7ae (Featire specs)
=======
=======
>>>>>>> e18eb87 (Fix)
>>>>>>> 99dad91f (Fix)
=======
          
  20. 
            13
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
>>>>>>> c8da2e3 (Fix)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b904d7ae (Featire specs)
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  21. 
            3
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
=======
          
  22. 
            3
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
=======
          
  23. 
            13
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c8da2e3 (Fix)
>>>>>>> fdab719f (Fix)
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b904d7ae (Featire specs)
=======
=======
=======
=======
          
  24. 
            3
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
=======
>>>>>>> ef483b6d (Fix)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> b28889f (Fix)
>>>>>>> e18eb87 (Fix)
>>>>>>> 99dad91f (Fix)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
=======
=======
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT))
=======
=======
>>>>>>> 9a49b7b (Rebased)
=======
>>>>>>> 70fcacc (Featire specs)
=======
>>>>>>> ae409ca (Featire specs)
=======
>>>>>>> 379a979 (Featire specs)
=======
>>>>>>> adc21e0 (Featire specs)
=======
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4d90e3d (Featire specs)
=======
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 160fb15 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4d90e3d (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 160fb15 (Fix)
>>>>>>> 67ab5299 (Fix)
<<<<<<< HEAD
=======
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 7a08014b (Featire specs)
>>>>>>> c8da2e3 (Fix)
=======
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
>>>>>>> c51bf93 (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5b7749a (Fix)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
>>>>>>> b28889f (Fix)
>>>>>>> e18eb87 (Fix)
                @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3))
=======
                @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT))
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
                @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT))
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
>>>>>>> 9c0d812 (Featire specs)
=======
                @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT))
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
                @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT))
>>>>>>> 34509eee (Featire specs)
>>>>>>> 3723aad (Featire specs)
=======
=======
                @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3))
=======
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
                @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3))
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
          
  25. 
            3
>>>>>>> 7a02bbe (Featire specs)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
          
  26. 
            3
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
          
  27. 
            13
>>>>>>> a5d032d (Fix)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
          
  28. 
            13
>>>>>>> c7a726c5 (Rebased)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
                @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3))
=======
                @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT))
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
                @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT))
>>>>>>> 9c0d812 (Featire specs)
=======
                @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT))
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
                @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT))
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
=======
                @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT))
=======
=======
>>>>>>> 610b6138 (Featire specs)
<<<<<<< HEAD
=======
=======
>>>>>>> 009401d (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> c8da2e3 (Fix)
>>>>>>> fdab719f (Fix)
=======
>>>>>>> c51bf93 (Featire specs)
>>>>>>> 7a08014b (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 36356d3 (Featire specs)
>>>>>>> b904d7ae (Featire specs)
=======
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 5b7749a (Fix)
>>>>>>> ef483b6d (Fix)
                @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3))
=======
                @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT))
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
                @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT))
>>>>>>> 9c0d812 (Featire specs)
=======
                @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT))
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
                @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT))
>>>>>>> 3723aad (Featire specs)
=======
=======
                @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3))
=======
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
                @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3))
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
          
  29. 
            3
>>>>>>> 7a02bbe (Featire specs)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
          
  30. 
            3
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
          
  31. 
            13
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> b28889f (Fix)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
=======
          
  32. 
            3
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
            

            

=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> f92a45b (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 659083f (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
                @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3))
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
                @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3))
=======
                @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT))
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
                @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT))
>>>>>>> 9c0d812 (Featire specs)
=======
                @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT))
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
                @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT))
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
=======
=======
>>>>>>> 904663c (Featire specs)
                @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3))
=======
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> a9e66e9 (Featire specs)
=======
          
  33. 
            3
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
  34. 
            3
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  35. 
            13
>>>>>>> a5d032d (Fix)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
=======
          
  36. 
            3
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
=======
=======
          
  37. 
            3
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
          
  38. 
            13
>>>>>>> 7c4ea7f (Fix)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3))
=======
                @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT))
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
                @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3))
=======
                @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT))
>>>>>>> 9c0d812 (Featire specs)
=======
                @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT))
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> 5506bd0 (Featire specs)
=======
                @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT))
>>>>>>> 9c0d812 (Featire specs)
=======
                @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT))
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
=======
                @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT))
=======
                @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3))
=======
                @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT))
>>>>>>> 2ee03d3 (Featire specs)
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ebcdce06 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
                @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3))
>>>>>>> fb61c5a (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
>>>>>>> df37394 (Featire specs)
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
>>>>>>> 715fac2 (Featire specs)
>>>>>>> fb61c5a (Featire specs)
>>>>>>> 73f364d8 (Featire specs)
                @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3))
=======
                @catalog = Book.order('created_at DESC').first(3)
>>>>>>> 752f0c0 (Featire specs)
=======
                @catalog = Book.order('created_at DESC').first(3)
>>>>>>> 4e81ea2 (Featire specs)
=======
                @catalog = Book.order('created_at DESC').first(3)
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 84003439 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
=======
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
>>>>>>> fb61c5a (Featire specs)
<<<<<<< HEAD
>>>>>>> 73f364d8 (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
>>>>>>> afa56d1 (Featire specs)
>>>>>>> e1ecabbe (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9bfbd88 (Featire specs)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 610b6138 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> c51bf93 (Featire specs)
>>>>>>> 4f4ea3f9 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 9bfbd88 (Featire specs)
<<<<<<< HEAD
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 6da9530 (Featire specs)
=======
=======
                @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3))
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bb5c652 (Fix book_spec decrease quantity and price)
=======
=======
                @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT))
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> 9a49b7b (Rebased)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> da3a9a3 (Featire specs)
>>>>>>> b5ac3004 (Featire specs)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
                @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT))
>>>>>>> c033601 (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 7b22ad7e (Featire specs)
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 7b22ad7e (Featire specs)
=======
>>>>>>> b97bb382 (Featire specs)
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
=======
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> 973ba8c (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bf05825 (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b904d7ae (Featire specs)
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
>>>>>>> c12b71de (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
>>>>>>> b904d7ae (Featire specs)
=======
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0f24a043 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> b8c2784f (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 392646b5 (Featire specs)
=======
=======
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
>>>>>>> 3cf8dd4 (Featire specs)
>>>>>>> aa4361fd (Featire specs)
                @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT))
=======
                @catalog = Book.order('created_at DESC').first(3)
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 7b22ad7e (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ae07231a (Featire specs)
=======
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
=======
=======
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
>>>>>>> 3cf8dd4 (Featire specs)
>>>>>>> aa4361fd (Featire specs)
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 70fcacc (Featire specs)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 009401d (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
                @catalog = Book.order('created_at DESC').first(3)
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c12b71de (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> c12b71de (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
>>>>>>> ae409ca (Featire specs)
=======
>>>>>>> c8da2e3 (Fix)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
=======
=======
                @catalog = Book.order('created_at DESC').first(3)
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 379a979 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
>>>>>>> adc21e0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 9440753 (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> 8181d13 (Featire specs)
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> e18eb87 (Fix)
=======
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
=======
=======
                @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3))
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 72b9cab (Featire specs)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> e18eb87 (Fix)
=======
=======
                @catalog = Book.order('created_at DESC').first(3)
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4d90e3d (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e18eb87 (Fix)
=======
=======
                @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3))
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
=======
                @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT))
>>>>>>> a5d032d (Fix)
>>>>>>> 160fb15 (Fix)
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 557c1b8 (Fix)
=======
                @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT))
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
                @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT))
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> ae884b47 (Fix)
=======
=======
=======
=======
=======
                @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT))
>>>>>>> a5d032d (Fix)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT))
>>>>>>> a5d032d (Fix)
>>>>>>> e3e66f3 (Featire specs)
=======
                @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT))
=======
                @catalog = Book.order('created_at DESC').first(3)
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376a (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                @catalog = Book.order('created_at DESC').first(3)
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0ea (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                @catalog = Book.order('created_at DESC').first(3)
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888bf (Featire specs)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                @catalog = Book.order('created_at DESC').first(3)
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3))
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 74240509 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
                @catalog = Book.order('created_at DESC').first(3)
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
=======
                @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3))
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a1a479e2 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
                @catalog = Book.order('created_at DESC').first(3)
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 393eff3b (Featire specs)
=======
=======
=======
=======
                @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3))
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price)
=======
=======
=======
                @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT))
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
>>>>>>> d9d85ca6 (Fix)
=======
                @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT))
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 9bfbd88 (Featire specs)
>>>>>>> ebcdce06 (Featire specs)
=======
>>>>>>> adc21e0 (Featire specs)
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> 6b6d1c2d (Featire specs)
>>>>>>> adc21e0 (Featire specs)
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 9440753 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3))
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                @catalog = Book.order('created_at DESC').first(3)
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4d90e3d (Featire specs)
<<<<<<< HEAD
>>>>>>> 37e48018 (Featire specs)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3))
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
=======
                @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT))
>>>>>>> a5d032d (Fix)
>>>>>>> 160fb15 (Fix)
<<<<<<< HEAD
>>>>>>> 31d15e66 (Fix)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 557c1b8 (Fix)
=======
                @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT))
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> fdab719f (Fix)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
                @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT))
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> 8288136d (Fix)
=======
=======
=======
=======
=======
                @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT))
>>>>>>> a5d032d (Fix)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT))
>>>>>>> a5d032d (Fix)
>>>>>>> e3e66f3 (Featire specs)
=======
                @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT))
=======
                @catalog = Book.order('created_at DESC').first(3)
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> d52f9efe (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                @catalog = Book.order('created_at DESC').first(3)
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                @catalog = Book.order('created_at DESC').first(3)
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> c12b71de (Featire specs)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                @catalog = Book.order('created_at DESC').first(3)
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3))
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
                @catalog = Book.order('created_at DESC').first(3)
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
=======
                @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3))
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
                @catalog = Book.order('created_at DESC').first(3)
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b904d7ae (Featire specs)
=======
=======
=======
=======
                @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3))
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
=======
=======
=======
                @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT))
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
>>>>>>> ef483b6d (Fix)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 15c51b7 (Featire specs)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT))
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
                @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT))
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 0c57e4e (Fix)
<<<<<<< HEAD
>>>>>>> 8887ba5b (Fix)
=======
=======
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
                @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT))
=======
                @catalog = Book.order('created_at DESC').first(3)
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5e31aeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 53db2224 (Featire specs)
=======
=======
=======
=======
=======
                @catalog = Book.order('created_at DESC').first(3)
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
=======
=======
                @catalog = Book.order('created_at DESC').first(3)
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
=======
=======
=======
                @catalog = Book.order('created_at DESC').first(3)
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
=======
=======
=======
                @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3))
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0f24a043 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
=======
                @catalog = Book.order('created_at DESC').first(3)
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
=======
=======
=======
                @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3))
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> b8c2784f (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
=======
                @catalog = Book.order('created_at DESC').first(3)
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 392646b5 (Featire specs)
=======
=======
=======
=======
=======
                @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3))
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
                @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT))
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 715fac2 (Featire specs)
<<<<<<< HEAD
>>>>>>> fb61c5a (Featire specs)
<<<<<<< HEAD
>>>>>>> 73f364d8 (Featire specs)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
    39. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
          
  39. 
            13
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 9e081dc (Fix)
=======
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 15c51b7 (Featire specs)
=======
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 72b9cab (Featire specs)
=======
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8181d13 (Featire specs)
=======
>>>>>>> 973ba8c (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 0c57e4e (Fix)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> bf05825 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> bf05825 (Featire specs)
=======
<<<<<<< HEAD
=======
=======
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> f8e5c9db (Featire specs)
<<<<<<< HEAD
=======
=======
=======
>>>>>>> e18eb87 (Fix)
>>>>>>> 99dad91f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> 2274daf2 (Featire specs)
>>>>>>> c8da2e3 (Fix)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
>>>>>>> 9440753 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> 8887ba5b (Fix)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> 53db2224 (Featire specs)
>>>>>>> 557c1b8 (Fix)
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> bf05825 (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
=======
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
>>>>>>> b904d7ae (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
=======
>>>>>>> ef483b6d (Fix)
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b904d7ae (Featire specs)
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 31d15e66 (Fix)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> c8da2e3 (Fix)
>>>>>>> fdab719f (Fix)
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 557c1b8 (Fix)
>>>>>>> 8288136d (Fix)
=======
=======
>>>>>>> ae07231a (Featire specs)
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> d52f9efe (Featire specs)
=======
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c12b71de (Featire specs)
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
>>>>>>> c12b71de (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
>>>>>>> b904d7ae (Featire specs)
=======
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 0c57e4e (Fix)
<<<<<<< HEAD
>>>>>>> 8887ba5b (Fix)
=======
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5e31aeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 53db2224 (Featire specs)
=======
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0f24a043 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> b8c2784f (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 392646b5 (Featire specs)
=======
=======
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
  40. 
            13
=======
          
  41. 
            3
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 53db2224 (Featire specs)
=======
>>>>>>> 7b22ad7e (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 6cdb2e1 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> 59d75f9 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 5507b42 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 53db2224 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
          
  42. 
            3
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> c12b71de (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 7b22ad7e (Featire specs)
=======
>>>>>>> b97bb382 (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> af057e3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> fdab719f (Fix)
=======
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> c12b71de (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
          
  43. 
            3
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> c12b71de (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 973ba8c (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
=======
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
          
  44. 
            3
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e18eb87 (Fix)
>>>>>>> 99dad91f (Fix)
=======
<<<<<<< HEAD
>>>>>>> 973ba8c (Featire specs)
=======
=======
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> 8181d13 (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
          
  45. 
            3
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> 0f24a043 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 74240509 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> 416166f (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
=======
          
  46. 
            3
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> 0f24a043 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 21873de0 (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> 72b9cab (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
          
  47. 
            3
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> a1a479e2 (Fix book_spec decrease quantity and price)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 21873de0 (Featire specs)
=======
>>>>>>> b8c2784f (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2612be03 (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
>>>>>>> 72b9cab (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
          
  48. 
            3
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> a1a479e2 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 393eff3b (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
>>>>>>> b904d7ae (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8887ba5b (Fix)
=======
>>>>>>> b8c2784f (Fix book_spec decrease quantity and price)
=======
>>>>>>> 392646b5 (Featire specs)
=======
>>>>>>> 872e675 (Fix)
>>>>>>> ae884b47 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 31d15e66 (Fix)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 8288136d (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 0c57e4e (Fix)
=======
=======
>>>>>>> 15c51b7 (Featire specs)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
          
  49. 
            13
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
=======
>>>>>>> 5a2009f1 (Fix)
=======
>>>>>>> ae884b47 (Fix)
=======
>>>>>>> f136376a (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> 8887ba5b (Fix)
=======
>>>>>>> 53db2224 (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 557c1b8 (Fix)
>>>>>>> 8288136d (Fix)
=======
>>>>>>> d52f9efe (Featire specs)
=======
=======
>>>>>>> 0c57e4e (Fix)
<<<<<<< HEAD
>>>>>>> 8887ba5b (Fix)
=======
=======
>>>>>>> 5e31aeb (Featire specs)
>>>>>>> 53db2224 (Featire specs)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> ae884b47 (Fix)
=======
=======
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376a (Featire specs)
=======
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0ea (Featire specs)
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4bf888bf (Featire specs)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 74240509 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a1a479e2 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
  50. 
            3
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 393eff3b (Featire specs)
=======
=======
=======
=======
          
  51. 
            3
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  52. 
            13
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
>>>>>>> d9d85ca6 (Fix)
=======
          
  53. 
            13
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 31d15e66 (Fix)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> fdab719f (Fix)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> 8288136d (Fix)
=======
=======
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> d52f9efe (Featire specs)
=======
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
>>>>>>> c12b71de (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
  54. 
            3
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b904d7ae (Featire specs)
=======
=======
=======
=======
          
  55. 
            3
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  56. 
            13
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
>>>>>>> ef483b6d (Fix)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> b28889f (Fix)
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 0c57e4e (Fix)
<<<<<<< HEAD
>>>>>>> 8887ba5b (Fix)
=======
=======
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5e31aeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 53db2224 (Featire specs)
=======
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0f24a043 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> b8c2784f (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
=======
          
  57. 
            3
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 392646b5 (Featire specs)
=======
=======
=======
=======
=======
          
  58. 
            3
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
  59. 
            13
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            

            

                @best_sellers = best_sellers
          
    60. 
        
    
      
        
    
          
  60. 
            
            

            

              end
          
    61. 
        
    
      
        
    
          
  61. 
            
            

            

            
          
    62. 
        
    
      
        
    
          
  62. 
            1
            

            

              private
          
    63. 
        
    
      
        
    
          
  63. 
            
            

            

            
          
    64. 
        
    
      
        
    
          
  64. 
            1
            

            

              def best_sellers
          
    65. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
          
  65. 
            13
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
          
  66. 
            13
=======
          
  67. 
            3
>>>>>>> d0dc1f1 (Featire specs)
=======
          
  68. 
            3
>>>>>>> 752f0c0 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                BookDecorator.decorate_collection(Book.first(4))
>>>>>>> 2a25e4c (Featire specs)
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 9e081dc (Fix)
=======
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 15c51b7 (Featire specs)
=======
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 72b9cab (Featire specs)
=======
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8181d13 (Featire specs)
=======
>>>>>>> 973ba8c (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 0c57e4e (Fix)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> bf05825 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> bf05825 (Featire specs)
=======
<<<<<<< HEAD
=======
=======
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> f8e5c9db (Featire specs)
<<<<<<< HEAD
=======
=======
=======
>>>>>>> e18eb87 (Fix)
>>>>>>> 99dad91f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> 2274daf2 (Featire specs)
>>>>>>> c8da2e3 (Fix)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
>>>>>>> 9440753 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> 8887ba5b (Fix)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> 53db2224 (Featire specs)
>>>>>>> 557c1b8 (Fix)
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> bf05825 (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
=======
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
>>>>>>> b904d7ae (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
=======
>>>>>>> ef483b6d (Fix)
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b904d7ae (Featire specs)
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 31d15e66 (Fix)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> c8da2e3 (Fix)
>>>>>>> fdab719f (Fix)
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 557c1b8 (Fix)
>>>>>>> 8288136d (Fix)
=======
=======
>>>>>>> ae07231a (Featire specs)
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> d52f9efe (Featire specs)
=======
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c12b71de (Featire specs)
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
>>>>>>> c12b71de (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
>>>>>>> b904d7ae (Featire specs)
=======
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 0c57e4e (Fix)
<<<<<<< HEAD
>>>>>>> 8887ba5b (Fix)
=======
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5e31aeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 53db2224 (Featire specs)
=======
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0f24a043 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> b8c2784f (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 392646b5 (Featire specs)
=======
=======
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
>>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price)
          
  69. 
            13
=======
          
  70. 
            3
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 973ba8c (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 6cdb2e1 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
          
  71. 
            3
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> efd6af09 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> fdab719f (Fix)
<<<<<<< HEAD
=======
>>>>>>> 0676508 (Featire specs)
=======
=======
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fdab719f (Fix)
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
=======
>>>>>>> e18eb87 (Fix)
>>>>>>> 99dad91f (Fix)
          
  72. 
            3
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  73. 
            3
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> 0f24a043 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
          
  74. 
            3
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
          
  75. 
            3
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 37e48018 (Featire specs)
=======
=======
>>>>>>> fd3f47ab (Featire specs)
=======
          
  76. 
            3
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
          
  77. 
            13
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 31d15e66 (Fix)
=======
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT))
=======
=======
=======
>>>>>>> fc3774fd (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 74240509 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> 416166f (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
=======
          
  78. 
            3
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
=======
          
  79. 
            3
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e18eb87 (Fix)
=======
          
  80. 
            3
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
>>>>>>> b904d7ae (Featire specs)
=======
=======
>>>>>>> e18eb87 (Fix)
>>>>>>> 99dad91f (Fix)
=======
          
  81. 
            13
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
=======
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b904d7ae (Featire specs)
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
=======
          
  82. 
            3
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
=======
          
  83. 
            3
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
=======
          
  84. 
            13
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c8da2e3 (Fix)
>>>>>>> fdab719f (Fix)
=======
>>>>>>> c8da2e3 (Fix)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 6cdb2e1 (Featire specs)
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b904d7ae (Featire specs)
=======
=======
=======
=======
          
  85. 
            3
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
=======
>>>>>>> ef483b6d (Fix)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> b28889f (Fix)
>>>>>>> e18eb87 (Fix)
>>>>>>> 99dad91f (Fix)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
=======
=======
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT))
=======
=======
>>>>>>> 9a49b7b (Rebased)
=======
>>>>>>> 70fcacc (Featire specs)
=======
>>>>>>> ae409ca (Featire specs)
=======
>>>>>>> 379a979 (Featire specs)
=======
>>>>>>> adc21e0 (Featire specs)
=======
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4d90e3d (Featire specs)
=======
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 160fb15 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4d90e3d (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 160fb15 (Fix)
>>>>>>> 67ab5299 (Fix)
<<<<<<< HEAD
=======
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 7a08014b (Featire specs)
>>>>>>> c8da2e3 (Fix)
=======
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
>>>>>>> c51bf93 (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5b7749a (Fix)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
>>>>>>> b28889f (Fix)
>>>>>>> e18eb87 (Fix)
                BookDecorator.decorate_collection(Book.first(4))
=======
                BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT))
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
                BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT))
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
>>>>>>> 9c0d812 (Featire specs)
=======
                BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT))
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
                BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT))
>>>>>>> 34509eee (Featire specs)
>>>>>>> 3723aad (Featire specs)
=======
=======
                BookDecorator.decorate_collection(Book.first(4))
=======
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
                BookDecorator.decorate_collection(Book.first(4))
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
          
  86. 
            3
>>>>>>> 7a02bbe (Featire specs)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
          
  87. 
            3
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
          
  88. 
            13
>>>>>>> a5d032d (Fix)
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
          
  89. 
            13
>>>>>>> c7a726c5 (Rebased)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
                BookDecorator.decorate_collection(Book.first(4))
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
                BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT))
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
                BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT))
>>>>>>> 9c0d812 (Featire specs)
=======
                BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT))
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
                BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT))
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
=======
                BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT))
=======
=======
>>>>>>> 610b6138 (Featire specs)
<<<<<<< HEAD
=======
=======
>>>>>>> 009401d (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> c8da2e3 (Fix)
>>>>>>> fdab719f (Fix)
=======
>>>>>>> c51bf93 (Featire specs)
>>>>>>> 7a08014b (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 36356d3 (Featire specs)
>>>>>>> b904d7ae (Featire specs)
=======
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 5b7749a (Fix)
>>>>>>> ef483b6d (Fix)
                BookDecorator.decorate_collection(Book.first(4))
=======
                BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT))
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
                BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT))
>>>>>>> 9c0d812 (Featire specs)
=======
                BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT))
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
                BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT))
>>>>>>> 3723aad (Featire specs)
=======
=======
                BookDecorator.decorate_collection(Book.first(4))
=======
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
                BookDecorator.decorate_collection(Book.first(4))
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
          
  90. 
            3
>>>>>>> 7a02bbe (Featire specs)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
          
  91. 
            3
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
          
  92. 
            13
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> b28889f (Fix)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
=======
          
  93. 
            3
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
            

            

=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> f92a45b (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 659083f (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
                BookDecorator.decorate_collection(Book.first(4))
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
                BookDecorator.decorate_collection(Book.first(4))
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
                BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT))
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
                BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT))
>>>>>>> 9c0d812 (Featire specs)
=======
                BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT))
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
                BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT))
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
=======
=======
>>>>>>> 904663c (Featire specs)
                BookDecorator.decorate_collection(Book.first(4))
=======
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> a9e66e9 (Featire specs)
=======
          
  94. 
            3
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
  95. 
            3
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  96. 
            13
>>>>>>> a5d032d (Fix)
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
=======
          
  97. 
            3
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
=======
=======
          
  98. 
            3
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
          
  99. 
            13
>>>>>>> 7c4ea7f (Fix)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5506bd0 (Featire specs)
                BookDecorator.decorate_collection(Book.first(4))
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
                BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT))
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
                BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT))
>>>>>>> 9c0d812 (Featire specs)
=======
                BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT))
>>>>>>> 9c0d812 (Featire specs)
=======
                BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT))
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
=======
=======
                BookDecorator.decorate_collection(Book.first(4))
=======
>>>>>>> 2ee03d3 (Featire specs)
                BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT))
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ebcdce06 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
                BookDecorator.decorate_collection(Book.first(4))
>>>>>>> fb61c5a (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
>>>>>>> df37394 (Featire specs)
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
>>>>>>> 715fac2 (Featire specs)
>>>>>>> fb61c5a (Featire specs)
>>>>>>> 73f364d8 (Featire specs)
                BookDecorator.decorate_collection(Book.first(4))
=======
                Book.first(4)
>>>>>>> 752f0c0 (Featire specs)
=======
                Book.first(4)
>>>>>>> 4e81ea2 (Featire specs)
=======
                Book.first(4)
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 84003439 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
=======
>>>>>>> fb61c5a (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0f24a043 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
>>>>>>> afa56d1 (Featire specs)
>>>>>>> e1ecabbe (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9bfbd88 (Featire specs)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 610b6138 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
<<<<<<< HEAD
=======
>>>>>>> c51bf93 (Featire specs)
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> c51bf93 (Featire specs)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
>>>>>>> 74240509 (Fix book_spec decrease quantity and price)
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 9bfbd88 (Featire specs)
<<<<<<< HEAD
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 6da9530 (Featire specs)
=======
=======
                BookDecorator.decorate_collection(Book.first(4))
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bb5c652 (Fix book_spec decrease quantity and price)
=======
=======
                BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT))
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> 9a49b7b (Rebased)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
                BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT))
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
                BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT))
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> da3a9a3 (Featire specs)
>>>>>>> b5ac3004 (Featire specs)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
                BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT))
>>>>>>> c033601 (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 0676508 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
>>>>>>> 6cdb2e1 (Featire specs)
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
>>>>>>> 3cf8dd4 (Featire specs)
>>>>>>> aa4361fd (Featire specs)
                BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT))
=======
                Book.first(4)
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
=======
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
>>>>>>> 3cf8dd4 (Featire specs)
>>>>>>> aa4361fd (Featire specs)
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 70fcacc (Featire specs)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 009401d (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
                Book.first(4)
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
>>>>>>> ae409ca (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> c8da2e3 (Fix)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
=======
=======
                Book.first(4)
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
>>>>>>> 379a979 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
>>>>>>> adc21e0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 9440753 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
=======
                BookDecorator.decorate_collection(Book.first(4))
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
=======
=======
                Book.first(4)
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4d90e3d (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e18eb87 (Fix)
=======
=======
                BookDecorator.decorate_collection(Book.first(4))
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
=======
                BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT))
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> 160fb15 (Fix)
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 557c1b8 (Fix)
=======
                BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT))
>>>>>>> a5d032d (Fix)
=======
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
                BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT))
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> ae884b47 (Fix)
=======
=======
=======
=======
<<<<<<< HEAD
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
                BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT))
>>>>>>> a5d032d (Fix)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 973ba8c (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> 8181d13 (Featire specs)
=======
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> 72b9cab (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> 15c51b7 (Featire specs)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
                BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT))
=======
                Book.first(4)
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888bf (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                Book.first(4)
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                BookDecorator.decorate_collection(Book.first(4))
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 74240509 (Fix book_spec decrease quantity and price)
=======
=======
<<<<<<< HEAD
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
=======
                Book.first(4)
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
=======
                BookDecorator.decorate_collection(Book.first(4))
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a1a479e2 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
                Book.first(4)
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 393eff3b (Featire specs)
=======
=======
=======
=======
                BookDecorator.decorate_collection(Book.first(4))
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price)
=======
=======
=======
                BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT))
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
>>>>>>> d9d85ca6 (Fix)
=======
                BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT))
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 9bfbd88 (Featire specs)
>>>>>>> ebcdce06 (Featire specs)
=======
>>>>>>> adc21e0 (Featire specs)
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> 6b6d1c2d (Featire specs)
>>>>>>> adc21e0 (Featire specs)
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 9440753 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                BookDecorator.decorate_collection(Book.first(4))
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                Book.first(4)
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4d90e3d (Featire specs)
<<<<<<< HEAD
>>>>>>> 37e48018 (Featire specs)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                BookDecorator.decorate_collection(Book.first(4))
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
=======
                BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT))
>>>>>>> a5d032d (Fix)
>>>>>>> 160fb15 (Fix)
<<<<<<< HEAD
>>>>>>> 31d15e66 (Fix)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 557c1b8 (Fix)
=======
                BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT))
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> fdab719f (Fix)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
                BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT))
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> 8288136d (Fix)
=======
=======
=======
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
                BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT))
>>>>>>> a5d032d (Fix)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
                BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT))
=======
                Book.first(4)
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> c12b71de (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                Book.first(4)
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                BookDecorator.decorate_collection(Book.first(4))
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
=======
<<<<<<< HEAD
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
=======
                Book.first(4)
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
=======
                BookDecorator.decorate_collection(Book.first(4))
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
                Book.first(4)
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b904d7ae (Featire specs)
=======
=======
=======
=======
                BookDecorator.decorate_collection(Book.first(4))
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
=======
=======
=======
                BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT))
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
>>>>>>> ef483b6d (Fix)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0c57e4e (Fix)
=======
                BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT))
>>>>>>> a5d032d (Fix)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
                BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT))
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
>>>>>>> 0c57e4e (Fix)
<<<<<<< HEAD
>>>>>>> 8887ba5b (Fix)
=======
=======
=======
>>>>>>> 8181d13 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
=======
=======
=======
                Book.first(4)
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
=======
=======
=======
                BookDecorator.decorate_collection(Book.first(4))
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0f24a043 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
=======
                Book.first(4)
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
=======
=======
=======
                BookDecorator.decorate_collection(Book.first(4))
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> b8c2784f (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
=======
                Book.first(4)
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 392646b5 (Featire specs)
=======
=======
=======
=======
=======
                BookDecorator.decorate_collection(Book.first(4))
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
                BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT))
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 715fac2 (Featire specs)
<<<<<<< HEAD
>>>>>>> fb61c5a (Featire specs)
<<<<<<< HEAD
>>>>>>> 73f364d8 (Featire specs)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
    100. 
        
    
      
        
    
          
  100. 
            
            

            

              end
          
    101. 
        
    
      
        
    
          
  101. 
            
            

            

            end
          
    102.
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f92a45b (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> a71befd (Manifest_cache true) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) ======= >>>>>>> 15c51b7 (Featire specs) ======= >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> fb61c5a (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD ======= ======= >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> fb61c5a (Featire specs) >>>>>>> 73f364d8 (Featire specs) >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b904d7ae (Featire specs) >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ef483b6d (Fix) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= =======

app/controllers/order_books_controller.rb

<<<<<<< HEAD <<<<<<< HEAD 80.65% ======= 90.32% >>>>>>> ef483b6d (Fix) ======= 80.65% >>>>>>> d68e8240 (Fix) lines covered

31 relevant lines. <<<<<<< HEAD <<<<<<< HEAD 25 lines covered and 6 lines missed. ======= 28 lines covered and 3 lines missed. >>>>>>> ef483b6d (Fix) ======= 25 lines covered and 6 lines missed. >>>>>>> d68e8240 (Fix) 
    
    
      
        
    
          
  1. 
            1
            

            

            require_relative '../services/coupon_service'
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

            require_relative '../services/book_service'
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

            class OrderBooksController < ApplicationController
          
    5. 
        
    
      
        
    
          
  5. 
            1
            

            

              before_action :update_order_last_action
          
    6. 
        
    
      
        
    
          
  6. 
            1
            

            

              def add_to_order
          
    7. 
        
    
      
        
    
          
  7. 
            4
            

            

                product = OrderBook.new(order_id: params[:order_id], book_id: params[:book_id], quantity: params[:quantity])
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

            
          
    9. 
        
    
      
        
    
          
  9. 
            4
            

            

                respond_to do |format|
          
    10. 
        
    
      
        
    
          
  10. 
            4
            

            

                  format.html
          
    11. 
        
    
      
        
    
          
  11. 
            4
            

            

                  format.json do
          
    12. 
        
    
      
        
    
          
  12. 
            4
            

            

                    if product.save
          
    13. 
        
    
      
        
    
          
  13. 
            4
            

            

                      render json: { notice: 'Added!' }
          
    14. 
        
    
      
        
    
          
  14. 
            
            

            

                    else
          
    15. 
        
    
      
        
    
          
  15. 
            
            

            

                      render json: { notice: 'Error!' }
          
    16. 
        
    
      
        
    
          
  16. 
            
            

            

                    end
          
    17. 
        
    
      
        
    
          
  17. 
            
            

            

                  end
          
    18. 
        
    
      
        
    
          
  18. 
            
            

            

                end
          
    19. 
        
    
      
        
    
          
  19. 
            
            

            

              end
          
    20. 
        
    
      
        
    
          
  20. 
            
            

            

            
          
    21. 
        
    
      
        
    
          
  21. 
            1
            

            

              def delete_product
          
    22. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
          
  22. 
            
=======
          
  23. 
            1
>>>>>>> ef483b6d (Fix)
=======
          
  24. 
            
>>>>>>> d68e8240 (Fix)
            

            

                product = OrderBook.find_by(order_id: params[:order_id], book_id: params[:book_id])
          
    25. 
        
    
      
        
    
          
  25. 
            
            

            

            
          
    26. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
          
  26. 
            
=======
          
  27. 
            1
>>>>>>> ef483b6d (Fix)
=======
          
  28. 
            
>>>>>>> d68e8240 (Fix)
            

            

                if product.destroy
          
    29. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
          
  29. 
            
=======
          
  30. 
            1
>>>>>>> ef483b6d (Fix)
=======
          
  31. 
            
>>>>>>> d68e8240 (Fix)
            

            

                  redirect_to orders_path, notice: I18n.t('order.messages.delete')
          
    32. 
        
    
      
        
    
          
  32. 
            
            

            

                else
          
    33. 
        
    
      
        
    
          
  33. 
            
            

            

                  redirect_to orders_path, alert: I18n.t('order.errors.error_delete')
          
    34. 
        
    
      
        
    
          
  34. 
            
            

            

                end
          
    35. 
        
    
      
        
    
          
  35. 
            
            

            

              end
          
    36. 
        
    
      
        
    
          
  36. 
            
            

            

            
          
    37. 
        
    
      
        
    
          
  37. 
            1
            

            

              def update_quantity
          
    38. 
        
    
      
        
    
          
  38. 
            2
            

            

                product = OrderBook.find_by(order_id: params[:order_id], book_id: params[:book_id])
          
    39. 
        
    
      
        
    
          
  39. 
            2
            

            

                book = Book.find(params[:book_id])
          
    40. 
        
    
      
        
    
          
  40. 
            2
            

            

                order = Order.find(params[:order_id])
          
    41. 
        
    
      
        
    
          
  41. 
            2
            

            

                coupon = Coupon.find_by(code: params[:code])
          
    42. 
        
    
      
        
    
          
  42. 
            
            

            

            
          
    43. 
        
    
      
        
    
          
  43. 
            2
            

            

                respond_to do |format|
          
    44. 
        
    
      
        
    
          
  44. 
            2
            

            

                  format.html
          
    45. 
        
    
      
        
    
          
  45. 
            2
            

            

                  format.json do
          
    46. 
        
    
      
        
    
          
  46. 
            2
            

            

                    render json: BookService.quantity_update(params, product, order, book, coupon)
          
    47. 
        
    
      
        
    
          
  47. 
            
            

            

                  end
          
    48. 
        
    
      
        
    
          
  48. 
            
            

            

                end
          
    49. 
        
    
      
        
    
          
  49. 
            
            

            

              end
          
    50. 
        
    
      
        
    
          
  50. 
            
            

            

            
          
    51. 
        
    
      
        
    
          
  51. 
            1
            

            

              private
          
    52. 
        
    
      
        
    
          
  52. 
            
            

            

            
          
    53. 
        
    
      
        
    
          
  53. 
            1
            

            

              def order_item_params
          
    54. 
        
    
      
        
    
          
  54. 
            
            

            

                params.permit(%i[book_id quantity order_id])
          
    55. 
        
    
      
        
    
          
  55. 
            
            

            

              end
          
    56. 
        
    
      
        
    
          
  56. 
            
            

            

            
          
    57. 
        
    
      
        
    
          
  57. 
            1
            

            

              def update_order_last_action
          
    58. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
          
  58. 
            6
=======
          
  59. 
            7
>>>>>>> ef483b6d (Fix)
=======
          
  60. 
            6
>>>>>>> d68e8240 (Fix)
            

            

                Order.find(session[:order_id]).update(last_action: DateTime.now)
          
    61. 
        
    
      
        
    
          
  61. 
            
            

            

              end
          
    62. 
        
    
      
        
    
          
  62. 
            
            

            

            end
          
    63.

app/controllers/orders_controller.rb

100.0% lines covered

4 relevant lines. 4 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class OrdersController < ApplicationController
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              def index
          
    3. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
          
  3. 
            7
=======
          
  4. 
            8
>>>>>>> ef483b6d (Fix)
=======
          
  5. 
            7
>>>>>>> d68e8240 (Fix)
            

            

                @cart = Order.find(session[:order_id]).decorate
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

              end
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

            
          
    8. 
        
    
      
        
    
          
  8. 
            1
            

            

              def registration_without_password; end
          
    9. 
        
    
      
        
    
          
  9. 
            
            

            

            end
          
    10.
>>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> fdab719f (Fix) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 824ea7c9 (Manifest_cache true) ======= >>>>>>> c12b71de (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= >>>>>>> ef483b6d (Fix) ======= ======= ======= >>>>>>> e18eb87 (Fix) >>>>>>> 99dad91f (Fix)

app/controllers/reviews_controller.rb

100.0% lines covered

<<<<<<< HEAD <<<<<<< HEAD 10 relevant lines. 10 lines covered and ======= 9 relevant lines. 9 lines covered and >>>>>>> c7a726c5 (Rebased) ======= 10 relevant lines. 10 lines covered and >>>>>>> fdab719f (Fix) 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class ReviewsController < ApplicationController
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              before_action :authenticate_user!
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              def create
          
    5. 
        
    
      
        
    
          
  5. 
            2
            

            

                @review = Review.new(review_params)
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

            
          
    7. 
        
    
      
        
    
          
  7. 
            2
            

            

<<<<<<< HEAD
<<<<<<< HEAD
                if @review.save
=======
                return redirect_to book_path(@review.book), notice: I18n.t('review.success') if @review.save
>>>>>>> c7a726c5 (Rebased)
=======
                if @review.save
>>>>>>> fdab719f (Fix)
          
    8. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
          
  8. 
=======
          
  9. 
            
            

            

            
          
    10. 
        
    
      
        
    
          
  10. 
>>>>>>> c7a726c5 (Rebased)
=======
          
  11. 
>>>>>>> fdab719f (Fix)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
                  redirect_to book_path(@review.book), notice: I18n.t('review.success')
=======
                redirect_to book_path(@review.book), alert: @review.errors.full_messages.join(', ')
>>>>>>> c7a726c5 (Rebased)
=======
                  redirect_to book_path(@review.book), notice: I18n.t('review.success')
>>>>>>> fdab719f (Fix)
          
    12. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
          
  12. 
=======
          
  13. 
>>>>>>> c7a726c5 (Rebased)
=======
          
  14. 
>>>>>>> fdab719f (Fix)
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fdab719f (Fix)
                else
          
    15. 
        
    
      
        
    
          
  15. 
            1
            

            

                  redirect_to book_path(@review.book), alert: @review.errors.full_messages.join(', ')
<<<<<<< HEAD
=======
              end
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> fdab719f (Fix)
          
    16. 
        
    
      
        
    
          
  16. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
                end
=======
            
>>>>>>> c7a726c5 (Rebased)
=======
                end
>>>>>>> fdab719f (Fix)
          
    17. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
          
  17. 
            
=======
          
  18. 
            1
>>>>>>> c7a726c5 (Rebased)
=======
          
  19. 
            
>>>>>>> fdab719f (Fix)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
              end
=======
              private
>>>>>>> c7a726c5 (Rebased)
=======
              end
>>>>>>> fdab719f (Fix)
          
    20. 
        
    
      
        
    
          
  20. 
            
            

            

            
          
    21. 
        
    
      
        
    
          
  21. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fdab719f (Fix)
              private
          
    22. 
        
    
      
        
    
          
  22. 
            
            

            

            
          
    23. 
        
    
      
        
    
          
  23. 
            1
            

            

<<<<<<< HEAD
=======
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> fdab719f (Fix)
              def review_params
          
    24. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
          
  24. 
=======
          
  25. 
>>>>>>> c7a726c5 (Rebased)
=======
          
  26. 
>>>>>>> fdab719f (Fix)
            2
            

            

                params.permit(:title, :body, :book_id, :user_id, :rating, :verified)
          
    27. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
          
  27. 
=======
          
  28. 
>>>>>>> c7a726c5 (Rebased)
=======
          
  29. 
>>>>>>> fdab719f (Fix)
            
            

            

              end
          
    30. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
          
  30. 
=======
          
  31. 
>>>>>>> c7a726c5 (Rebased)
=======
          
  32. 
>>>>>>> fdab719f (Fix)
            
            

            

            end
          
    33.

app/controllers/users_controller.rb

86.67% lines covered

15 relevant lines. 13 lines covered and 2 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class UsersController < ApplicationController
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              before_action :authenticate_user!
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              def edit
          
    5. 
        
    
      
        
    
          
  5. 
            9
            

            

                @user_billing = Billing.find_or_create_by(user_id: current_user.id)
          
    6. 
        
    
      
        
    
          
  6. 
            9
            

            

                @user_shipping = Shipping.find_or_create_by(user_id: current_user.id)
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

              end
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

            
          
    9. 
        
    
      
        
    
          
  9. 
            1
            

            

              def update
          
    10. 
        
    
      
        
    
          
  10. 
            5
            

            

                update_user = UserUpdate.call(permitted_params: permitted_params, current_user: current_user)
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

            
          
    12. 
        
    
      
        
    
          
  12. 
            5
            

            

                if update_user.success?
          
    13. 
        
    
      
        
    
          
  13. 
            4
            

            

                  redirect_to edit_user_path, notice: I18n.t('settings.message.update')
          
    14. 
        
    
      
        
    
          
  14. 
            
            

            

                else
          
    15. 
        
    
      
        
    
          
  15. 
            1
            

            

                  redirect_to edit_user_path, alert: I18n.t('settings.error.error')
          
    16. 
        
    
      
        
    
          
  16. 
            
            

            

                end
          
    17. 
        
    
      
        
    
          
  17. 
            
            

            

              end
          
    18. 
        
    
      
        
    
          
  18. 
            
            

            

            
          
    19. 
        
    
      
        
    
          
  19. 
            1
            

            

              def destroy
          
    20. 
        
    
      
        
    
          
  20. 
            
            

            

                current_user.destroy
          
    21. 
        
    
      
        
    
          
  21. 
            
            

            

                redirect_to root_path, notice: I18n.t('devise.registrations.destroyed')
          
    22. 
        
    
      
        
    
          
  22. 
            
            

            

              end
          
    23. 
        
    
      
        
    
          
  23. 
            
            

            

            
          
    24. 
        
    
      
        
    
          
  24. 
            1
            

            

              def permitted_params
          
    25. 
        
    
      
        
    
          
  25. 
            5
            

            

                params.permit(
          
    26. 
        
    
      
        
    
          
  26. 
            
            

            

                  user: %i[password current_password password_confirmation email],
          
    27. 
        
    
      
        
    
          
  27. 
            
            

            

                  billing: %i[first_name last_name address city zip country phone],
          
    28. 
        
    
      
        
    
          
  28. 
            
            

            

                  shipping: %i[first_name last_name address city zip country phone]
          
    29. 
        
    
      
        
    
          
  29. 
            
            

            

                )
          
    30. 
        
    
      
        
    
          
  30. 
            
            

            

              end
          
    31. 
        
    
      
        
    
          
  31. 
            
            

            

            end
          
    32.
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 99dad91f (Fix) >>>>>>> a5d032d (Fix) ======= ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true)
=======
>>>>>>> bd8bda4 (Manifest_cache true)

app/decorators/author_decorator.rb

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> e18eb87 (Fix)

app/decorators/author_decorator.rb

<<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 824ea7c9 (Manifest_cache true) >>>>>>> a5d032d (Fix) ======= ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true)
=======
>>>>>>> bd8bda4 (Manifest_cache true)

app/decorators/author_decorator.rb

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) =======

app/helpers/application_helper.rb

>>>>>>> 752f0c0 (Featire specs) =======

app/decorators/author_decorator.rb

>>>>>>> bd8bda4 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)

app/helpers/application_helper.rb

>>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> d4235040 (Manifest_cache true) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)

app/decorators/author_decorator.rb

>>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0f8241bb (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> d4235040 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) =======

app/helpers/application_helper.rb

>>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> b3f2049 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) >>>>>>> ecb02dbf (Featire specs)

app/controllers/reviews_controller.rb

100.0% lines covered

9 relevant lines. 9 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class ReviewsController < ApplicationController
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              before_action :authenticate_user!
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              def create
          
    5. 
        
    
      
        
    
          
  5. 
            2
            

            

                @review = Review.new(review_params)
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

            
          
    7. 
        
    
      
        
    
          
  7. 
            2
            

            

                return redirect_to book_path(@review.book), notice: I18n.t('review.success') if @review.save
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

            
          
    9. 
        
    
      
        
    
          
  9. 
            1
            

            

                redirect_to book_path(@review.book), alert: @review.errors.full_messages.join(', ')
          
    10. 
        
    
      
        
    
          
  10. 
            
            

            

              end
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

            
          
    12. 
        
    
      
        
    
          
  12. 
            1
            

            

              private
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

            
          
    14. 
        
    
      
        
    
          
  14. 
            1
            

            

              def review_params
          
    15. 
        
    
      
        
    
          
  15. 
            2
            

            

                params.permit(:title, :body, :book_id, :user_id, :rating, :verified)
          
    16. 
        
    
      
        
    
          
  16. 
            
            

            

              end
          
    17. 
        
    
      
        
    
          
  17. 
            
            

            

            end
          
    18.

app/controllers/users_controller.rb

86.67% lines covered

15 relevant lines. 13 lines covered and 2 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class UsersController < ApplicationController
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              before_action :authenticate_user!
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              def edit
          
    5. 
        
    
      
        
    
          
  5. 
            9
            

            

                @user_billing = Billing.find_or_create_by(user_id: current_user.id)
          
    6. 
        
    
      
        
    
          
  6. 
            9
            

            

                @user_shipping = Shipping.find_or_create_by(user_id: current_user.id)
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

              end
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

            
          
    9. 
        
    
      
        
    
          
  9. 
            1
            

            

              def update
          
    10. 
        
    
      
        
    
          
  10. 
            5
            

            

                update_user = UserUpdate.call(permitted_params: permitted_params, current_user: current_user)
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

            
          
    12. 
        
    
      
        
    
          
  12. 
            5
            

            

                if update_user.success?
          
    13. 
        
    
      
        
    
          
  13. 
            4
            

            

                  redirect_to edit_user_path, notice: I18n.t('settings.message.update')
          
    14. 
        
    
      
        
    
          
  14. 
            
            

            

                else
          
    15. 
        
    
      
        
    
          
  15. 
            1
            

            

                  redirect_to edit_user_path, alert: I18n.t('settings.error.error')
          
    16. 
        
    
      
        
    
          
  16. 
            
            

            

                end
          
    17. 
        
    
      
        
    
          
  17. 
            
            

            

              end
          
    18. 
        
    
      
        
    
          
  18. 
            
            

            

            
          
    19. 
        
    
      
        
    
          
  19. 
            1
            

            

              def destroy
          
    20. 
        
    
      
        
    
          
  20. 
            
            

            

                current_user.destroy
          
    21. 
        
    
      
        
    
          
  21. 
            
            

            

                redirect_to root_path, notice: I18n.t('devise.registrations.destroyed')
          
    22. 
        
    
      
        
    
          
  22. 
            
            

            

              end
          
    23. 
        
    
      
        
    
          
  23. 
            
            

            

            
          
    24. 
        
    
      
        
    
          
  24. 
            1
            

            

              def permitted_params
          
    25. 
        
    
      
        
    
          
  25. 
            5
            

            

                params.permit(
          
    26. 
        
    
      
        
    
          
  26. 
            
            

            

                  user: %i[password current_password password_confirmation email],
          
    27. 
        
    
      
        
    
          
  27. 
            
            

            

                  billing: %i[first_name last_name address city zip country phone],
          
    28. 
        
    
      
        
    
          
  28. 
            
            

            

                  shipping: %i[first_name last_name address city zip country phone]
          
    29. 
        
    
      
        
    
          
  29. 
            
            

            

                )
          
    30. 
        
    
      
        
    
          
  30. 
            
            

            

              end
          
    31. 
        
    
      
        
    
          
  31. 
            
            

            

            end
          
    32.
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> 98beee2 (Manifest_cache true) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 160fb15 (Fix) >>>>>>> 67ab5299 (Fix) ======= >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= ======= ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> ebcdce06 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
<<<<<<< HEAD

app/controllers/order_books_controller.rb

80.65% lines covered

31 relevant lines. 25 lines covered and 6 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            require_relative '../services/coupon_service'
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

            require_relative '../services/book_service'
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

            class OrderBooksController < ApplicationController
          
    5. 
        
    
      
        
    
          
  5. 
            1
            

            

              before_action :update_order_last_action
          
    6. 
        
    
      
        
    
          
  6. 
            1
            

            

              def add_to_order
          
    7. 
        
    
      
        
    
          
  7. 
            4
            

            

                product = OrderBook.new(order_id: params[:order_id], book_id: params[:book_id], quantity: params[:quantity])
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

            
          
    9. 
        
    
      
        
    
          
  9. 
            4
            

            

                respond_to do |format|
          
    10. 
        
    
      
        
    
          
  10. 
            4
            

            

                  format.html
          
    11. 
        
    
      
        
    
          
  11. 
            4
            

            

                  format.json do
          
    12. 
        
    
      
        
    
          
  12. 
            4
            

            

                    if product.save
          
    13. 
        
    
      
        
    
          
  13. 
            4
            

            

                      render json: { notice: 'Added!' }
          
    14. 
        
    
      
        
    
          
  14. 
            
            

            

                    else
          
    15. 
        
    
      
        
    
          
  15. 
            
            

            

                      render json: { notice: 'Error!' }
          
    16. 
        
    
      
        
    
          
  16. 
            
            

            

                    end
          
    17. 
        
    
      
        
    
          
  17. 
            
            

            

                  end
          
    18. 
        
    
      
        
    
          
  18. 
            
            

            

                end
          
    19. 
        
    
      
        
    
          
  19. 
            
            

            

              end
          
    20. 
        
    
      
        
    
          
  20. 
            
            

            

            
          
    21. 
        
    
      
        
    
          
  21. 
            1
            

            

              def delete_product
          
    22. 
        
    
      
        
    
          
  22. 
            
            

            

                product = OrderBook.find_by(order_id: params[:order_id], book_id: params[:book_id])
          
    23. 
        
    
      
        
    
          
  23. 
            
            

            

            
          
    24. 
        
    
      
        
    
          
  24. 
            
            

            

                if product.destroy
          
    25. 
        
    
      
        
    
          
  25. 
            
            

            

                  redirect_to orders_path, notice: I18n.t('order.messages.delete')
          
    26. 
        
    
      
        
    
          
  26. 
            
            

            

                else
          
    27. 
        
    
      
        
    
          
  27. 
            
            

            

                  redirect_to orders_path, alert: I18n.t('order.errors.error_delete')
          
    28. 
        
    
      
        
    
          
  28. 
            
            

            

                end
          
    29. 
        
    
      
        
    
          
  29. 
            
            

            

              end
          
    30. 
        
    
      
        
    
          
  30. 
            
            

            

            
          
    31. 
        
    
      
        
    
          
  31. 
            1
            

            

              def update_quantity
          
    32. 
        
    
      
        
    
          
  32. 
            2
            

            

                product = OrderBook.find_by(order_id: params[:order_id], book_id: params[:book_id])
          
    33. 
        
    
      
        
    
          
  33. 
            2
            

            

                book = Book.find(params[:book_id])
          
    34. 
        
    
      
        
    
          
  34. 
            2
            

            

                order = Order.find(params[:order_id])
          
    35. 
        
    
      
        
    
          
  35. 
            2
            

            

                coupon = Coupon.find_by(code: params[:code])
          
    36. 
        
    
      
        
    
          
  36. 
            
            

            

            
          
    37. 
        
    
      
        
    
          
  37. 
            2
            

            

                respond_to do |format|
          
    38. 
        
    
      
        
    
          
  38. 
            2
            

            

                  format.html
          
    39. 
        
    
      
        
    
          
  39. 
            2
            

            

                  format.json do
          
    40. 
        
    
      
        
    
          
  40. 
            2
            

            

                    render json: BookService.quantity_update(params, product, order, book, coupon)
          
    41. 
        
    
      
        
    
          
  41. 
            
            

            

                  end
          
    42. 
        
    
      
        
    
          
  42. 
            
            

            

                end
          
    43. 
        
    
      
        
    
          
  43. 
            
            

            

              end
          
    44. 
        
    
      
        
    
          
  44. 
            
            

            

            
          
    45. 
        
    
      
        
    
          
  45. 
            1
            

            

              private
          
    46. 
        
    
      
        
    
          
  46. 
            
            

            

            
          
    47. 
        
    
      
        
    
          
  47. 
            1
            

            

              def order_item_params
          
    48. 
        
    
      
        
    
          
  48. 
            
            

            

                params.permit(%i[book_id quantity order_id])
          
    49. 
        
    
      
        
    
          
  49. 
            
            

            

              end
          
    50. 
        
    
      
        
    
          
  50. 
            
            

            

            
          
    51. 
        
    
      
        
    
          
  51. 
            1
            

            

              def update_order_last_action
          
    52. 
        
    
      
        
    
          
  52. 
            6
            

            

                Order.find(session[:order_id]).update(last_action: DateTime.now)
          
    53. 
        
    
      
        
    
          
  53. 
            
            

            

              end
          
    54. 
        
    
      
        
    
          
  54. 
            
            

            

            end
          
    55.

app/controllers/orders_controller.rb

=======

app/decorators/author_decorator.rb

<<<<<<< HEAD ======= =======

app/helpers/application_helper.rb

>>>>>>> 752f0c0 (Featire specs) =======

app/decorators/author_decorator.rb

>>>>>>> bd8bda4 (Manifest_cache true) =======

app/helpers/application_helper.rb

>>>>>>> 4e81ea2 (Featire specs) =======

app/decorators/author_decorator.rb

>>>>>>> aa7b40c (Manifest_cache true) =======

app/helpers/application_helper.rb

>>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs)

100.0% lines covered

4 relevant lines. 4 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

<<<<<<< HEAD
            class OrdersController < ApplicationController
=======
<<<<<<< HEAD
<<<<<<< HEAD
            class AuthorDecorator < Draper::Decorator
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
            class AuthorDecorator < Draper::Decorator
=======
            module ApplicationHelper
>>>>>>> 752f0c0 (Featire specs)
=======
            class AuthorDecorator < Draper::Decorator
>>>>>>> bd8bda4 (Manifest_cache true)
=======
            module ApplicationHelper
>>>>>>> 4e81ea2 (Featire specs)
=======
            class AuthorDecorator < Draper::Decorator
>>>>>>> aa7b40c (Manifest_cache true)
=======
            module ApplicationHelper
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 715fac2 (Featire specs)
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

<<<<<<< HEAD
              def index
          
    3. 
        
    
      
        
    
          
  3. 
            7
            

            

                @cart = Order.find(session[:order_id]).decorate
          
    4. 
        
    
      
        
    
          
  4. 
            
            

            

              end
          
    5. 
        
    
      
        
    
          
  5. 
            
            

            

            
          
    6. 
        
    
      
        
    
          
  6. 
            1
            

            

              def registration_without_password; end
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

            end
          
    8.
>>>>>>> 7c4ea7f (Fix)

app/controllers/reviews_controller.rb

100.0% lines covered

10 relevant lines. 10 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class ReviewsController < ApplicationController
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              before_action :authenticate_user!
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              def create
          
    5. 
        
    
      
        
    
          
  5. 
            2
            

            

                @review = Review.new(review_params)
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

            
          
    7. 
        
    
      
        
    
          
  7. 
            2
            

            

                if @review.save
          
    8. 
        
    
      
        
    
          
  8. 
            1
            

            

                  redirect_to book_path(@review.book), notice: I18n.t('review.success')
          
    9. 
        
    
      
        
    
          
  9. 
            
            

            

                else
          
    10. 
        
    
      
        
    
          
  10. 
            1
            

            

                  redirect_to book_path(@review.book), alert: @review.errors.full_messages.join(', ')
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

                end
          
    12. 
        
    
      
        
    
          
  12. 
            
            

            

              end
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

            
          
    14. 
        
    
      
        
    
          
  14. 
            1
            

            

              private
          
    15. 
        
    
      
        
    
          
  15. 
            
            

            

            
          
    16. 
        
    
      
        
    
          
  16. 
            1
            

            

              def review_params
          
    17. 
        
    
      
        
    
          
  17. 
            2
            

            

                params.permit(:title, :body, :book_id, :user_id, :rating, :verified)
          
    18. 
        
    
      
        
    
          
  18. 
            
            

            

              end
          
    19. 
        
    
      
        
    
          
  19. 
            
            

            

            end
          
    20.

app/controllers/users_controller.rb

86.67% lines covered

15 relevant lines. 13 lines covered and 2 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class UsersController < ApplicationController
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              before_action :authenticate_user!
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              def edit
          
    5. 
        
    
      
        
    
          
  5. 
            9
            

            

                @user_billing = Billing.find_or_create_by(user_id: current_user.id)
          
    6. 
        
    
      
        
    
          
  6. 
            9
            

            

                @user_shipping = Shipping.find_or_create_by(user_id: current_user.id)
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

              end
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

            
          
    9. 
        
    
      
        
    
          
  9. 
            1
            

            

              def update
          
    10. 
        
    
      
        
    
          
  10. 
            5
            

            

                update_user = UserUpdate.call(permitted_params: permitted_params, current_user: current_user)
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

            
          
    12. 
        
    
      
        
    
          
  12. 
            5
            

            

                if update_user.success?
          
    13. 
        
    
      
        
    
          
  13. 
            4
            

            

                  redirect_to edit_user_path, notice: I18n.t('settings.message.update')
          
    14. 
        
    
      
        
    
          
  14. 
            
            

            

                else
          
    15. 
        
    
      
        
    
          
  15. 
            1
            

            

                  redirect_to edit_user_path, alert: I18n.t('settings.error.error')
          
    16. 
        
    
      
        
    
          
  16. 
            
            

            

                end
          
    17. 
        
    
      
        
    
          
  17. 
            
            

            

              end
          
    18. 
        
    
      
        
    
          
  18. 
            
            

            

            
          
    19. 
        
    
      
        
    
          
  19. 
            1
            

            

              def destroy
          
    20. 
        
    
      
        
    
          
  20. 
            
            

            

                current_user.destroy
          
    21. 
        
    
      
        
    
          
  21. 
            
            

            

                redirect_to root_path, notice: I18n.t('devise.registrations.destroyed')
          
    22. 
        
    
      
        
    
          
  22. 
            
            

            

              end
          
    23. 
        
    
      
        
    
          
  23. 
            
            

            

            
          
    24. 
        
    
      
        
    
          
  24. 
            1
            

            

              def permitted_params
          
    25. 
        
    
      
        
    
          
  25. 
            5
            

            

                params.permit(
          
    26. 
        
    
      
        
    
          
  26. 
            
            

            

                  user: %i[password current_password password_confirmation email],
          
    27. 
        
    
      
        
    
          
  27. 
            
            

            

                  billing: %i[first_name last_name address city zip country phone],
          
    28. 
        
    
      
        
    
          
  28. 
            
            

            

                  shipping: %i[first_name last_name address city zip country phone]
          
    29. 
        
    
      
        
    
          
  29. 
            
            

            

                )
          
    30. 
        
    
      
        
    
          
  30. 
            
            

            

              end
          
    31. 
        
    
      
        
    
          
  31. 
            
            

            

            end
          
    32.
<<<<<<< HEAD <<<<<<< HEAD >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> a71befd (Manifest_cache true) >>>>>>> 8a3779d4 (Manifest_cache true)
=======
>>>>>>> bd8bda4 (Manifest_cache true)

app/decorators/author_decorator.rb

<<<<<<< HEAD <<<<<<< HEAD ======= =======

app/helpers/application_helper.rb

>>>>>>> 752f0c0 (Featire specs) =======

app/decorators/author_decorator.rb

>>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) =======

app/helpers/application_helper.rb

>>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 2722d07 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price)

app/decorators/author_decorator.rb

>>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e54deeb (Featire specs) =======

app/helpers/application_helper.rb

>>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e6fc67c7 (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> b3f2049 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> b3f2049 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)

app/controllers/reviews_controller.rb

100.0% lines covered

9 relevant lines. 9 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class ReviewsController < ApplicationController
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              before_action :authenticate_user!
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              def create
          
    5. 
        
    
      
        
    
          
  5. 
            2
            

            

                @review = Review.new(review_params)
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

            
          
    7. 
        
    
      
        
    
          
  7. 
            2
            

            

                return redirect_to book_path(@review.book), notice: I18n.t('review.success') if @review.save
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

            
          
    9. 
        
    
      
        
    
          
  9. 
            1
            

            

                redirect_to book_path(@review.book), alert: @review.errors.full_messages.join(', ')
          
    10. 
        
    
      
        
    
          
  10. 
            
            

            

              end
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

            
          
    12. 
        
    
      
        
    
          
  12. 
            1
            

            

              private
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

            
          
    14. 
        
    
      
        
    
          
  14. 
            1
            

            

              def review_params
          
    15. 
        
    
      
        
    
          
  15. 
            2
            

            

                params.permit(:title, :body, :book_id, :user_id, :rating, :verified)
          
    16. 
        
    
      
        
    
          
  16. 
            
            

            

              end
          
    17. 
        
    
      
        
    
          
  17. 
            
            

            

            end
          
    18.

app/controllers/users_controller.rb

86.67% lines covered

15 relevant lines. 13 lines covered and 2 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class UsersController < ApplicationController
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              before_action :authenticate_user!
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              def edit
          
    5. 
        
    
      
        
    
          
  5. 
            9
            

            

                @user_billing = Billing.find_or_create_by(user_id: current_user.id)
          
    6. 
        
    
      
        
    
          
  6. 
            9
            

            

                @user_shipping = Shipping.find_or_create_by(user_id: current_user.id)
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

              end
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

            
          
    9. 
        
    
      
        
    
          
  9. 
            1
            

            

              def update
          
    10. 
        
    
      
        
    
          
  10. 
            5
            

            

                update_user = UserUpdate.call(permitted_params: permitted_params, current_user: current_user)
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

            
          
    12. 
        
    
      
        
    
          
  12. 
            5
            

            

                if update_user.success?
          
    13. 
        
    
      
        
    
          
  13. 
            4
            

            

                  redirect_to edit_user_path, notice: I18n.t('settings.message.update')
          
    14. 
        
    
      
        
    
          
  14. 
            
            

            

                else
          
    15. 
        
    
      
        
    
          
  15. 
            1
            

            

                  redirect_to edit_user_path, alert: I18n.t('settings.error.error')
          
    16. 
        
    
      
        
    
          
  16. 
            
            

            

                end
          
    17. 
        
    
      
        
    
          
  17. 
            
            

            

              end
          
    18. 
        
    
      
        
    
          
  18. 
            
            

            

            
          
    19. 
        
    
      
        
    
          
  19. 
            1
            

            

              def destroy
          
    20. 
        
    
      
        
    
          
  20. 
            
            

            

                current_user.destroy
          
    21. 
        
    
      
        
    
          
  21. 
            
            

            

                redirect_to root_path, notice: I18n.t('devise.registrations.destroyed')
          
    22. 
        
    
      
        
    
          
  22. 
            
            

            

              end
          
    23. 
        
    
      
        
    
          
  23. 
            
            

            

            
          
    24. 
        
    
      
        
    
          
  24. 
            1
            

            

              def permitted_params
          
    25. 
        
    
      
        
    
          
  25. 
            5
            

            

                params.permit(
          
    26. 
        
    
      
        
    
          
  26. 
            
            

            

                  user: %i[password current_password password_confirmation email],
          
    27. 
        
    
      
        
    
          
  27. 
            
            

            

                  billing: %i[first_name last_name address city zip country phone],
          
    28. 
        
    
      
        
    
          
  28. 
            
            

            

                  shipping: %i[first_name last_name address city zip country phone]
          
    29. 
        
    
      
        
    
          
  29. 
            
            

            

                )
          
    30. 
        
    
      
        
    
          
  30. 
            
            

            

              end
          
    31. 
        
    
      
        
    
          
  31. 
            
            

            

            end
          
    32.
<<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> e055dd0 (Rebased) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 311e9fa (Rebased) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) >>>>>>> 02a399d (Manifest_cache true) =======
>>>>>>> bd8bda4 (Manifest_cache true) =======
>>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> d365be68 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= >>>>>>> bf554f4 (Rebased)
>>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> 0b43b18 (Manifest_cache true) >>>>>>> d365be68 (Manifest_cache true)

app/decorators/author_decorator.rb

>>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 304cd28a (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> bc6bc8d2 (Rebased)

app/decorators/author_decorator.rb

>>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= =======

app/decorators/author_decorator.rb

>>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) ======= =======

app/helpers/application_helper.rb

>>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= =======

app/decorators/author_decorator.rb

>>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= ======= =======

app/helpers/application_helper.rb

>>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= =======

app/decorators/author_decorator.rb

>>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= =======

app/decorators/author_decorator.rb

>>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) =======

app/decorators/author_decorator.rb

>>>>>>> c7a726c5 (Rebased) ======= >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d4235040 (Manifest_cache true) ======= ======= ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs)

app/decorators/author_decorator.rb

>>>>>>> c033601 (Rebased) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= =======

app/decorators/author_decorator.rb

>>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) ======= =======

app/helpers/application_helper.rb

>>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= =======

app/decorators/author_decorator.rb

>>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= ======= =======

app/helpers/application_helper.rb

>>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= =======

app/decorators/author_decorator.rb

>>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4fac471d (Manifest_cache true) ======= ======= =======

app/decorators/author_decorator.rb

>>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD ======= ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) =======
>>>>>>> bd8bda4 (Manifest_cache true) =======
>>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 49e8a6c (Rebased)

app/decorators/author_decorator.rb

>>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> fd310ed (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86229876 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= =======

app/decorators/author_decorator.rb

>>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 42e9c2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> 16ebb0ff (Manifest_cache true) ======= ======= ======= ======= =======

app/helpers/application_helper.rb

>>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= =======

app/decorators/author_decorator.rb

>>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> c0159bf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d0f5cbf (Manifest_cache true) ======= ======= ======= ======= =======

app/helpers/application_helper.rb

>>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= ======= =======

app/decorators/author_decorator.rb

>>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) <<<<<<< HEAD >>>>>>> ca274ec (Manifest_cache true) <<<<<<< HEAD >>>>>>> a56ba36d (Manifest_cache true) ======= ======= ======= =======

app/decorators/author_decorator.rb

>>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) >>>>>>> 9e081dc (Fix) >>>>>>> 1049b80c (Fix)

100.0% lines covered

4 relevant lines. 4 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> c12b71de (Featire specs)
=======
>>>>>>> d4235040 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 4367ccb1 (Manifest_cache true)
=======
>>>>>>> b904d7ae (Featire specs)
=======
>>>>>>> 4fac471d (Manifest_cache true)
=======
>>>>>>> ef483b6d (Fix)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> e6fc67c7 (Featire specs)
=======
>>>>>>> 86229876 (Manifest_cache true)
=======
>>>>>>> 4a2f2ad8 (Featire specs)
=======
>>>>>>> 16ebb0ff (Manifest_cache true)
=======
>>>>>>> 21873de0 (Featire specs)
=======
>>>>>>> 1d0f5cbf (Manifest_cache true)
=======
>>>>>>> 392646b5 (Featire specs)
=======
>>>>>>> a56ba36d (Manifest_cache true)
=======
>>>>>>> 1049b80c (Fix)
=======
=======
>>>>>>> fd310ed (Manifest_cache true)
=======
>>>>>>> 8181d13 (Featire specs)
=======
>>>>>>> 42e9c2e (Manifest_cache true)
=======
>>>>>>> 72b9cab (Featire specs)
=======
>>>>>>> c0159bf (Manifest_cache true)
=======
>>>>>>> 15c51b7 (Featire specs)
=======
>>>>>>> ca274ec (Manifest_cache true)
=======
>>>>>>> 9e081dc (Fix)
=======
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 35d17b9 (Manifest_cache true)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> add330c (Manifest_cache true)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 15bff2e (Manifest_cache true)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> 6c71f00 (Manifest_cache true)
=======
>>>>>>> 1d59aaa (Fix)
            class AuthorDecorator < Draper::Decorator
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 35d17b9 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 64dceec (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 5b7749a (Fix)
=======
=======
>>>>>>> df37394 (Featire specs)
>>>>>>> f92a45b (Featire specs)
            class AuthorDecorator < Draper::Decorator
>>>>>>> 7a08014b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888bf (Featire specs)
=======
=======
>>>>>>> 35d17b9 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 304cd28a (Manifest_cache true)
=======
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e59c273d (Manifest_cache true)
=======
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 393eff3b (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 64dceec (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 7afa007b (Manifest_cache true)
=======
=======
<<<<<<< HEAD
>>>>>>> 5b7749a (Fix)
>>>>>>> d9d85ca6 (Fix)
            class AuthorDecorator < Draper::Decorator
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 490b01d6 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 75fa7e1b (Rebased)
=======
=======
>>>>>>> 251144b4 (Manifest_cache true)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84809242 (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 86d584a (Manifest_cache true)
>>>>>>> e5890c2 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> d782a28 (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
            class AuthorDecorator < Draper::Decorator
>>>>>>> ebcdce06 (Featire specs)
=======
>>>>>>> c59d1a99 (Manifest_cache true)
=======
>>>>>>> 11792758 (Rebased)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
<<<<<<< HEAD
=======
=======
>>>>>>> 0e864a5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e5890c2 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> d782a28 (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
            class AuthorDecorator < Draper::Decorator
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> 0e864a5 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> d782a28 (Manifest_cache true)
=======
>>>>>>> 0b43b18 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
            class AuthorDecorator < Draper::Decorator
=======
            module ApplicationHelper
>>>>>>> 752f0c0 (Featire specs)
=======
            class AuthorDecorator < Draper::Decorator
>>>>>>> bd8bda4 (Manifest_cache true)
=======
            module ApplicationHelper
>>>>>>> 4e81ea2 (Featire specs)
=======
            class AuthorDecorator < Draper::Decorator
>>>>>>> aa7b40c (Manifest_cache true)
=======
            module ApplicationHelper
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 4f4ea3f9 (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 7a08014b (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> e6fc67c7 (Featire specs)
=======
            class AuthorDecorator < Draper::Decorator
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
            class AuthorDecorator < Draper::Decorator
>>>>>>> c033601 (Rebased)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
            class AuthorDecorator < Draper::Decorator
>>>>>>> c033601 (Rebased)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 7a08014b (Featire specs)
=======
=======
            class AuthorDecorator < Draper::Decorator
>>>>>>> c033601 (Rebased)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
            class AuthorDecorator < Draper::Decorator
>>>>>>> c033601 (Rebased)
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> c8cdb08 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 490b01d6 (Manifest_cache true)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 24b58e6 (Manifest_cache true)
=======
=======
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 75fa7e1b (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> c8cdb08 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e5890c2 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 251144b4 (Manifest_cache true)
=======
=======
=======
=======
<<<<<<< HEAD
=======
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 24b58e6 (Manifest_cache true)
=======
=======
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> 13fca83d (Rebased)
=======
=======
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a304bcf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d245196f (Manifest_cache true)
=======
=======
=======
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 96aecde (Manifest_cache true)
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> b15044a (Manifest_cache true)
>>>>>>> 64dceec (Manifest_cache true)
            class AuthorDecorator < Draper::Decorator
<<<<<<< HEAD
=======
            module ApplicationHelper
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888bf (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
            module ApplicationHelper
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> e54deeb (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
<<<<<<< HEAD
>>>>>>> e54deeb (Featire specs)
=======
=======
            module ApplicationHelper
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
=======
            module ApplicationHelper
>>>>>>> 4552227 (Featire specs)
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 393eff3b (Featire specs)
=======
=======
=======
            class AuthorDecorator < Draper::Decorator
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
>>>>>>> d9d85ca6 (Fix)
=======
            class AuthorDecorator < Draper::Decorator
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> ebcdce06 (Featire specs)
=======
>>>>>>> c59d1a99 (Manifest_cache true)
=======
>>>>>>> 11792758 (Rebased)
=======
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> c8cdb08 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e5890c2 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
=======
=======
=======
<<<<<<< HEAD
=======
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 24b58e6 (Manifest_cache true)
=======
=======
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> bc6bc8d2 (Rebased)
=======
=======
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a304bcf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> bd30d038 (Manifest_cache true)
=======
=======
=======
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 96aecde (Manifest_cache true)
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> b15044a (Manifest_cache true)
>>>>>>> 64dceec (Manifest_cache true)
            class AuthorDecorator < Draper::Decorator
<<<<<<< HEAD
=======
            module ApplicationHelper
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> c12b71de (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
            module ApplicationHelper
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> e54deeb (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
<<<<<<< HEAD
>>>>>>> e54deeb (Featire specs)
=======
=======
            module ApplicationHelper
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
=======
            module ApplicationHelper
>>>>>>> 4552227 (Featire specs)
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b904d7ae (Featire specs)
=======
=======
=======
            class AuthorDecorator < Draper::Decorator
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
>>>>>>> ef483b6d (Fix)
=======
=======
=======
            class AuthorDecorator < Draper::Decorator
>>>>>>> c033601 (Rebased)
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
            class AuthorDecorator < Draper::Decorator
>>>>>>> c033601 (Rebased)
=======
<<<<<<< HEAD
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> c8cdb08 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0e864a5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> cc390719 (Manifest_cache true)
=======
=======
=======
=======
<<<<<<< HEAD
=======
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 24b58e6 (Manifest_cache true)
=======
=======
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 551c6ab (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 56531f25 (Manifest_cache true)
=======
=======
=======
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> b15044a (Manifest_cache true)
            class AuthorDecorator < Draper::Decorator
<<<<<<< HEAD
=======
            module ApplicationHelper
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
=======
=======
=======
            module ApplicationHelper
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
=======
=======
=======
            module ApplicationHelper
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
=======
=======
=======
            module ApplicationHelper
>>>>>>> 4552227 (Featire specs)
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 392646b5 (Featire specs)
=======
=======
=======
=======
            class AuthorDecorator < Draper::Decorator
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
=======
>>>>>>> 0b43b18 (Manifest_cache true)
>>>>>>> 1cce66c (Manifest_cache true)
>>>>>>> d365be68 (Manifest_cache true)
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ebcdce06 (Featire specs)
=======
=======
>>>>>>> c12b71de (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> b904d7ae (Featire specs)
=======
>>>>>>> ef483b6d (Fix)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> b97bb382 (Featire specs)
=======
>>>>>>> 4a2f2ad8 (Featire specs)
=======
>>>>>>> 21873de0 (Featire specs)
=======
>>>>>>> 392646b5 (Featire specs)
=======
>>>>>>> 1049b80c (Fix)
=======
=======
>>>>>>> 973ba8c (Featire specs)
=======
>>>>>>> 8181d13 (Featire specs)
=======
>>>>>>> 72b9cab (Featire specs)
=======
>>>>>>> 15c51b7 (Featire specs)
=======
>>>>>>> 9e081dc (Fix)
=======
>>>>>>> df37394 (Featire specs)
>>>>>>> f92a45b (Featire specs)
>>>>>>> e6fc67c7 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> 1d59aaa (Fix)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> df37394 (Featire specs)
>>>>>>> 7a08014b (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
=======
<<<<<<< HEAD
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> 715fac2 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> fb61c5a (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> df37394 (Featire specs)
>>>>>>> 4f4ea3f9 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ebcdce06 (Featire specs)
=======
>>>>>>> bd8bda4 (Manifest_cache true)
=======
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
>>>>>>> fb61c5a (Featire specs)
>>>>>>> 73f364d8 (Featire specs)
=======
>>>>>>> c033601 (Rebased)
=======
<<<<<<< HEAD
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4bf888bf (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 4a2f2ad8 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> c033601 (Rebased)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 393eff3b (Featire specs)
=======
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
>>>>>>> d9d85ca6 (Fix)
=======
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> ebcdce06 (Featire specs)
=======
=======
>>>>>>> c033601 (Rebased)
=======
<<<<<<< HEAD
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> c12b71de (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b904d7ae (Featire specs)
=======
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
>>>>>>> ef483b6d (Fix)
=======
=======
=======
>>>>>>> c033601 (Rebased)
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
>>>>>>> c033601 (Rebased)
=======
<<<<<<< HEAD
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 392646b5 (Featire specs)
=======
=======
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
=======
>>>>>>> 715fac2 (Featire specs)
>>>>>>> fb61c5a (Featire specs)
>>>>>>> 73f364d8 (Featire specs)
              delegate_all
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              def full_name
          
    5. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
          
  5. 
            3
<<<<<<< HEAD
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
>>>>>>> e18eb87 (Fix)
=======
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 307f31f (Manifest_cache true)
=======
>>>>>>> 1d59aaa (Fix)
=======
<<<<<<< HEAD
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 307f31f (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 307f31f (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
          
  6. 
            2
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
>>>>>>> 6fa625b (Manifest_cache true)
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 824ea7c9 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8a3779d4 (Manifest_cache true)
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824ea7c9 (Manifest_cache true)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ef483b6d (Fix)
>>>>>>> 307f31f (Manifest_cache true)
>>>>>>> bf137e4 (Manifest_cache true)
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
          
  7. 
=======
>>>>>>> 5b7749a (Fix)
=======
>>>>>>> 7c4ea7f (Fix)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 307f31f (Manifest_cache true)
>>>>>>> bf137e4 (Manifest_cache true)
>>>>>>> 824ea7c9 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
          
  8. 
=======
>>>>>>> 5b7749a (Fix)
=======
>>>>>>> 7c4ea7f (Fix)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
>>>>>>> a71befd (Manifest_cache true)
          
  9. 
=======
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> 7c4ea7f (Fix)
          
  10. 
            3
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  11. 
            3
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> 9e081dc (Fix)
=======
          
  12. 
            2
>>>>>>> ae2a012 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824ea7c9 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> 8a3779d4 (Manifest_cache true)
=======
>>>>>>> 824bb2b (Featire specs)
=======
=======
<<<<<<< HEAD
=======
=======
>>>>>>> a71befd (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 7b22ad7e (Featire specs)
>>>>>>> 307f31f (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bf137e4 (Manifest_cache true)
=======
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> ae07231a (Featire specs)
>>>>>>> 307f31f (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> bf137e4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 824ea7c9 (Manifest_cache true)
=======
=======
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> 77d62af (Featire specs)
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> a71befd (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8a3779d4 (Manifest_cache true)
=======
=======
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> 51bc18c (Featire specs)
>>>>>>> 7b22ad7e (Featire specs)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
=======
          
  13. 
            2
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
  14. 
            2
>>>>>>> aa7b40c (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 24b58e6 (Manifest_cache true)
=======
          
  15. 
            2
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
          
  16. 
            2
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 824bb2b (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
          
  17. 
            2
>>>>>>> 183b6c5 (Manifest_cache true)
=======
>>>>>>> 6da9530 (Featire specs)
>>>>>>> 0f8241bb (Featire specs)
          
  18. 
            3
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
>>>>>>> bb5c652 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
          
  19. 
            3
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
>>>>>>> 9a49b7b (Rebased)
=======
=======
>>>>>>> 6fa625b (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 98beee2 (Manifest_cache true)
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 84d0df6 (Manifest_cache true)
=======
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 6fa625b (Manifest_cache true)
=======
>>>>>>> 24b58e6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 6fa625b (Manifest_cache true)
=======
>>>>>>> 24b58e6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
=======
<<<<<<< HEAD
>>>>>>> fdab719f (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 6fa625b (Manifest_cache true)
=======
>>>>>>> 24b58e6 (Manifest_cache true)
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> 99dad91f (Fix)
=======
          
  20. 
            2
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 00f8b58 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 99dad91f (Fix)
>>>>>>> 450f4e3 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
=======
          
  21. 
            
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> aa3618b (Rebased)
<<<<<<< HEAD
>>>>>>> 75fa7e1b (Rebased)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 311e9fa (Rebased)
=======
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> e055dd0 (Rebased)
=======
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 0c57e4e (Fix)
=======
          
  22. 
            3
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 160fb15 (Fix)
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> bf137e4 (Manifest_cache true)
=======
>>>>>>> 0c57e4e (Fix)
=======
>>>>>>> a71befd (Manifest_cache true)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
=======
=======
=======
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> 13fca83d (Rebased)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> ae884b47 (Fix)
=======
=======
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> bf137e4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 21793167 (Manifest_cache true)
=======
=======
=======
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
  23. 
            3
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0ea (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
>>>>>>> d9d85ca6 (Fix)
=======
          
  24. 
            3
>>>>>>> c7a726c5 (Rebased)
=======
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 450f4e3 (Manifest_cache true)
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
  25. 
            
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> aa3618b (Rebased)
<<<<<<< HEAD
>>>>>>> 11792758 (Rebased)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 311e9fa (Rebased)
=======
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
  26. 
            3
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 160fb15 (Fix)
<<<<<<< HEAD
>>>>>>> 31d15e66 (Fix)
=======
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> bf137e4 (Manifest_cache true)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> fdab719f (Fix)
=======
=======
=======
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> bc6bc8d2 (Rebased)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> 8288136d (Fix)
=======
=======
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> bf137e4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 824ea7c9 (Manifest_cache true)
=======
=======
=======
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
  27. 
            3
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
>>>>>>> ef483b6d (Fix)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> b28889f (Fix)
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
=======
>>>>>>> 49e8a6c (Rebased)
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 0c57e4e (Fix)
<<<<<<< HEAD
>>>>>>> 8887ba5b (Fix)
=======
=======
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a71befd (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8a3779d4 (Manifest_cache true)
=======
=======
=======
=======
=======
          
  28. 
            3
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
>>>>>>> 9e081dc (Fix)
>>>>>>> 1049b80c (Fix)
            

            

                "#{first_name} #{last_name}"
          
    29. 
        
    
      
        
    
          
  29. 
            
            

            

              end
          
    30. 
        
    
      
        
    
          
  30. 
            
            

            

            end
          
    31.

app/decorators/book_decorator.rb

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 99dad91f (Fix) 100.0% <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) ======= <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> 1d59aaa (Fix) ======= <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) 90.0% ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8a3779d4 (Manifest_cache true) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 824ea7c9 (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= ======= >>>>>>> a71befd (Manifest_cache true) >>>>>>> 8a3779d4 (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824ea7c9 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 8a3779d4 (Manifest_cache true) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) >>>>>>> a71befd (Manifest_cache true) >>>>>>> 8a3779d4 (Manifest_cache true) 100.0% ======= 90.0% >>>>>>> ae2a012 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824ea7c9 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 8a3779d4 (Manifest_cache true) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> a71befd (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> a71befd (Manifest_cache true) >>>>>>> 8a3779d4 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= ======= 90.0% >>>>>>> bd8bda4 (Manifest_cache true) ======= 90.0% >>>>>>> aa7b40c (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 24b58e6 (Manifest_cache true) ======= 90.0% >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) 90.0% >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= 90.0% >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) 100.0% >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) 100.0% >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 99dad91f (Fix) >>>>>>> 9a49b7b (Rebased) ======= ======= >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 98beee2 (Manifest_cache true) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 84d0df6 (Manifest_cache true) ======= ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> 24b58e6 (Manifest_cache true) >>>>>>> e18eb87 (Fix) ======= >>>>>>> 99dad91f (Fix) ======= 90.0% >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 99dad91f (Fix) >>>>>>> 450f4e3 (Manifest_cache true) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= 66.67% >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> e055dd0 (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) ======= 100.0% >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> bf137e4 (Manifest_cache true) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> a71befd (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= 100.0% >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 450f4e3 (Manifest_cache true) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= 66.67% >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= 100.0% >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> bf137e4 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= 100.0% >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> a71befd (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8a3779d4 (Manifest_cache true) ======= ======= ======= ======= 100.0% >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) >>>>>>> 9e081dc (Fix) >>>>>>> 1049b80c (Fix) lines covered

<<<<<<< HEAD 12 relevant lines. 12 lines covered and 0 lines missed. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 12 relevant lines. 12 lines covered and 0 lines missed. ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 98beee2 (Manifest_cache true) ======= >>>>>>> 84d0df6 (Manifest_cache true) ======= >>>>>>> 450f4e3 (Manifest_cache true) ======= >>>>>>> aa3618b (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8a3779d4 (Manifest_cache true) ======= >>>>>>> 1049b80c (Fix) >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 824ea7c9 (Manifest_cache true) >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) >>>>>>> 824ea7c9 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= >>>>>>> 307f31f (Manifest_cache true) >>>>>>> a71befd (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8a3779d4 (Manifest_cache true) ======= ======= ======= >>>>>>> 1d59aaa (Fix) >>>>>>> 9e081dc (Fix) >>>>>>> 1049b80c (Fix) 10 relevant lines. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) 9 lines covered and 1 lines missed. ======= <<<<<<< HEAD 10 lines covered and 0 lines missed. ======= 9 lines covered and 1 lines missed. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= ======= 9 lines covered and 1 lines missed. >>>>>>> bd8bda4 (Manifest_cache true) ======= 9 lines covered and 1 lines missed. >>>>>>> aa7b40c (Manifest_cache true) ======= 9 lines covered and 1 lines missed. >>>>>>> 183b6c5 (Manifest_cache true) ======= 10 lines covered and 0 lines missed. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ef483b6d (Fix) 12 relevant lines. 12 lines covered and 0 lines missed. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> ef483b6d (Fix) >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= 9 lines covered and 1 lines missed. >>>>>>> ae2a012 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 98beee2 (Manifest_cache true) ======= ======= ======= 10 relevant lines. 9 lines covered and 1 lines missed. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 84d0df6 (Manifest_cache true) ======= ======= ======= 10 relevant lines. 9 lines covered and 1 lines missed. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 450f4e3 (Manifest_cache true) ======= ======= 12 relevant lines. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 8 lines covered and 4 lines missed. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= ======= 12 lines covered and 0 lines missed. >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) 12 relevant lines. 12 lines covered and 0 lines missed. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> 1d59aaa (Fix) >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> c033601 (Rebased) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= 9 lines covered and 1 lines missed. >>>>>>> ae2a012 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) ======= ======= 10 relevant lines. 9 lines covered and 1 lines missed. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= ======= 10 relevant lines. 9 lines covered and 1 lines missed. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) ======= 12 relevant lines. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) 8 lines covered and 4 lines missed. >>>>>>> bf554f4 (Rebased) ======= 12 lines covered and 0 lines missed. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= 8 lines covered and 4 lines missed. >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= ======= >>>>>>> 31d15e66 (Fix) 8 lines covered and 4 lines missed. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= ======= ======= 12 lines covered and 0 lines missed. >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) >>>>>>> 31d15e66 (Fix) ======= ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) 12 relevant lines. 12 lines covered and 0 lines missed. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> c033601 (Rebased) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= 9 lines covered and 1 lines missed. >>>>>>> ae2a012 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) ======= ======= 10 relevant lines. 9 lines covered and 1 lines missed. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= ======= 10 relevant lines. 9 lines covered and 1 lines missed. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) ======= 12 relevant lines. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) 8 lines covered and 4 lines missed. >>>>>>> bf554f4 (Rebased) ======= 12 lines covered and 0 lines missed. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= 8 lines covered and 4 lines missed. >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) 12 relevant lines. 12 lines covered and 0 lines missed. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= 9 lines covered and 1 lines missed. >>>>>>> ae2a012 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) ======= ======= 10 relevant lines. 9 lines covered and 1 lines missed. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= ======= 10 relevant lines. 9 lines covered and 1 lines missed. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) ======= 12 relevant lines. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) 8 lines covered and 4 lines missed. >>>>>>> bf554f4 (Rebased) ======= 12 lines covered and 0 lines missed. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= 8 lines covered and 4 lines missed. >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> a71befd (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8a3779d4 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) >>>>>>> 9e081dc (Fix) >>>>>>> 1049b80c (Fix) 
    
    
      
        
    
          
  1. 
            1
            

            

            require 'monetize'
          
    2. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 75fa7e1b (Rebased)
=======
>>>>>>> 84809242 (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 11792758 (Rebased)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
          
  2. 
=======
          
  3. 
            1
<<<<<<< HEAD
=======
=======
=======
>>>>>>> ebcdce06 (Featire specs)
          
  4. 
=======
          
  5. 
            1
            

            

              decorates_association :authors
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
              SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> bd8bda4 (Manifest_cache true)
=======
              SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> aa7b40c (Manifest_cache true)
=======
              SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
          
    6. 
        
    
      
        
    
          
  6. 
            1
            

            

<<<<<<< HEAD
              decorates_association :categories
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              decorates_association :categories
=======
              PAGINATION_PER_PAGE = 12
>>>>>>> 752f0c0 (Featire specs)
=======
              decorates_association :categories
>>>>>>> bd8bda4 (Manifest_cache true)
=======
              PAGINATION_PER_PAGE = 12
>>>>>>> 4e81ea2 (Featire specs)
=======
              decorates_association :categories
>>>>>>> aa7b40c (Manifest_cache true)
=======
              PAGINATION_PER_PAGE = 12
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
          
    7. 
        
    
      
        
    
          
  7. 
>>>>>>> 9bfbd88 (Featire specs)
            
>>>>>>> 9a49b7b (Rebased)
=======
=======
>>>>>>> 450f4e3 (Manifest_cache true)
          
  8. 
            
=======
          
  9. 
            1
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 84d0df6 (Manifest_cache true)
=======
=======
          
  10. 
            1
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 450f4e3 (Manifest_cache true)
=======
          
  11. 
            
>>>>>>> aa3618b (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 75fa7e1b (Rebased)
=======
=======
>>>>>>> 84003439 (Featire specs)
=======
          
  12. 
            
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
          
  13. 
            
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> fd3f47ab (Featire specs)
=======
          
  14. 
            
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 11792758 (Rebased)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
          
  15. 
            
>>>>>>> 6da9530 (Featire specs)
>>>>>>> 0f8241bb (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 13fca83d (Rebased)
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> ef483b6d (Fix)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> bdc24a1a (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 75fa7e1b (Rebased)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> ef483b6d (Fix)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> bdc24a1a (Rebased)
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> d9d85ca6 (Fix)
=======
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> bc6bc8d2 (Rebased)
=======
=======
>>>>>>> e055dd0 (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 13fca83d (Rebased)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
>>>>>>> d9d85ca6 (Fix)
=======
>>>>>>> 11792758 (Rebased)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 5b7749a (Fix)
>>>>>>> ef483b6d (Fix)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
=======
>>>>>>> 1d59aaa (Fix)
>>>>>>> 9e081dc (Fix)
>>>>>>> 1049b80c (Fix)
              decorates_association :authors
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
              SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> bd8bda4 (Manifest_cache true)
=======
              SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze
>>>>>>> 4e81ea2 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> 4a2f2ad8 (Featire specs)
=======
>>>>>>> 73f364d8 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
=======
>>>>>>> 715fac2 (Featire specs)
>>>>>>> fb61c5a (Featire specs)
>>>>>>> 73f364d8 (Featire specs)
>>>>>>> aa7b40c (Manifest_cache true)
=======
              SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 72b9cab (Featire specs)
=======
>>>>>>> fb61c5a (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> 4f4ea3f9 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 7a08014b (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
            
<<<<<<< HEAD
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 7a08014b (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 00f8b58 (Manifest_cache true)
            
=======
              decorates_association :authors
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 24b58e6 (Manifest_cache true)
=======
=======
              decorates_association :authors
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 00f8b58 (Manifest_cache true)
=======
            
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 75fa7e1b (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
=======
=======
>>>>>>> 00f8b58 (Manifest_cache true)
            
=======
              decorates_association :authors
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 24b58e6 (Manifest_cache true)
=======
=======
              decorates_association :authors
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 00f8b58 (Manifest_cache true)
=======
            
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> 13fca83d (Rebased)
=======
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
              SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888bf (Featire specs)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
              SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
=======
=======
              SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
=======
              SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze
>>>>>>> 4552227 (Featire specs)
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 393eff3b (Featire specs)
=======
=======
=======
            
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
>>>>>>> d9d85ca6 (Fix)
=======
>>>>>>> 11792758 (Rebased)
=======
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
=======
=======
=======
>>>>>>> 00f8b58 (Manifest_cache true)
            
=======
              decorates_association :authors
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 24b58e6 (Manifest_cache true)
=======
=======
              decorates_association :authors
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 00f8b58 (Manifest_cache true)
=======
            
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> bc6bc8d2 (Rebased)
=======
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
              SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> c12b71de (Featire specs)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
              SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
=======
=======
              SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
=======
              SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze
>>>>>>> 4552227 (Featire specs)
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b904d7ae (Featire specs)
=======
=======
=======
            
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
>>>>>>> ef483b6d (Fix)
=======
=======
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
=======
            
<<<<<<< HEAD
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
=======
=======
>>>>>>> 00f8b58 (Manifest_cache true)
            
=======
              decorates_association :authors
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 24b58e6 (Manifest_cache true)
=======
=======
              decorates_association :authors
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 00f8b58 (Manifest_cache true)
=======
            
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
=======
=======
=======
              SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
=======
=======
              SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
=======
=======
=======
              SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
=======
=======
=======
              SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze
>>>>>>> 4552227 (Featire specs)
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 392646b5 (Featire specs)
=======
=======
=======
=======
            
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 715fac2 (Featire specs)
>>>>>>> fb61c5a (Featire specs)
>>>>>>> 73f364d8 (Featire specs)
          
    16. 
        
    
      
        
    
          
  16. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 75fa7e1b (Rebased)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 13fca83d (Rebased)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 393eff3b (Featire specs)
=======
>>>>>>> d9d85ca6 (Fix)
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> b904d7ae (Featire specs)
=======
>>>>>>> ef483b6d (Fix)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> e6fc67c7 (Featire specs)
=======
>>>>>>> bdc24a1a (Rebased)
=======
>>>>>>> 73f364d8 (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 7a08014b (Featire specs)
=======
=======
>>>>>>> df37394 (Featire specs)
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
=======
>>>>>>> fb61c5a (Featire specs)
=======
>>>>>>> df37394 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4a2f2ad8 (Featire specs)
=======
>>>>>>> 21873de0 (Featire specs)
=======
>>>>>>> 392646b5 (Featire specs)
=======
>>>>>>> 1049b80c (Fix)
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> 13fca83d (Rebased)
=======
=======
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
>>>>>>> c12b71de (Featire specs)
=======
=======
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4bf888bf (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 393eff3b (Featire specs)
=======
=======
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
>>>>>>> d9d85ca6 (Fix)
=======
>>>>>>> 11792758 (Rebased)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 7a08014b (Featire specs)
=======
>>>>>>> 49e8a6c (Rebased)
>>>>>>> 311e9fa (Rebased)
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> c12b71de (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 36356d3 (Featire specs)
>>>>>>> b904d7ae (Featire specs)
=======
=======
>>>>>>> 5b7749a (Fix)
>>>>>>> ef483b6d (Fix)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
>>>>>>> df37394 (Featire specs)
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
=======
>>>>>>> df37394 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
=======
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
=======
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
=======
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 392646b5 (Featire specs)
=======
=======
=======
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
=======
>>>>>>> 715fac2 (Featire specs)
>>>>>>> fb61c5a (Featire specs)
>>>>>>> 73f364d8 (Featire specs)
              decorates_association :categories
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              decorates_association :categories
=======
              PAGINATION_PER_PAGE = 12
>>>>>>> 752f0c0 (Featire specs)
=======
              decorates_association :categories
>>>>>>> bd8bda4 (Manifest_cache true)
=======
              PAGINATION_PER_PAGE = 12
>>>>>>> 4e81ea2 (Featire specs)
=======
              decorates_association :categories
>>>>>>> aa7b40c (Manifest_cache true)
=======
              PAGINATION_PER_PAGE = 12
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 4f4ea3f9 (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> e6fc67c7 (Featire specs)
=======
>>>>>>> 73f364d8 (Featire specs)
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 7a08014b (Featire specs)
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 24b58e6 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c12b71de (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
            class BookDecorator < Draper::Decorator
>>>>>>> c033601 (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
            class BookDecorator < Draper::Decorator
>>>>>>> c033601 (Rebased)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 7a08014b (Featire specs)
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> fd3f47ab (Featire specs)
            class BookDecorator < Draper::Decorator
=======
              decorates_association :categories
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 00f8b58 (Manifest_cache true)
=======
            class BookDecorator < Draper::Decorator
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 75fa7e1b (Rebased)
=======
<<<<<<< HEAD
=======
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
=======
=======
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> b904d7ae (Featire specs)
            class BookDecorator < Draper::Decorator
=======
              PAGINATION_PER_PAGE = 12
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> ef483b6d (Fix)
=======
=======
            class BookDecorator < Draper::Decorator
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
>>>>>>> d9d85ca6 (Fix)
=======
>>>>>>> 11792758 (Rebased)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> ef483b6d (Fix)
          
    17. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  17. 
>>>>>>> 9bfbd88 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  18. 
>>>>>>> 9bfbd88 (Featire specs)
=======
          
  19. 
            1
            

            

              decorates_association :authors
          
    20. 
        
    
      
        
    
          
  20. 
>>>>>>> 9a49b7b (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5b7749a (Fix)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 5b7749a (Fix)
>>>>>>> ef483b6d (Fix)
          
  21. 
            1
            

            

              decorates_association :authors
          
    22. 
        
    
      
        
    
          
  22. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> ef483b6d (Fix)
=======
          
  23. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
>>>>>>> 5b7749a (Fix)
>>>>>>> d9d85ca6 (Fix)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 5b7749a (Fix)
>>>>>>> ef483b6d (Fix)
            
            

            

            
          
    24. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> d9d85ca6 (Fix)
=======
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> ef483b6d (Fix)
          
  24. 
            1
            

            

            class BookDecorator < Draper::Decorator
=======
            class BookDecorator < Draper::Decorator
>>>>>>> c033601 (Rebased)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
>>>>>>> c51bf93 (Featire specs)
=======
>>>>>>> df37394 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e54deeb (Featire specs)
            class BookDecorator < Draper::Decorator
>>>>>>> c033601 (Rebased)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> f7852d17 (Manifest_cache true)
            class BookDecorator < Draper::Decorator
=======
              decorates_association :categories
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 00f8b58 (Manifest_cache true)
=======
            class BookDecorator < Draper::Decorator
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
>>>>>>> 49e8a6c (Rebased)
>>>>>>> 311e9fa (Rebased)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> df37394 (Featire specs)
>>>>>>> c51bf93 (Featire specs)
>>>>>>> 7a08014b (Featire specs)
=======
>>>>>>> 49e8a6c (Rebased)
>>>>>>> 311e9fa (Rebased)
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
=======
            class BookDecorator < Draper::Decorator
>>>>>>> c033601 (Rebased)
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
>>>>>>> fb61c5a (Featire specs)
=======
<<<<<<< HEAD
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> ee5242b (Featire specs)
            class BookDecorator < Draper::Decorator
>>>>>>> c033601 (Rebased)
=======
<<<<<<< HEAD
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
=======
            class BookDecorator < Draper::Decorator
=======
              decorates_association :categories
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 00f8b58 (Manifest_cache true)
=======
            class BookDecorator < Draper::Decorator
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
=======
=======
=======
>>>>>>> 94841b5 (Featire specs)
            class BookDecorator < Draper::Decorator
=======
              PAGINATION_PER_PAGE = 12
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
=======
=======
            class BookDecorator < Draper::Decorator
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
=======
>>>>>>> 715fac2 (Featire specs)
>>>>>>> fb61c5a (Featire specs)
>>>>>>> 73f364d8 (Featire specs)
          
    25. 
        
    
      
        
    
          
  25. 
            1
            

            

              decorates_association :authors
          
    26. 
        
    
      
        
    
          
  26. 
            
            

            

            
          
    27. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> 21873de0 (Featire specs)
=======
>>>>>>> 1049b80c (Fix)
=======
>>>>>>> 9a49b7b (Rebased)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
>>>>>>> d9d85ca6 (Fix)
=======
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 5b7749a (Fix)
>>>>>>> ef483b6d (Fix)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
>>>>>>> 9e081dc (Fix)
>>>>>>> 1049b80c (Fix)
          
  27. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
>>>>>>> 4f4ea3f9 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> ebcdce06 (Featire specs)
=======
>>>>>>> df37394 (Featire specs)
>>>>>>> 7a08014b (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
=======
=======
>>>>>>> df37394 (Featire specs)
>>>>>>> f92a45b (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> bd8bda4 (Manifest_cache true)
=======
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> 7a08014b (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> f92a45b (Featire specs)
>>>>>>> e6fc67c7 (Featire specs)
=======
>>>>>>> c033601 (Rebased)
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
>>>>>>> c033601 (Rebased)
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> c033601 (Rebased)
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> ebcdce06 (Featire specs)
=======
>>>>>>> 7a08014b (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
>>>>>>> c033601 (Rebased)
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> f92a45b (Featire specs)
>>>>>>> e6fc67c7 (Featire specs)
              def self.collection_decorator_class
          
    28. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> 11792758 (Rebased)
=======
>>>>>>> 31d15e66 (Fix)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> bdc24a1a (Rebased)
=======
>>>>>>> 8887ba5b (Fix)
=======
=======
>>>>>>> 9a49b7b (Rebased)
=======
>>>>>>> aa3618b (Rebased)
=======
>>>>>>> 160fb15 (Fix)
=======
=======
>>>>>>> 311e9fa (Rebased)
=======
>>>>>>> 557c1b8 (Fix)
=======
=======
>>>>>>> e055dd0 (Rebased)
=======
>>>>>>> 0c57e4e (Fix)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 872e675 (Fix)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 872e675 (Fix)
=======
<<<<<<< HEAD
>>>>>>> 160fb15 (Fix)
=======
=======
>>>>>>> 311e9fa (Rebased)
=======
>>>>>>> 557c1b8 (Fix)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> 11792758 (Rebased)
<<<<<<< HEAD
>>>>>>> bb5c652 (Fix book_spec decrease quantity and price)
=======
=======
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 75fa7e1b (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> bb5c652 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 22ee41c (Add login registration pages)
>>>>>>> 88d49ad (Add login registration pages)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 22ee41c (Add login registration pages)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 22ee41c (Add login registration pages)
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 22ee41c (Add login registration pages)
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 22ee41c (Add login registration pages)
>>>>>>> 6da9530 (Featire specs)
>>>>>>> 0f8241bb (Featire specs)
          
  28. 
            
=======
<<<<<<< HEAD
          
  29. 
            30
=======
          
  30. 
            
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> bb5c652 (Fix book_spec decrease quantity and price)
>>>>>>> 84809242 (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
=======
          
  31. 
            
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
  32. 
            
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
  33. 
            31
>>>>>>> 1214e1f (Add login registration pages)
=======
          
  34. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
  35. 
            30
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
          
  36. 
            56
>>>>>>> aca90e3 (Rebased)
<<<<<<< HEAD
=======
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> bb5c652 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
>>>>>>> 0f8241bb (Featire specs)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
=======
          
  37. 
            31
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 22ee41c (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> 73dcd461 (Add login registration pages)
>>>>>>> 88d49ad (Add login registration pages)
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> 8d4ec55 (Add login registration pages)
=======
>>>>>>> 73dcd461 (Add login registration pages)
          
  38. 
            56
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> bdc24a1a (Rebased)
>>>>>>> 9a49b7b (Rebased)
=======
>>>>>>> e055dd0 (Rebased)
=======
>>>>>>> c8da2e3 (Fix)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> bc6bc8d2 (Rebased)
>>>>>>> 311e9fa (Rebased)
=======
=======
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9a49b7b (Rebased)
=======
>>>>>>> 11792758 (Rebased)
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> e18eb87 (Fix)
=======
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> bdc24a1a (Rebased)
          
  39. 
            
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> bdc24a1a (Rebased)
=======
>>>>>>> 8887ba5b (Fix)
>>>>>>> aa3618b (Rebased)
<<<<<<< HEAD
>>>>>>> 75fa7e1b (Rebased)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 311e9fa (Rebased)
=======
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> e055dd0 (Rebased)
=======
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 0c57e4e (Fix)
=======
          
  40. 
            58
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 160fb15 (Fix)
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 0c57e4e (Fix)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
=======
=======
=======
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> 13fca83d (Rebased)
=======
=======
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> ae884b47 (Fix)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> aa3618b (Rebased)
>>>>>>> 11792758 (Rebased)
=======
<<<<<<< HEAD
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> bc6bc8d2 (Rebased)
>>>>>>> aa3618b (Rebased)
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 311e9fa (Rebased)
=======
          
  41. 
            58
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> 160fb15 (Fix)
<<<<<<< HEAD
>>>>>>> 31d15e66 (Fix)
=======
>>>>>>> b28889f (Fix)
>>>>>>> e18eb87 (Fix)
=======
=======
>>>>>>> 49e8a6c (Rebased)
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 0c57e4e (Fix)
>>>>>>> 8887ba5b (Fix)
            

            

                PaginatingDecorator
          
    42. 
        
    
      
        
    
          
  42. 
            
            

            

              end
          
    43. 
        
    
      
        
    
          
  43. 
            
            

            

            
          
    44. 
        
    
      
        
    
          
  44. 
            1
            

            

              delegate_all
          
    45. 
        
    
      
        
    
          
  45. 
            
            

            

            
          
    46. 
        
    
      
        
    
          
  46. 
            1
            

            

              def authors_names
          
    47. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> 11792758 (Rebased)
=======
>>>>>>> 31d15e66 (Fix)
=======
=======
>>>>>>> 9a49b7b (Rebased)
=======
>>>>>>> aa3618b (Rebased)
=======
>>>>>>> 160fb15 (Fix)
=======
<<<<<<< HEAD
>>>>>>> 160fb15 (Fix)
=======
=======
>>>>>>> 311e9fa (Rebased)
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 5b7749a (Fix)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> 11792758 (Rebased)
<<<<<<< HEAD
>>>>>>> bb5c652 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 75fa7e1b (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> bb5c652 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 22ee41c (Add login registration pages)
>>>>>>> 88d49ad (Add login registration pages)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 22ee41c (Add login registration pages)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 22ee41c (Add login registration pages)
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 22ee41c (Add login registration pages)
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
          
  47. 
            1
=======
<<<<<<< HEAD
          
  48. 
            89
=======
          
  49. 
            1
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> bb5c652 (Fix book_spec decrease quantity and price)
>>>>>>> 84809242 (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
  50. 
            1
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
  51. 
            1
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
  52. 
            90
>>>>>>> 1214e1f (Add login registration pages)
=======
          
  53. 
            1
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
  54. 
            89
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
          
  55. 
            101
>>>>>>> aca90e3 (Rebased)
<<<<<<< HEAD
=======
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> bb5c652 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
=======
          
  56. 
            90
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 22ee41c (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 88d49ad (Add login registration pages)
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
  57. 
            101
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
>>>>>>> 9a49b7b (Rebased)
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 311e9fa (Rebased)
=======
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 9a49b7b (Rebased)
=======
>>>>>>> 11792758 (Rebased)
=======
          
  58. 
=======
          
  59. 
>>>>>>> f7852d17 (Manifest_cache true)
            
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> f7852d17 (Manifest_cache true)
>>>>>>> aa3618b (Rebased)
<<<<<<< HEAD
>>>>>>> 75fa7e1b (Rebased)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 311e9fa (Rebased)
=======
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 557c1b8 (Fix)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
  60. 
            105
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
          
  61. 
            58
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8288136d (Fix)
=======
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
>>>>>>> 160fb15 (Fix)
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
=======
>>>>>>> 557c1b8 (Fix)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
=======
=======
=======
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> 13fca83d (Rebased)
=======
=======
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> ae884b47 (Fix)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
          
  62. 
            109
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
>>>>>>> d9d85ca6 (Fix)
=======
>>>>>>> aa3618b (Rebased)
>>>>>>> 11792758 (Rebased)
=======
>>>>>>> aa3618b (Rebased)
=======
=======
          
  63. 
            105
>>>>>>> a5d032d (Fix)
>>>>>>> 160fb15 (Fix)
>>>>>>> 31d15e66 (Fix)
            

            

                authors.map(&:full_name).join(', ')
          
    64. 
        
    
      
        
    
          
  64. 
            
            

            

              end
          
    65. 
        
    
      
        
    
          
  65. 
            
            

            

            
          
    66. 
        
    
      
        
    
          
  66. 
            1
            

            

              def categories_names
          
    67. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  67. 
            12
=======
          
  68. 
            8
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> 311e9fa (Rebased)
=======
>>>>>>> 557c1b8 (Fix)
          
  69. 
            8
=======
          
  70. 
            12
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
=======
=======
          
  71. 
            
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
=======
=======
          
  72. 
            12
>>>>>>> 872e675 (Fix)
>>>>>>> 557c1b8 (Fix)
=======
          
  73. 
            12
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
          
  74. 
            12
>>>>>>> e3e66f3 (Featire specs)
=======
          
  75. 
            
>>>>>>> 11792758 (Rebased)
=======
          
  76. 
            12
>>>>>>> 31d15e66 (Fix)
            

            

                categories.pluck(:name).join(', ')
          
    77. 
        
    
      
        
    
          
  77. 
            
            

            

              end
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
          
    78. 
        
    
      
        
    
          
  78. 
            
            

            

<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
>>>>>>> c033601 (Rebased)
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84809242 (Featire specs)
            
          
    79. 
        
    
      
        
    
          
  79. 
            1
            

            

              def price
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> 9a49b7b (Rebased)
=======
>>>>>>> 824bb2b (Featire specs)
          
    80. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
          
  80. 
            121
=======
          
  81. 
            
>>>>>>> 11792758 (Rebased)
            

            

                Money.new(price_cents)
          
    82. 
        
    
      
        
    
          
  82. 
<<<<<<< HEAD
=======
          
  83. 
>>>>>>> 9a49b7b (Rebased)
=======
>>>>>>> 824bb2b (Featire specs)
            
            

            

              end
          
    84. 
        
    
      
        
    
          
  84. 
            
            

            

<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
>>>>>>> c033601 (Rebased)
            
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> bb5c652 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
          
    85. 
        
    
      
        
    
          
  85. 
            1
            

            

              def price
>>>>>>> 84809242 (Featire specs)
          
    86. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  86. 
            125
=======
=======
>>>>>>> 311e9fa (Rebased)
=======
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
          
  87. 
            121
=======
          
  88. 
            125
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
=======
=======
          
  89. 
            
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
=======
=======
          
  90. 
            125
>>>>>>> 872e675 (Fix)
>>>>>>> 557c1b8 (Fix)
=======
          
  91. 
            125
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
          
  92. 
            125
>>>>>>> e3e66f3 (Featire specs)
=======
          
  93. 
            144
>>>>>>> 5b7749a (Fix)
=======
          
  94. 
            143
>>>>>>> 366b257 (Fix)
=======
          
  95. 
            125
>>>>>>> 31d15e66 (Fix)
            

            

                Money.new(price_cents)
          
    96. 
        
    
      
        
    
          
  96. 
            
            

            

              end
          
    97. 
        
    
      
        
    
          
  97. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9a49b7b (Rebased)
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
>>>>>>> 9a49b7b (Rebased)
=======
>>>>>>> 824bb2b (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
            end
          
    98.
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 557c1b8 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 557c1b8 (Fix) >>>>>>> 8288136d (Fix) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======

app/decorators/order_book_decorator.rb

100.0% lines covered

5 relevant lines. 5 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            require 'monetize'
          
    2. 
        
    
      
        
    
          
  2. 
            
            

            

            
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

            class OrderBookDecorator < Draper::Decorator
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              delegate_all
          
    5. 
        
    
      
        
    
          
  5. 
            
            

            

            
          
    6. 
        
    
      
        
    
          
  6. 
            1
            

            

              def total_price
          
    7. 
        
    
      
        
    
          
  7. 
            8
            

            

                Money.new(book.price_cents * quantity)
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

              end
          
    9. 
        
    
      
        
    
          
  9. 
            
            

            

            end
          
    10.

app/decorators/order_decorator.rb

100.0% lines covered

8 relevant lines. 8 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            require 'monetize'
          
    2. 
        
    
      
        
    
          
  2. 
            
            

            

            
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

            class OrderDecorator < Draper::Decorator
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              delegate_all
          
    5. 
        
    
      
        
    
          
  5. 
            
            

            

            
          
    6. 
        
    
      
        
    
          
  6. 
            1
            

            

              def order_price(coupon = 0)
          
    7. 
        
    
      
        
    
          
  7. 
            27
            

            

                total_price = 0
          
    8. 
        
    
      
        
    
          
  8. 
            27
            

            

                order_books.each do |order_book|
          
    9. 
        
    
      
        
    
          
  9. 
            25
            

            

                  total_price += order_book.book.price_cents * order_book.quantity
          
    10. 
        
    
      
        
    
          
  10. 
            
            

            

                end
          
    11. 
        
    
      
        
    
          
  11. 
            27
            

            

                Money.new(total_price - (total_price * coupon))
          
    12. 
        
    
      
        
    
          
  12. 
            
            

            

              end
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

            end
          
    14.
>>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 31d15e66 (Fix)

app/decorators/paginating_decorator.rb

100.0% lines covered

2 relevant lines. 2 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class PaginatingDecorator < Draper::CollectionDecorator
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
            
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
=======
            
>>>>>>> bd8bda4 (Manifest_cache true)
=======
            
>>>>>>> aa7b40c (Manifest_cache true)
=======
            
>>>>>>> 183b6c5 (Manifest_cache true)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bb5c652 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c033601 (Rebased)
>>>>>>> 9a49b7b (Rebased)
=======
=======
>>>>>>> c033601 (Rebased)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
=======
>>>>>>> c033601 (Rebased)
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
=======
>>>>>>> c033601 (Rebased)
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
          
    2. 
        
    
      
        
    
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
          
  2. 
=======
<<<<<<< HEAD
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bb5c652 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c033601 (Rebased)
>>>>>>> 9a49b7b (Rebased)
=======
=======
>>>>>>> c033601 (Rebased)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
=======
>>>>>>> c033601 (Rebased)
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
=======
>>>>>>> c033601 (Rebased)
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
          
  3. 
            1
            

            

              delegate :current_page, :per_page, :offset, :total_entries, :total_pages
          
    4. 
        
    
      
        
    
          
  4. 
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
          
  5. 
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
=======
          
  6. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
  7. 
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
  8. 
>>>>>>> 183b6c5 (Manifest_cache true)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bb5c652 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c033601 (Rebased)
>>>>>>> 9a49b7b (Rebased)
=======
=======
>>>>>>> c033601 (Rebased)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
=======
>>>>>>> c033601 (Rebased)
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
=======
>>>>>>> c033601 (Rebased)
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
            
            

            

            end
          
    9. 
        
    
      
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)

app/decorators/review_decorator.rb

100.0% lines covered

4 relevant lines. 4 lines covered and 0 lines missed. 
    
    
      
<<<<<<< HEAD
=======
=======
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
=======
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bb5c652 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======

app/decorators/review_decorator.rb

100.0% lines covered

4 relevant lines. 4 lines covered and 0 lines missed. 
    
    
      
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9a49b7b (Rebased)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
        
    
          
  1. 
            1
            

            

            class ReviewDecorator < Draper::Decorator
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              delegate_all
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            
          
    4. 
        
    
      
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
        
    
          
  4. 
            1
            

            

              def date_time
          
    5. 
        
    
      
        
    
          
  5. 
            1
            

            

                created_at.strftime('%m/%d/%Y')
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

              end
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

            end
          
    8.

app/decorators/user_decorator.rb

100.0% lines covered

5 relevant lines. 5 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class UserDecorator < Draper::Decorator
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              delegate_all
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              def name_or_email
          
    5. 
        
    
      
        
    
          
  5. 
            2
            

            

                return name if name.present?
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

            
          
    7. 
        
    
      
        
    
          
  7. 
            2
            

            

                email.split('@').first.capitalize
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

              end
          
    9. 
        
    
      
        
    
          
  9. 
            
            

            

            end
          
    10. 
        
    
      
<<<<<<< HEAD
=======
=======
=======
>>>>>>> 9a49b7b (Rebased)
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
=======
>>>>>>> bd8bda4 (Manifest_cache true)
=======
>>>>>>> aa7b40c (Manifest_cache true)
=======
>>>>>>> 183b6c5 (Manifest_cache true)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bb5c652 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
        
    
          
  10. 
            1
            

            

              def date_time
          
    11. 
        
    
      
        
    
          
  11. 
            1
            

            

                created_at.strftime('%m/%d/%Y')
          
    12. 
        
    
      
        
    
          
  12. 
            
            

            

              end
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

            end
          
    14. 
        
    
      
>>>>>>> 84809242 (Featire specs)
<<<<<<< HEAD =======

app/decorators/user_decorator.rb

100.0% lines covered

5 relevant lines. 5 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class UserDecorator < Draper::Decorator
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              delegate_all
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              def name_or_email
          
    5. 
        
    
      
        
    
          
  5. 
            2
            

            

                return name if name.present?
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

            
          
    7. 
        
    
      
        
    
          
  7. 
            2
            

            

                email.split('@').first.capitalize
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

              end
          
    9. 
        
    
      
        
    
          
  9. 
            
            

            

            end
          
    10. 
        
    
      
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9a49b7b (Rebased)
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> a5d032d (Fix)

app/decorators/paginating_decorator.rb

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 100.0% <<<<<<< HEAD ======= ======= 100.0% >>>>>>> 872e675 (Fix) ======= 100.0% >>>>>>> 0d6dd12 (Manifest_cache true) ======= 100.0% >>>>>>> e3e66f3 (Featire specs) lines covered

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 557c1b8 (Fix) 2 relevant lines. 2 lines covered and ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) 3 relevant lines. 3 lines covered and ======= 4 relevant lines. 4 lines covered and >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= 4 relevant lines. 4 lines covered and >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) ======= 2 relevant lines. 2 lines covered and >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= ======= 4 relevant lines. 4 lines covered and >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= 2 relevant lines. 2 lines covered and >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= 2 relevant lines. 2 lines covered and >>>>>>> 0d6dd12 (Manifest_cache true) ======= 2 relevant lines. 2 lines covered and >>>>>>> e3e66f3 (Featire specs) 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
            class PaginatingDecorator < Draper::CollectionDecorator
=======
            module ApplicationHelper
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> 02a399d (Manifest_cache true)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> b3f2049 (Featire specs)
>>>>>>> 009401d (Featire specs)
=======
            class PaginatingDecorator < Draper::CollectionDecorator
>>>>>>> c8da2e3 (Fix)
=======
            class PaginatingDecorator < Draper::CollectionDecorator
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
            class PaginatingDecorator < Draper::CollectionDecorator
>>>>>>> e3e66f3 (Featire specs)
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              delegate :current_page, :per_page, :offset, :total_entries, :total_pages
=======
<<<<<<< HEAD
              def markdown(text)
=======
              SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
              delegate :current_page, :per_page, :offset, :total_entries, :total_pages
>>>>>>> 872e675 (Fix)
=======
              delegate :current_page, :per_page, :offset, :total_entries, :total_pages
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
              delegate :current_page, :per_page, :offset, :total_entries, :total_pages
>>>>>>> e3e66f3 (Featire specs)
          
    3. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
          
  3. 
            
            

            

            end
          
    4.

app/decorators/review_decorator.rb

100.0% <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= 75.0% >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) lines covered

4 relevant lines. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 3 lines covered and <<<<<<< HEAD ======= 4 relevant lines. 4 lines covered and >>>>>>> d0dc1f1 (Featire specs) ======= 4 relevant lines. 4 lines covered and >>>>>>> 752f0c0 (Featire specs) ======= 4 relevant lines. 4 lines covered and <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 4e81ea2 (Featire specs) ======= 4 relevant lines. 4 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= 4 relevant lines. 4 lines covered and >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) ======= 4 lines covered and >>>>>>> 872e675 (Fix) ======= 4 lines covered and >>>>>>> 0d6dd12 (Manifest_cache true) ======= 4 lines covered and >>>>>>> e3e66f3 (Featire specs) 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
            module ApplicationHelper
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 02a399d (Manifest_cache true)
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
=======
<<<<<<< HEAD
            class ReviewDecorator < Draper::Decorator
>>>>>>> b28889f (Fix)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
            class ReviewDecorator < Draper::Decorator
>>>>>>> 872e675 (Fix)
=======
            class ReviewDecorator < Draper::Decorator
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
            class ReviewDecorator < Draper::Decorator
>>>>>>> e3e66f3 (Featire specs)
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              delegate :current_page, :per_page, :offset, :total_entries, :total_pages
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
              def markdown(text)
=======
              SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
=======
=======
              delegate_all
=======
              SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
              delegate_all
>>>>>>> b28889f (Fix)
=======
>>>>>>> 563720e (Featire specs)
=======
              SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze
>>>>>>> 4e81ea2 (Featire specs)
=======
              SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
=======
              SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
              delegate_all
>>>>>>> 872e675 (Fix)
=======
              delegate_all
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
              delegate_all
>>>>>>> e3e66f3 (Featire specs)
          
    3. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b28889f (Fix)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
          
  3. 
            
            

            

            
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              def full_name
=======
              def date_time
>>>>>>> b28889f (Fix)
=======
              def date_time
>>>>>>> 872e675 (Fix)
=======
              def date_time
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
              def date_time
>>>>>>> e3e66f3 (Featire specs)
          
    5. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  5. 
            2
=======
          
  6. 
            1
>>>>>>> b28889f (Fix)
=======
          
  7. 
            1
>>>>>>> 872e675 (Fix)
=======
          
  8. 
            1
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> 5b7749a (Fix)
          
  9. 
            1
>>>>>>> e3e66f3 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                "#{first_name} #{last_name}"
=======
=======
>>>>>>> 5b7749a (Fix)
                created_at.strftime('%m/%d/%Y')
>>>>>>> b28889f (Fix)
=======
                created_at.strftime('%m/%d/%Y')
>>>>>>> 872e675 (Fix)
=======
                created_at.strftime('%m/%d/%Y')
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
                created_at.strftime('%m/%d/%Y')
>>>>>>> e3e66f3 (Featire specs)
          
    10. 
        
    
      
        
    
          
  10. 
            
            

            

              end
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

            end
          
    12.
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD

app/decorators/book_decorator.rb

90.0% ======= ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)

app/decorators/user_decorator.rb

100.0% <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) lines covered

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 10 relevant lines. 9 lines covered and ======= >>>>>>> 49e8a6c (Rebased) 1 lines missed. ======= ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) 5 relevant lines. 5 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class UserDecorator < Draper::Decorator
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              delegate_all
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              def name_or_email
          
    5. 
        
    
      
        
    
          
  5. 
            2
            

            

                return name if name.present?
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

            
          
    7. 
        
    
      
        
    
          
  7. 
            2
            

            

                email.split('@').first.capitalize
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

              end
          
    9. 
        
    
      
        
    
          
  9. 
            
            

            

            end
          
    10.
======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 11792758 (Rebased)
=======
>>>>>>> a5d032d (Fix)

app/decorators/paginating_decorator.rb

100.0% lines covered

2 relevant lines. 2 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class PaginatingDecorator < Draper::CollectionDecorator
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              delegate :current_page, :per_page, :offset, :total_entries, :total_pages
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            end
          
    4.

app/decorators/review_decorator.rb

100.0% lines covered

4 relevant lines. <<<<<<< HEAD <<<<<<< HEAD 4 lines covered and 0 lines missed. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) 
    
    
      
        
    
          
  1. 
            1
            

            

            require 'image_processing'
          
    2. 
        
    
      
        
    
          
  2. 
            
            

            

            
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              decorates_association :authors
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> b3f2049 (Featire specs)
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
          
    4. 
        
    
      
        
    
          
  4. 
            
            

            

            end
          
    5.

app/decorators/review_decorator.rb

100.0% lines covered

<<<<<<< HEAD <<<<<<< HEAD 3 relevant lines. 3 lines covered and ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 3 relevant lines. 3 lines covered and ======= 4 relevant lines. 4 lines covered and >>>>>>> d0dc1f1 (Featire specs) ======= 4 relevant lines. 4 lines covered and >>>>>>> 752f0c0 (Featire specs) ======= 4 relevant lines. 4 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= 4 relevant lines. 4 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 37e48018 (Featire specs) ======= 4 relevant lines. 4 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            module ApplicationHelper
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 02a399d (Manifest_cache true)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 34509eee (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 37e48018 (Featire specs)
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

<<<<<<< HEAD
              def markdown(text)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              def markdown(text)
=======
              SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze
>>>>>>> d0dc1f1 (Featire specs)
=======
              delegate_all
=======
              SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze
>>>>>>> 752f0c0 (Featire specs)
=======
              SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze
>>>>>>> 4e81ea2 (Featire specs)
=======
              SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
              SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 34509eee (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
              SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 37e48018 (Featire specs)
          
    3. 
        
    
      
        
    
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  3. 
            
            

            

            
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              def full_name
          
    5. 
        
    
      
        
    
          
  5. 
            2
            

            

                "#{first_name} #{last_name}"
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

              end
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

            end
          
    8.

app/decorators/book_decorator.rb

90.0% ======= 100.0% >>>>>>> c7a726c5 (Rebased) lines covered

<<<<<<< HEAD 10 relevant lines. 9 lines covered and ======= 4 relevant lines. <<<<<<< HEAD 3 lines covered and >>>>>>> 75fa7e1b (Rebased) 1 lines missed. ======= ======= >>>>>>> 31d15e66 (Fix) 4 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class ReviewDecorator < Draper::Decorator
<<<<<<< HEAD
=======
=======
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> e9f3851 (Manifest_cache true)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 5b7749a (Fix)
            module ApplicationHelper
>>>>>>> 49e8a6c (Rebased)
>>>>>>> 311e9fa (Rebased)
=======
            module ApplicationHelper
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
            module ApplicationHelper
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 31d15e66 (Fix)
          
    2. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
          
  2. 
            1
=======
=======
          
  3. 
            12
=======
          
  4. 
            1
>>>>>>> 49e8a6c (Rebased)
=======
          
  5. 
            1
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
          
  6. 
            1
>>>>>>> e3e66f3 (Featire specs)
=======
          
  7. 
            1
>>>>>>> 31d15e66 (Fix)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                Markdown.new(text).to_html
=======
              def markdown(text)
>>>>>>> 49e8a6c (Rebased)
=======
              def markdown(text)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
              def markdown(text)
>>>>>>> e3e66f3 (Featire specs)
          
    8. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  8. 
=======
          
  9. 
            13
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
=======
=======
          
  10. 
            
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
=======
=======
          
  11. 
            13
>>>>>>> 872e675 (Fix)
>>>>>>> 557c1b8 (Fix)
=======
          
  12. 
            13
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
          
  13. 
            13
>>>>>>> e3e66f3 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 31d15e66 (Fix)
              delegate_all
          
    14. 
        
    
      
        
    
          
  14. 
            
            

            

            
          
    15. 
        
    
      
        
    
          
  15. 
            1
            

            

              def date_time
          
    16. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
          
  16. 
            1
=======
          
  17. 
            17
>>>>>>> 5b7749a (Fix)
=======
          
  18. 
            1
>>>>>>> 31d15e66 (Fix)
            

            

                created_at.strftime('%m/%d/%Y')
<<<<<<< HEAD
=======
                Markdown.new(text).to_html.html_safe
>>>>>>> c8da2e3 (Fix)
=======
                Markdown.new(text).to_html.html_safe
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
                Markdown.new(text).to_html.html_safe
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 31d15e66 (Fix)
          
    19. 
        
    
      
        
    
          
  19. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
=======
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
=======
>>>>>>> 49e8a6c (Rebased)
>>>>>>> 311e9fa (Rebased)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 31d15e66 (Fix)
            
            

            

              end
          
    20. 
        
    
      
        
    
          
  20. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 31d15e66 (Fix)
            
            

            

            end
          
    21.

app/decorators/user_decorator.rb

100.0% lines covered

5 relevant lines. 5 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class UserDecorator < Draper::Decorator
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              delegate_all
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              def name_or_email
          
    5. 
        
    
      
        
    
          
  5. 
            2
            

            

                return name if name.present?
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

            
          
    7. 
        
    
      
        
    
          
  7. 
            2
            

            

                email.split('@').first.capitalize
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

              end
          
    9. 
        
    
      
        
    
          
  9. 
            
            

            

            end
          
    10.
<<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 31d15e66 (Fix)

app/helpers/application_helper.rb

100.0% lines covered

<<<<<<< HEAD <<<<<<< HEAD 4 relevant lines. 4 lines covered and ======= <<<<<<< HEAD 3 relevant lines. 3 lines covered and ======= 4 relevant lines. 4 lines covered and >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) 0 lines missed. >>>>>>> 67ab5299 (Fix) 
    
    
      
        
    
          
  1. 
            1
            

            

<<<<<<< HEAD
            require 'image_processing'
          
    2. 
        
    
      
        
    
          
  2. 
            
            

            

            
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

=======
>>>>>>> 824bb2b (Featire specs)
            module ApplicationHelper
          
    4. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
          
  4. 
            12
=======
=======
>>>>>>> 84809242 (Featire specs)
          
  5. 
=======
          
  6. 
>>>>>>> 824bb2b (Featire specs)
            1
>>>>>>> 75fa7e1b (Rebased)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
                Markdown.new(text).to_html
=======
              def markdown(text)
>>>>>>> 75fa7e1b (Rebased)
=======
              def markdown(text)
=======
<<<<<<< HEAD
              def markdown(text)
=======
              SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84809242 (Featire specs)
          
    7. 
        
    
      
        
    
<<<<<<< HEAD
          
  7. 
            13
=======
<<<<<<< HEAD
          
  8. 
            12
>>>>>>> 824bb2b (Featire specs)
            

            

<<<<<<< HEAD
                Markdown.new(text).to_html.html_safe
=======
                Markdown.new(text).to_html
>>>>>>> 824bb2b (Featire specs)
          
    9. 
        
    
      
        
    
<<<<<<< HEAD
          
  9. 
=======
          
  10. 
>>>>>>> 824bb2b (Featire specs)
            
            

            

              end
          
    11. 
        
    
      
        
    
<<<<<<< HEAD
          
  11. 
=======
          
  12. 
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 311e9fa (Rebased)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
            
            

            

            end
          
    13.

app/helpers/constants.rb

100.0% lines covered

21 relevant lines. 21 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            module Constants
          
    2. 
        
    
      
        
    
          
  2. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84809242 (Featire specs)
=======
>>>>>>> 13fca83d (Rebased)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
=======
>>>>>>> 311e9fa (Rebased)
=======
          
  3. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
  4. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  5. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  6. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
          
  7. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 34509eee (Featire specs)
=======
>>>>>>> 75fa7e1b (Rebased)
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 365d41ed (Featire specs)
=======
>>>>>>> c05ee511 (Featire specs)
>>>>>>> 824bb2b (Featire specs)
=======
=======
          
  8. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
          
  9. 
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
=======
          
  10. 
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
          
  11. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
          
  12. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> 49e8a6c (Rebased)
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> 13fca83d (Rebased)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
            1
            

            

              PAGINATION_PER_PAGE = 12
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d8abfed3 (Featire specs)
=======
>>>>>>> 13fca83d (Rebased)
=======
>>>>>>> 0341d6de (Manifest_cache true)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> d9d85ca6 (Fix)
=======
<<<<<<< HEAD
=======
              decorates_association :categories
>>>>>>> 183b6c5 (Manifest_cache true)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
>>>>>>> 75fa7e1b (Rebased)
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 13fca83d (Rebased)
=======
=======
=======
              decorates_association :categories
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0341d6de (Manifest_cache true)
=======
=======
=======
              PAGINATION_PER_PAGE = 12
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0ea (Featire specs)
=======
=======
=======
              PAGINATION_PER_PAGE = 12
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888bf (Featire specs)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
              decorates_association :categories
>>>>>>> 02a399d (Manifest_cache true)
=======
              PAGINATION_PER_PAGE = 12
>>>>>>> 752f0c0 (Featire specs)
=======
              PAGINATION_PER_PAGE = 12
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
>>>>>>> 5b7749a (Fix)
>>>>>>> d9d85ca6 (Fix)
          
    13. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
>>>>>>> 34509eee (Featire specs)
=======
>>>>>>> 75fa7e1b (Rebased)
=======
>>>>>>> 84809242 (Featire specs)
=======
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 365d41ed (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
>>>>>>> 13fca83d (Rebased)
=======
>>>>>>> f136376a (Featire specs)
=======
>>>>>>> 1ca9c0ea (Featire specs)
=======
>>>>>>> 4bf888bf (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> d9d85ca6 (Fix)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376a (Featire specs)
=======
=======
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0ea (Featire specs)
=======
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> 4bf888bf (Featire specs)
          
  13. 
=======
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
          
  14. 
=======
          
  15. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
=======
=======
          
  16. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
          
  17. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
=======
=======
=======
          
  18. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
          
  19. 
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
=======
=======
=======
          
  20. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
=======
=======
          
  21. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
  22. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
  23. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
  24. 
>>>>>>> 5b7749a (Fix)
            
            

            

            
          
    25. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
=======
=======
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
=======
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 5b7749a (Fix)
          
  25. 
            1
            

            

              STAR_MIN = 0
          
    26. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 311e9fa (Rebased)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 932dbec (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 77d62af (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 5b7749a (Fix)
          
  26. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 311e9fa (Rebased)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> b719333 (Manifest_cache true)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 5b7749a (Fix)
              STAR_MAX = 5
          
    27. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
          
  27. 
=======
          
  28. 
            
=======
          
  29. 
            30
=======
          
  30. 
            
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
  31. 
            31
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
            

            

                PaginatingDecorator
          
    32. 
        
    
      
        
    
          
  32. 
            
            

            

              end
          
    33. 
        
    
      
        
    
          
  33. 
>>>>>>> 02a399d (Manifest_cache true)
=======
          
  34. 
>>>>>>> 5b7749a (Fix)
            
            

            

            
          
    35. 
        
    
      
        
    
          
  35. 
            1
            

            

              CATALOG_BOOK_COUNT = 3
          
    36. 
        
    
      
        
    
          
  36. 
            1
            

            

              BEST_SELLER_COUNT = 4
          
    37. 
        
    
      
        
    
          
  37. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 311e9fa (Rebased)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 932dbec (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
              delegate_all
          
    38. 
        
    
      
        
    
          
  38. 
            
            

            

            
          
    39. 
        
    
      
        
    
          
  39. 
            1
            

            

              def authors_names
          
    40. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
          
  40. 
            1
=======
<<<<<<< HEAD
          
  41. 
            89
=======
          
  42. 
            1
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
  43. 
            90
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
            

            

                authors.map(&:full_name).join(', ')
          
    44. 
        
    
      
        
    
          
  44. 
            
            

            

              end
          
    45. 
        
    
      
        
    
          
  45. 
            
            

            

            
          
    46. 
        
    
      
        
    
          
  46. 
            1
            

            

              def categories_names
          
    47. 
        
    
      
        
    
          
  47. 
            1
            

            

                categories.map(&:name).join(', ')
          
    48. 
        
    
      
        
    
          
  48. 
            
            

            

              end
          
    49. 
        
    
      
        
    
          
  49. 
            
            

            

            end
          
    50.

app/decorators/category_decorator.rb

100.0% lines covered

2 relevant lines. 2 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class CategoryDecorator < Draper::Decorator
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              delegate_all
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

<<<<<<< HEAD
            
=======
<<<<<<< HEAD
            end
          
    4.

app/decorators/paginating_decorator.rb

100.0% lines covered

2 relevant lines. 2 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class PaginatingDecorator < Draper::CollectionDecorator
=======
            
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
          
    2. 
        
    
      
        
    
<<<<<<< HEAD
          
  2. 
=======
<<<<<<< HEAD
          
  3. 
            1
            

            

              delegate :current_page, :per_page, :offset, :total_entries, :total_pages
          
    4. 
        
    
      
        
    
          
  4. 
=======
          
  5. 
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
            
            

            

            end
          
    6. 
        
    
      
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> 7375d4b (Manifest_cache true)
        
    
          
  6. 
            
            

            

            
          
    7. 
        
    
      
<<<<<<< HEAD
=======
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)

app/helpers/application_helper.rb

100.0% lines covered

2 relevant lines. 2 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            module ApplicationHelper
=======
>>>>>>> bd8bda4 (Manifest_cache true)
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

<<<<<<< HEAD
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b719333 (Manifest_cache true)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 77d62af (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 5b7749a (Fix)
              DESCRIPTION_LENGTH = 25
          
    3. 
        
    
      
        
    
<<<<<<< HEAD
          
  3. 
            
            

            

            
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              def full_name
          
    5. 
        
    
      
        
    
          
  5. 
            2
            

            

                "#{first_name} #{last_name}"
<<<<<<< HEAD
=======
=======
              DESCRIPTION_LENGTH = 25
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
              end
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

            end
          
    8.

app/decorators/book_decorator.rb

90.0% lines covered

10 relevant lines. 9 lines covered and 1 lines missed. ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> c7a726c5 (Rebased) 
    
    
      
        
    
          
  1. 
            1
            

            

            require 'monetize'
          
    2. 
        
    
      
        
    
<<<<<<< HEAD
          
  2. 
            1
            

            

              decorates_association :authors
>>>>>>> bd8bda4 (Manifest_cache true)
          
    3. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 311e9fa (Rebased)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> b719333 (Manifest_cache true)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 5b7749a (Fix)
          
  3. 
            1
            

            

              MIN_PRICE_IN_CENTS = 0
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              MAX_PRICE_IN_CENTS = 50_000
=======
              MAX_PRICE_IN_CENTS = 10_000
>>>>>>> 824bb2b (Featire specs)
=======
              MAX_PRICE_IN_CENTS = 50_000
>>>>>>> 311e9fa (Rebased)
=======
              MAX_PRICE_IN_CENTS = 50_000
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
              MAX_PRICE_IN_CENTS = 50_000
>>>>>>> e3e66f3 (Featire specs)
          
    5. 
        
    
      
        
    
          
  5. 
=======
          
  6. 
>>>>>>> c7a726c5 (Rebased)
            
            

            

            
          
    7. 
        
    
      
        
    
<<<<<<< HEAD
          
  7. 
=======
          
  8. 
>>>>>>> c7a726c5 (Rebased)
            1
            

            

<<<<<<< HEAD
              TEXT_FORMAT = %r{\A[A-Za-z0-9!#$%&'*+-/=?^_`{|}~. ]+\z}.freeze
          
    9. 
        
    
      
        
    
          
  9. 
            1
            

            

              NAME_FORMAT = /\A[A-Za-z]+\z/.freeze
          
    10. 
        
    
      
        
    
          
  10. 
            1
            

            

              COUNTY_FORMAT = /\A[A-Za-z ]+\z/.freeze
          
    11. 
        
    
      
        
    
          
  11. 
            1
            

            

              PHONE_FORMAT = /\A[\\+]?[(]?[0-9]{3}[)]?[-\s\\.]?[0-9]{3}[-\s\\.]?[0-9]{4,6}\z/.freeze
          
    12. 
        
    
      
        
    
          
  12. 
            1
            

            

              ZIP_FORMAT = /\A[0-9]+\z/.freeze
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

            
          
    14. 
        
    
      
        
    
          
  14. 
            1
            

            

              VALIDATES_NAME_LENGTH_MAX = 50
          
    15. 
        
    
      
        
    
          
  15. 
            1
            

            

              VALIDATES_TEXT_LENGTH_MAX = 500
          
    16. 
        
    
      
        
    
          
  16. 
            1
            

            

              VALIDATES_TITLE_LENGTH_MAX = 80
          
    17. 
        
    
      
        
    
          
  17. 
            1
            

            

              VALIDATES_PHONE_LENGTH_MAX = 15
          
    18. 
        
    
      
        
    
          
  18. 
            1
            

            

              VALIDATES_ZIP_LENGTH_MAX = 10
          
    19. 
        
    
      
        
    
          
  19. 
            
            

            

            
          
    20. 
        
    
      
        
    
          
  20. 
            1
            

            

              FOOTER_NUMBER = '(555)-555-5555'.freeze
          
    21. 
        
    
      
        
    
          
  21. 
            1
            

            

              FOOTER_EMAIL = 'support@bookstore.com'.freeze
          
    22. 
        
    
      
        
    
          
  22. 
            
            

            

            end
          
    23.
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 67ab5299 (Fix) ======= >>>>>>> 13fca83d (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> ae884b47 (Fix) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs)

app/interactors/billing_update.rb

87.5% lines covered

8 relevant lines. 7 lines covered and 1 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class BillingUpdate
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              include Interactor
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            
=======
            class BookDecorator < Draper::Decorator
>>>>>>> c7a726c5 (Rebased)
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

<<<<<<< HEAD
              def call
=======
              decorates_association :authors
>>>>>>> c7a726c5 (Rebased)
          
    5. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> b28889f (Fix)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 5b7749a (Fix)
          
  5. 
=======
          
  6. 
            
            

            

            
          
    7. 
        
    
      
        
    
          
  7. 
>>>>>>> c7a726c5 (Rebased)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
=======
>>>>>>> b28889f (Fix)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> d782a28 (Manifest_cache true)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 5b7749a (Fix)
                params = context.permitted_params
=======
              def self.collection_decorator_class
>>>>>>> c7a726c5 (Rebased)
          
    8. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
>>>>>>> ae884b47 (Fix)
=======
>>>>>>> d245196f (Manifest_cache true)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> d9d85ca6 (Fix)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c7a726c5 (Rebased)
          
  8. 
            
=======
<<<<<<< HEAD
          
  9. 
            30
=======
          
  10. 
            
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
=======
          
  11. 
            31
>>>>>>> 1214e1f (Add login registration pages)
=======
          
  12. 
            
>>>>>>> d782a28 (Manifest_cache true)
=======
<<<<<<< HEAD
          
  13. 
            
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
          
  14. 
            
>>>>>>> e3e66f3 (Featire specs)
=======
          
  15. 
            30
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
  16. 
            56
>>>>>>> aca90e3 (Rebased)
>>>>>>> c7a726c5 (Rebased)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> b28889f (Fix)
>>>>>>> c8da2e3 (Fix)
>>>>>>> fdab719f (Fix)
=======
=======
>>>>>>> 49e8a6c (Rebased)
>>>>>>> 311e9fa (Rebased)
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> 8288136d (Fix)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> b28889f (Fix)
>>>>>>> e18eb87 (Fix)
>>>>>>> 99dad91f (Fix)
            

            

                PaginatingDecorator
          
    17. 
        
    
      
        
    
          
  17. 
            
            

            

              end
          
    18. 
        
    
      
        
    
          
  18. 
            
            

            

            
          
    19. 
        
    
      
        
    
          
  19. 
            1
            

            

              delegate_all
          
    20. 
        
    
      
        
    
          
  20. 
            
            

            

            
          
    21. 
        
    
      
        
    
          
  21. 
            1
            

            

              def authors_names
          
    22. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c7a726c5 (Rebased)
=======
=======
>>>>>>> 9a49b7b (Rebased)
=======
>>>>>>> aa3618b (Rebased)
=======
>>>>>>> 160fb15 (Fix)
=======
=======
>>>>>>> 311e9fa (Rebased)
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 5b7749a (Fix)
=======
=======
>>>>>>> e055dd0 (Rebased)
=======
>>>>>>> 0c57e4e (Fix)
=======
>>>>>>> 9e081dc (Fix)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 1d59aaa (Fix)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 872e675 (Fix)
=======
<<<<<<< HEAD
>>>>>>> bb5c652 (Fix book_spec decrease quantity and price)
=======
=======
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> bb5c652 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 22ee41c (Add login registration pages)
>>>>>>> 88d49ad (Add login registration pages)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 22ee41c (Add login registration pages)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 22ee41c (Add login registration pages)
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 22ee41c (Add login registration pages)
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 22ee41c (Add login registration pages)
>>>>>>> 6da9530 (Featire specs)
>>>>>>> 0f8241bb (Featire specs)
          
  22. 
            1
=======
<<<<<<< HEAD
          
  23. 
            89
=======
          
  24. 
            1
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> bb5c652 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
=======
          
  25. 
            1
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
  26. 
            1
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 84003439 (Featire specs)
=======
          
  27. 
            90
>>>>>>> 1214e1f (Add login registration pages)
=======
          
  28. 
            1
>>>>>>> d782a28 (Manifest_cache true)
=======
<<<<<<< HEAD
          
  29. 
            1
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
          
  30. 
            1
>>>>>>> e3e66f3 (Featire specs)
=======
          
  31. 
            89
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
          
  32. 
            101
>>>>>>> aca90e3 (Rebased)
<<<<<<< HEAD
>>>>>>> c7a726c5 (Rebased)
=======
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> bb5c652 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
=======
          
  33. 
            90
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 22ee41c (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 88d49ad (Add login registration pages)
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
=======
          
  34. 
            101
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9a49b7b (Rebased)
=======
>>>>>>> e055dd0 (Rebased)
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 311e9fa (Rebased)
=======
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> 49e8a6c (Rebased)
=======
          
  35. 
            
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> aa3618b (Rebased)
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 311e9fa (Rebased)
=======
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> e055dd0 (Rebased)
=======
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 0c57e4e (Fix)
=======
          
  36. 
            105
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 160fb15 (Fix)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 0c57e4e (Fix)
=======
>>>>>>> 9e081dc (Fix)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> fdab719f (Fix)
=======
=======
=======
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> bc6bc8d2 (Rebased)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> 8288136d (Fix)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 9e081dc (Fix)
=======
=======
          
  37. 
            109
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
>>>>>>> ef483b6d (Fix)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> b28889f (Fix)
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
=======
>>>>>>> 49e8a6c (Rebased)
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 0c57e4e (Fix)
<<<<<<< HEAD
>>>>>>> 8887ba5b (Fix)
=======
=======
>>>>>>> 1d59aaa (Fix)
>>>>>>> 9e081dc (Fix)
>>>>>>> 1049b80c (Fix)
            

            

                authors.map(&:full_name).join(', ')
          
    38. 
        
    
      
        
    
          
  38. 
            
            

            

              end
          
    39. 
        
    
      
        
    
          
  39. 
            
            

            

            
          
    40. 
        
    
      
        
    
          
  40. 
            1
            

            

              def categories_names
          
    41. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  41. 
            8
=======
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> bdc24a1a (Rebased)
=======
>>>>>>> 8887ba5b (Fix)
<<<<<<< HEAD
          
  42. 
            12
=======
=======
>>>>>>> e055dd0 (Rebased)
=======
>>>>>>> 0c57e4e (Fix)
          
  43. 
            8
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
=======
>>>>>>> 311e9fa (Rebased)
=======
>>>>>>> 557c1b8 (Fix)
          
  44. 
            8
=======
          
  45. 
            8
>>>>>>> e18eb87 (Fix)
=======
          
  46. 
            12
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> fdab719f (Fix)
=======
=======
=======
>>>>>>> e055dd0 (Rebased)
=======
          
  47. 
            
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> bc6bc8d2 (Rebased)
=======
=======
=======
>>>>>>> 0c57e4e (Fix)
=======
          
  48. 
            12
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> 8288136d (Fix)
=======
=======
          
  49. 
            12
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
          
  50. 
            12
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
          
  51. 
            8
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
>>>>>>> 0c57e4e (Fix)
>>>>>>> 8887ba5b (Fix)
            

            

                categories.pluck(:name).join(', ')
          
    52. 
        
    
      
        
    
          
  52. 
            
            

            

              end
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
>>>>>>> 0f8241bb (Featire specs)
          
    53. 
        
    
      
        
    
          
  53. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
            
=======
=======
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
>>>>>>> c033601 (Rebased)
>>>>>>> 824bb2b (Featire specs)
            
          
    54. 
        
    
      
        
    
          
  54. 
            1
            

            

              def price
<<<<<<< HEAD
=======
>>>>>>> 9a49b7b (Rebased)
=======
>>>>>>> 824bb2b (Featire specs)
          
    55. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
          
  55. 
            121
            

            

                Money.new(price_cents)
          
    56. 
        
    
      
        
    
          
  56. 
<<<<<<< HEAD
=======
          
  57. 
>>>>>>> 9a49b7b (Rebased)
=======
>>>>>>> 824bb2b (Featire specs)
            
            

            

              end
          
    58. 
        
    
      
        
    
          
  58. 
            
            

            

<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
>>>>>>> c033601 (Rebased)
>>>>>>> f7852d17 (Manifest_cache true)
            
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> bb5c652 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
          
    59. 
        
    
      
        
    
          
  59. 
            1
            

            

              def price
          
    60. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
  60. 
            125
=======
=======
>>>>>>> 311e9fa (Rebased)
=======
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> e055dd0 (Rebased)
=======
>>>>>>> 0c57e4e (Fix)
=======
>>>>>>> 9e081dc (Fix)
=======
>>>>>>> e75c983 (Fix)
          
  61. 
            121
=======
          
  62. 
            125
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
=======
=======
>>>>>>> e055dd0 (Rebased)
=======
          
  63. 
            
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
=======
=======
>>>>>>> 0c57e4e (Fix)
=======
          
  64. 
            125
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
=======
          
  65. 
            125
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
          
  66. 
            125
>>>>>>> e3e66f3 (Featire specs)
=======
          
  67. 
            144
>>>>>>> 5b7749a (Fix)
=======
          
  68. 
            143
>>>>>>> 366b257 (Fix)
=======
          
  69. 
            121
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> e055dd0 (Rebased)
=======
>>>>>>> 0c57e4e (Fix)
=======
=======
          
  70. 
            144
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
=======
=======
          
  71. 
            143
>>>>>>> 851b4c0 (Fix)
>>>>>>> e75c983 (Fix)
            

            

                Money.new(price_cents)
          
    72. 
        
    
      
        
    
          
  72. 
            
            

            

              end
          
    73. 
        
    
      
        
    
          
  73. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9a49b7b (Rebased)
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
            end
          
    74.
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 0c57e4e (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 9e081dc (Fix) =======

app/decorators/order_book_decorator.rb

100.0% lines covered

5 relevant lines. 5 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            require 'monetize'
          
    2. 
        
    
      
        
    
          
  2. 
            
            

            

            
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

            class OrderBookDecorator < Draper::Decorator
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              delegate_all
          
    5. 
        
    
      
        
    
          
  5. 
            
            

            

            
          
    6. 
        
    
      
        
    
          
  6. 
            1
            

            

              def total_price
          
    7. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
          
  7. 
            8
=======
          
  8. 
            9
>>>>>>> 9e081dc (Fix)
=======
          
  9. 
            8
>>>>>>> e75c983 (Fix)
            

            

                Money.new(book.price_cents * quantity)
          
    10. 
        
    
      
        
    
          
  10. 
            
            

            

              end
          
    11. 
        
    
      
        
    
          
  11. 
            
            

            

            end
          
    12.

app/decorators/order_decorator.rb

100.0% lines covered

8 relevant lines. 8 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            require 'monetize'
          
    2. 
        
    
      
        
    
          
  2. 
            
            

            

            
          
    3. 
        
    
      
        
    
          
  3. 
            1
            

            

            class OrderDecorator < Draper::Decorator
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              delegate_all
          
    5. 
        
    
      
        
    
          
  5. 
            
            

            

            
          
    6. 
        
    
      
        
    
          
  6. 
            1
            

            

              def order_price(coupon = 0)
          
    7. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
          
  7. 
            27
=======
          
  8. 
            29
>>>>>>> 9e081dc (Fix)
=======
          
  9. 
            27
>>>>>>> e75c983 (Fix)
            

            

                total_price = 0
          
    10. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
          
  10. 
            27
=======
          
  11. 
            29
>>>>>>> 9e081dc (Fix)
=======
          
  12. 
            27
>>>>>>> e75c983 (Fix)
            

            

                order_books.each do |order_book|
          
    13. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
          
  13. 
            25
=======
          
  14. 
            27
>>>>>>> 9e081dc (Fix)
=======
          
  15. 
            25
>>>>>>> e75c983 (Fix)
            

            

                  total_price += order_book.book.price_cents * order_book.quantity
          
    16. 
        
    
      
        
    
          
  16. 
            
            

            

                end
          
    17. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
          
  17. 
            27
=======
          
  18. 
            29
>>>>>>> 9e081dc (Fix)
=======
          
  19. 
            27
>>>>>>> e75c983 (Fix)
            

            

                Money.new(total_price - (total_price * coupon))
          
    20. 
        
    
      
        
    
          
  20. 
            
            

            

              end
          
    21. 
        
    
      
        
    
          
  21. 
            
            

            

            end
          
    22.
>>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> e055dd0 (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 1d59aaa (Fix) >>>>>>> 9e081dc (Fix)

app/decorators/paginating_decorator.rb

100.0% lines covered

2 relevant lines. 2 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class PaginatingDecorator < Draper::CollectionDecorator
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
            
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
=======
            
>>>>>>> bd8bda4 (Manifest_cache true)
=======
            
>>>>>>> aa7b40c (Manifest_cache true)
=======
            
>>>>>>> 183b6c5 (Manifest_cache true)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bb5c652 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c033601 (Rebased)
>>>>>>> 9a49b7b (Rebased)
=======
=======
>>>>>>> c033601 (Rebased)
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> c033601 (Rebased)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> c033601 (Rebased)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> c033601 (Rebased)
>>>>>>> 6da9530 (Featire specs)
          
    2. 
        
    
      
        
    
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
          
  2. 
=======
<<<<<<< HEAD
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bb5c652 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c033601 (Rebased)
>>>>>>> 9a49b7b (Rebased)
=======
=======
>>>>>>> c033601 (Rebased)
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> c033601 (Rebased)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> c033601 (Rebased)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> c033601 (Rebased)
>>>>>>> 6da9530 (Featire specs)
          
  3. 
            1
            

            

              delegate :current_page, :per_page, :offset, :total_entries, :total_pages
          
    4. 
        
    
      
        
    
          
  4. 
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
          
  5. 
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
=======
          
  6. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
  7. 
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
  8. 
>>>>>>> 183b6c5 (Manifest_cache true)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bb5c652 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c033601 (Rebased)
>>>>>>> 9a49b7b (Rebased)
=======
=======
>>>>>>> c033601 (Rebased)
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> c033601 (Rebased)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> c033601 (Rebased)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> c033601 (Rebased)
>>>>>>> 6da9530 (Featire specs)
            
            

            

            end
          
    9. 
        
    
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD

app/decorators/review_decorator.rb

100.0% lines covered

4 relevant lines. 4 lines covered and 0 lines missed. 
    
    
      
=======
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
=======
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bb5c652 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
=======

app/decorators/review_decorator.rb

100.0% lines covered

4 relevant lines. 4 lines covered and 0 lines missed. 
    
    
      
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9a49b7b (Rebased)
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
        
    
          
  1. 
            1
            

            

            class ReviewDecorator < Draper::Decorator
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              delegate_all
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            
          
    4. 
        
    
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
        
    
          
  4. 
            1
            

            

              def date_time
          
    5. 
        
    
      
        
    
          
  5. 
            1
            

            

                created_at.strftime('%m/%d/%Y')
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

              end
          
    7. 
        
    
      
        
    
          
  7. 
            
            

            

            end
          
    8.

app/decorators/user_decorator.rb

100.0% lines covered

5 relevant lines. 5 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class UserDecorator < Draper::Decorator
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              delegate_all
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              def name_or_email
          
    5. 
        
    
      
        
    
          
  5. 
            2
            

            

                return name if name.present?
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

            
          
    7. 
        
    
      
        
    
          
  7. 
            2
            

            

                email.split('@').first.capitalize
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

              end
          
    9. 
        
    
      
        
    
          
  9. 
            
            

            

            end
          
    10. 
        
    
      
=======
=======
>>>>>>> 9a49b7b (Rebased)
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
=======
>>>>>>> bd8bda4 (Manifest_cache true)
=======
>>>>>>> aa7b40c (Manifest_cache true)
=======
>>>>>>> 183b6c5 (Manifest_cache true)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bb5c652 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
=======
        
    
          
  10. 
            1
            

            

              def date_time
          
    11. 
        
    
      
        
    
          
  11. 
            1
            

            

<<<<<<< HEAD
                created_at.strftime('%m/%d/%Y')
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> bd8bda4 (Manifest_cache true)
=======
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 5c33a07 (Featire specs)
              def self.collection_decorator_class
>>>>>>> 715fac2 (Featire specs)
          
    12. 
        
    
      
        
    
          
  12. 
            
            

            

              end
          
    13. 
        
    
      
        
    
          
  13. 
            
            

            

            end
          
    14.

app/decorators/user_decorator.rb

100.0% lines covered

5 relevant lines. 5 lines covered and 0 lines missed. 
    
    
      
        
    
          
  1. 
            1
            

            

            class UserDecorator < Draper::Decorator
          
    2. 
        
    
      
        
    
          
  2. 
            1
            

            

              delegate_all
          
    3. 
        
    
      
        
    
          
  3. 
            
            

            

            
          
    4. 
        
    
      
        
    
          
  4. 
            1
            

            

              def name_or_email
          
    5. 
        
    
      
        
    
          
  5. 
            2
            

            

                return name if name.present?
          
    6. 
        
    
      
        
    
          
  6. 
            
            

            

            
          
    7. 
        
    
      
        
    
          
  7. 
            2
            

            

                email.split('@').first.capitalize
          
    8. 
        
    
      
        
    
          
  8. 
            
            

            

              end
          
    9. 
        
    
      
        
    
          
  9. 
            
            

            

            end
          
    10. 
        
    
      
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9a49b7b (Rebased)
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 84003439 (Featire specs) ======= PAGINATION_PER_PAGE = 12 >>>>>>> 08edf50 (Featire specs) ======= PAGINATION_PER_PAGE = 12 >>>>>>> 4552227 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c7a726c5 (Rebased)
<<<<<<< HEAD
  • <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= ======= >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) ======= ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) ======= ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs)
    >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD end
    • <<<<<<< HEAD <<<<<<< HEAD

    app/decorators/paginating_decorator.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
=======
          
    2. 
>>>>>>> c7a726c5 (Rebased)
            1
            

            

<<<<<<< HEAD
            class PaginatingDecorator < Draper::CollectionDecorator
=======
            
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
=======
            
>>>>>>> d782a28 (Manifest_cache true)
=======
              def price
>>>>>>> c7a726c5 (Rebased)
          
      3. 
        
      
      
        
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
    3. 
=======
<<<<<<< HEAD
          
    4. 
            1
=======
          
    5. 
            121
>>>>>>> c7a726c5 (Rebased)
            

            

<<<<<<< HEAD
              delegate :current_page, :per_page, :offset, :total_entries, :total_pages
=======
                Money.new(price_cents)
>>>>>>> c7a726c5 (Rebased)
          
      6. 
        
      
      
        
      
<<<<<<< HEAD
          
    6. 
=======
          
    7. 
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
=======
          
    8. 
>>>>>>> d782a28 (Manifest_cache true)
            
            

            

            end
          
      9. 
        
      
      
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> 7375d4b (Manifest_cache true)
=======
>>>>>>> d782a28 (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
        
      
          
    9. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 4552227 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
            
          
      10. 
        
      
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
=======
>>>>>>> d782a28 (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 36356d3 (Featire specs)

    app/helpers/application_helper.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            module ApplicationHelper
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> bd8bda4 (Manifest_cache true)
=======
>>>>>>> d782a28 (Manifest_cache true)
=======
=======
            class AuthorDecorator < Draper::Decorator
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 35d17b9 (Manifest_cache true)
=======
=======
            class AuthorDecorator < Draper::Decorator
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
            class AuthorDecorator < Draper::Decorator
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> e3e66f3 (Featire specs)
          
      2. 
        
      
      
        
      
          
    2. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 35d17b9 (Manifest_cache true)
              DESCRIPTION_LENGTH = 25
>>>>>>> 02a399d (Manifest_cache true)
=======
              delegate_all
          
      3. 
        
      
      
        
      
          
    3. 
            
            

            

            
          
      4. 
        
      
      
        
      
          
    4. 
            1
            

            

              def full_name
          
      5. 
        
      
      
        
      
          
    5. 
            2
=======
          
    6. 
            3
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            

            

                "#{first_name} #{last_name}"
          
      7. 
        
      
      
        
      
          
    7. 
=======
          
    8. 
>>>>>>> c7a726c5 (Rebased)
            
            

            

              end
          
      9. 
        
      
      
        
      
<<<<<<< HEAD
          
    9. 
            
            

            

            end
          
      10.

    app/decorators/book_decorator.rb

    100.0% lines covered

    10 relevant lines. 10 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            class BookDecorator < Draper::Decorator
          
      2. 
        
      
      
        
      
          
    2. 
            1
            

            

              decorates_association :authors
=======
              DESCRIPTION_LENGTH = 25
>>>>>>> d782a28 (Manifest_cache true)
=======
              DESCRIPTION_LENGTH = 25
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
              DESCRIPTION_LENGTH = 25
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> bd8bda4 (Manifest_cache true)
=======
              DESCRIPTION_LENGTH = 25
>>>>>>> 4e81ea2 (Featire specs)
=======
              delegate_all
          
      3. 
        
      
      
        
      
          
    3. 
            
            

            

            
          
      4. 
        
      
      
        
      
          
    4. 
            1
            

            

              def full_name
          
      5. 
        
      
      
        
      
          
    5. 
            3
            

            

                "#{first_name} #{last_name}"
          
      6. 
        
      
      
        
      
          
    6. 
            
            

            

              end
          
      7. 
        
      
      
        
      
          
    7. 
            
            

            

            end
          
      8.

    app/decorators/book_decorator.rb

    100.0% lines covered

    10 relevant lines. 10 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            class BookDecorator < Draper::Decorator
          
      2. 
        
      
      
        
      
          
    2. 
            1
            

            

              decorates_association :authors
>>>>>>> aa7b40c (Manifest_cache true)
          
      3. 
        
      
      
        
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6066f925 (Add login registration pages)
=======
>>>>>>> 67ab5299 (Fix)
=======
=======
>>>>>>> d245196f (Manifest_cache true)
=======
>>>>>>> 4bf888bf (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> ae884b47 (Fix)
=======
=======
>>>>>>> d782a28 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d245196f (Manifest_cache true)
=======
=======
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888bf (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
>>>>>>> 5b7749a (Fix)
>>>>>>> d9d85ca6 (Fix)
          
    3. 
            1
            

            

                user = context.current_user
          
      4. 
        
      
      
        
      
          
    4. 
            
            

            

            
          
      5. 
        
      
      
        
      
          
    5. 
            1
            

            

                return if params[:billing].nil?
          
      6. 
        
      
      
        
      
          
    6. 
            
            

            

            
          
      7. 
        
      
      
        
      
          
    7. 
            1
            

            

                return if user.billing.update(params[:billing])
          
      8. 
        
      
      
        
      
          
    8. 
            
            

            

            
          
      9. 
        
      
      
        
      
          
    9. 
            
            

            

                context.fail!
          
      10. 
        
      
      
        
      
          
    10. 
            
            

            

              end
          
      11. 
        
      
      
        
      
          
    11. 
            
            

            

            end
          
      12.

    app/interactors/shipping_update.rb

    87.5% lines covered

    8 relevant lines. 7 lines covered and 1 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            class ShippingUpdate
          
      2. 
        
      
      
        
      
          
    2. 
            1
            

            

              include Interactor
          
      3. 
        
      
      
        
      
          
    3. 
            
            

            

            
          
      4. 
        
      
      
        
      
          
    4. 
            1
            

            

              def call
          
      5. 
        
      
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 4552227 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 5b7749a (Fix)
        
      
          
    5. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 5b7749a (Fix)
                params = context.permitted_params
          
      6. 
        
      
      
        
      
<<<<<<< HEAD
          
    6. 
            
            

            

                PaginatingDecorator
          
      7. 
        
      
      
        
      
          
    7. 
            
            

            

              end
          
      8. 
        
      
      
        
      
          
    8. 
            
            

            

            
          
      9. 
        
      
      
        
      
          
    9. 
            1
            

            

              delegate_all
          
      10. 
        
      
      
        
      
          
    10. 
            
            

            

            
          
      11. 
        
      
      
        
      
          
    11. 
            1
            

            

              def authors_names
          
      12. 
        
      
      
        
      
          
    12. 
            1
            

            

                authors.map(&:full_name).join(', ')
          
      13. 
        
      
      
        
      
          
    13. 
            
            

            

              end
          
      14. 
        
      
      
        
      
          
    14. 
            
            

            

            
          
      15. 
        
      
      
        
      
          
    15. 
            1
            

            

              def categories_names
          
      16. 
        
      
      
        
      
          
    16. 
            1
            

            

                categories.map(&:name).join(', ')
          
      17. 
        
      
      
        
      
          
    17. 
            
            

            

              end
          
      18. 
        
      
      
        
      
          
    18. 
            
            

            

            end
          
      19.

    app/decorators/category_decorator.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            class CategoryDecorator < Draper::Decorator
          
      2. 
        
      
      
        
      
          
    2. 
            1
            

            

              delegate_all
          
      3. 
        
      
      
        
      
          
    3. 
            
            

            

            
          
      4. 
        
      
      
        
      
          
    4. 
            
            

            

            end
          
      5. 
        
      
      
        
      
          
    5. 
            
            

            

            
          
      6.
    ======= >>>>>>> 824bb2b (Featire specs)

    app/helpers/application_helper.rb

    100.0% lines covered

    <<<<<<< HEAD 2 relevant lines. 2 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            module ApplicationHelper
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
            class AuthorDecorator < Draper::Decorator
>>>>>>> 183b6c5 (Manifest_cache true)
          
      2. 
        
      
      
        
      
          
    2. 
            1
            

            

<<<<<<< HEAD
              DESCRIPTION_LENGTH = 25
>>>>>>> aa7b40c (Manifest_cache true)
=======
              DESCRIPTION_LENGTH = 25
>>>>>>> 08edf50 (Featire specs)
=======
              delegate_all
          
      3. 
        
      
      
        
      
          
    3. 
            
            

            

            
          
      4. 
        
      
      
        
      
          
    4. 
            1
            

            

              def full_name
          
      5. 
        
      
      
        
      
          
    5. 
            2
            

            

                "#{first_name} #{last_name}"
=======
              DESCRIPTION_LENGTH = 25
>>>>>>> 4552227 (Featire specs)
          
      6. 
        
      
      
        
      
          
    6. 
            
            

            

<<<<<<< HEAD
              end
          
      7. 
        
      
      
        
      
          
    7. 
            
            

            

            end
          
      8.

    app/decorators/book_decorator.rb

    90.0% lines covered

    10 relevant lines. 9 lines covered and ======= 3 lines covered and >>>>>>> 11792758 (Rebased) 1 lines missed. ======= ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) 4 relevant lines. 4 lines covered and ======= <<<<<<< HEAD 3 relevant lines. 3 lines covered and ======= 4 relevant lines. 4 lines covered and >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) 0 lines missed. >>>>>>> 31d15e66 (Fix) 
        
      
      
        
      
          
    1. 
            1
            

            

<<<<<<< HEAD
            require 'image_processing'
          
      2. 
        
      
      
        
      
          
    2. 
            
            

            

            
          
      3. 
        
      
      
        
      
          
    3. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
              decorates_association :authors
>>>>>>> 183b6c5 (Manifest_cache true)
=======
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
            module ApplicationHelper
>>>>>>> 11792758 (Rebased)
          
      4. 
        
      
      
        
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5b7749a (Fix)
          
    4. 
            1
            

            

                user = context.current_user
          
      5. 
        
      
      
        
      
          
    5. 
            
            

            

            
          
      6. 
        
      
      
        
      
          
    6. 
            1
            

            

                return if params[:shipping].nil?
          
      7. 
        
      
      
        
      
<<<<<<< HEAD
          
    7. 
            31
            

            

                PaginatingDecorator
          
      8. 
        
      
      
        
      
          
    8. 
            
            

            

              end
          
      9. 
        
      
      
        
      
          
    9. 
            
            

            

            
          
      10. 
        
      
      
        
      
          
    10. 
            1
            

            

              delegate_all
          
      11. 
        
      
      
        
      
          
    11. 
            
            

            

            
          
      12. 
        
      
      
        
      
          
    12. 
            1
            

            

              def authors_names
          
      13. 
        
      
      
        
      
          
    13. 
            90
            

            

                authors.map(&:full_name).join(', ')
          
      14. 
        
      
      
        
      
          
    14. 
            
            

            

              end
          
      15. 
        
      
      
        
      
          
    15. 
            
            

            

            
          
      16. 
        
      
      
        
      
          
    16. 
            1
            

            

              def categories_names
          
      17. 
        
      
      
        
      
          
    17. 
            1
            

            

                categories.map(&:name).join(', ')
          
      18. 
        
      
      
        
      
          
    18. 
            
            

            

              end
          
      19. 
        
      
      
        
      
          
    19. 
            
            

            

            end
          
      20.

    app/decorators/category_decorator.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            class CategoryDecorator < Draper::Decorator
          
      2. 
        
      
      
        
      
          
    2. 
            1
            

            

              delegate_all
          
      3. 
        
      
      
        
      
          
    3. 
=======
          
    4. 
>>>>>>> c7a726c5 (Rebased)
            
            

            

            end
          
      5.

    app/decorators/paginating_decorator.rb

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 0c57e4e (Fix) 100.0% <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0c57e4e (Fix) ======= 100.0% >>>>>>> 872e675 (Fix) <<<<<<< HEAD ======= 100.0% >>>>>>> 0d6dd12 (Manifest_cache true) ======= 100.0% >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 0c57e4e (Fix) lines covered

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) 2 relevant lines. 2 lines covered and ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= ======= >>>>>>> 0676508 (Featire specs) 2 relevant lines. 2 lines covered and ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) 3 relevant lines. 3 lines covered and ======= 4 relevant lines. 4 lines covered and >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ed7f7c (Featire specs) ======= 4 relevant lines. 4 lines covered and >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= 2 relevant lines. 2 lines covered and >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 0676508 (Featire specs) ======= ======= >>>>>>> 3e9f99d (Featire specs) ======= 4 relevant lines. 4 lines covered and >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 0c57e4e (Fix) ======= <<<<<<< HEAD 2 relevant lines. 2 lines covered and >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) ======= 2 relevant lines. 2 lines covered and >>>>>>> 0d6dd12 (Manifest_cache true) ======= 2 relevant lines. 2 lines covered and >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= 2 relevant lines. 2 lines covered and >>>>>>> e18eb87 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 0c57e4e (Fix) ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) ======= ======= 4 relevant lines. 4 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= 4 relevant lines. 4 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) ======= ======= ======= 4 relevant lines. 4 lines covered and >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 3cf8dd4 (Featire specs)
            class PaginatingDecorator < Draper::CollectionDecorator
=======
            module ApplicationHelper
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 02a399d (Manifest_cache true)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> b3f2049 (Featire specs)
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
=======
            class PaginatingDecorator < Draper::CollectionDecorator
>>>>>>> c8da2e3 (Fix)
=======
            class PaginatingDecorator < Draper::CollectionDecorator
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
            class PaginatingDecorator < Draper::CollectionDecorator
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
            class PaginatingDecorator < Draper::CollectionDecorator
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> 02a399d (Manifest_cache true)
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
          
      2. 
        
      
      
        
      
          
    2. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              delegate :current_page, :per_page, :offset, :total_entries, :total_pages
=======
<<<<<<< HEAD
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 2ee03d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 5506bd0 (Featire specs)
              def markdown(text)
=======
              SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
<<<<<<< HEAD
              delegate :current_page, :per_page, :offset, :total_entries, :total_pages
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
              delegate_all
=======
              SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 3e9f99d (Featire specs)
=======
=======
              SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze
>>>>>>> 4e81ea2 (Featire specs)
=======
              SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 2ee03d3 (Featire specs)
=======
=======
              SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
          
      3. 
        
      
      
        
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
          
    3. 
            
=======
          
    4. 
            12
>>>>>>> 2a25e4c (Featire specs)
            

            

            end
          
      5.

    app/decorators/review_decorator.rb

    100.0% <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= 75.0% >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) lines covered

    4 relevant lines. <<<<<<< HEAD 3 lines covered and <<<<<<< HEAD ======= 4 relevant lines. 4 lines covered and >>>>>>> d0dc1f1 (Featire specs) ======= 4 relevant lines. 4 lines covered and >>>>>>> 752f0c0 (Featire specs) ======= 4 relevant lines. 4 lines covered and <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 4e81ea2 (Featire specs) ======= 4 relevant lines. 4 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= 4 relevant lines. 4 lines covered and >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) ======= 4 lines covered and >>>>>>> 872e675 (Fix) 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
            module ApplicationHelper
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 02a399d (Manifest_cache true)
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
=======
<<<<<<< HEAD
            class ReviewDecorator < Draper::Decorator
>>>>>>> b28889f (Fix)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
            class ReviewDecorator < Draper::Decorator
>>>>>>> 872e675 (Fix)
          
      2. 
        
      
      
        
      
          
    2. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              delegate :current_page, :per_page, :offset, :total_entries, :total_pages
=======
<<<<<<< HEAD
=======
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> 0c57e4e (Fix)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0ed7f7c (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
              def markdown(text)
=======
              SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
              delegate :current_page, :per_page, :offset, :total_entries, :total_pages
>>>>>>> 872e675 (Fix)
=======
              delegate :current_page, :per_page, :offset, :total_entries, :total_pages
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
              delegate :current_page, :per_page, :offset, :total_entries, :total_pages
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
=======
=======
              delegate_all
=======
              SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
              delegate_all
>>>>>>> b28889f (Fix)
=======
>>>>>>> 563720e (Featire specs)
=======
              SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze
>>>>>>> 4e81ea2 (Featire specs)
=======
              SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
=======
              SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
              delegate_all
>>>>>>> 872e675 (Fix)
          
      3. 
        
      
      
        
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b28889f (Fix)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
          
    3. 
            
            

            

            
          
      4. 
        
      
      
        
      
          
    4. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
              def full_name
=======
              def date_time
>>>>>>> b28889f (Fix)
=======
              def date_time
>>>>>>> 872e675 (Fix)
          
      5. 
        
      
      
        
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
    5. 
            2
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 1d59aaa (Fix)
          
    6. 
            1
>>>>>>> b28889f (Fix)
=======
          
    7. 
            1
>>>>>>> 872e675 (Fix)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                "#{first_name} #{last_name}"
=======
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 1d59aaa (Fix)
                created_at.strftime('%m/%d/%Y')
>>>>>>> b28889f (Fix)
=======
                created_at.strftime('%m/%d/%Y')
>>>>>>> 872e675 (Fix)
          
      8. 
        
      
      
        
      
          
    8. 
            
            

            

              end
          
      9. 
        
      
      
        
      
          
    9. 
            
            

            

            end
          
      10.
    <<<<<<< HEAD <<<<<<< HEAD

    app/decorators/book_decorator.rb

    90.0% ======= ======= >>>>>>> 872e675 (Fix)

    app/decorators/user_decorator.rb

    100.0% <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) lines covered

    <<<<<<< HEAD <<<<<<< HEAD 10 relevant lines. 9 lines covered and ======= >>>>>>> 49e8a6c (Rebased) 1 lines missed. ======= ======= >>>>>>> 872e675 (Fix) 5 relevant lines. 5 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            class UserDecorator < Draper::Decorator
          
      2. 
        
      
      
        
      
          
    2. 
            1
            

            

              delegate_all
          
      3. 
        
      
      
        
      
          
    3. 
            
            

            

            
          
      4. 
        
      
      
        
      
          
    4. 
            1
            

            

              def name_or_email
          
      5. 
        
      
      
        
      
          
    5. 
            2
            

            

                return name if name.present?
          
      6. 
        
      
      
        
      
          
    6. 
            
            

            

            
          
      7. 
        
      
      
        
      
          
    7. 
            2
            

            

                email.split('@').first.capitalize
          
      8. 
        
      
      
        
      
          
    8. 
            
            

            

              end
          
      9. 
        
      
      
        
      
          
    9. 
            
            

            

            end
          
      10.

    app/helpers/application_helper.rb

    100.0% lines covered

    4 relevant lines. 4 lines covered and 0 lines missed. <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) 
        
      
      
        
      
          
    1. 
            1
            

            

            require 'image_processing'
          
      2. 
        
      
      
        
      
          
    2. 
            
            

            

            
          
      3. 
        
      
      
        
      
          
    3. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              decorates_association :authors
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> b3f2049 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0ed7f7c (Featire specs)
=======
=======
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> e9f3851 (Manifest_cache true)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 1d59aaa (Fix)
            module ApplicationHelper
>>>>>>> 49e8a6c (Rebased)
>>>>>>> e055dd0 (Rebased)
          
      4. 
        
      
      
        
      
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
          
    4. 
            
=======
          
    5. 
            12
=======
          
    6. 
            1
>>>>>>> 49e8a6c (Rebased)
>>>>>>> e055dd0 (Rebased)
            

            

<<<<<<< HEAD
            end
          
      7.

    app/decorators/review_decorator.rb

    100.0% <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= 75.0% >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) lines covered

    4 relevant lines. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 3 lines covered and <<<<<<< HEAD ======= 4 relevant lines. 4 lines covered and >>>>>>> d0dc1f1 (Featire specs) ======= 4 relevant lines. 4 lines covered and >>>>>>> 752f0c0 (Featire specs) ======= 4 relevant lines. 4 lines covered and <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 4e81ea2 (Featire specs) ======= 4 relevant lines. 4 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= 4 relevant lines. 4 lines covered and >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) ======= 4 lines covered and >>>>>>> 872e675 (Fix) ======= 4 lines covered and >>>>>>> 0d6dd12 (Manifest_cache true) ======= 4 lines covered and >>>>>>> e3e66f3 (Featire specs) 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
            module ApplicationHelper
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 02a399d (Manifest_cache true)
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
=======
<<<<<<< HEAD
            class ReviewDecorator < Draper::Decorator
>>>>>>> b28889f (Fix)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
            class ReviewDecorator < Draper::Decorator
>>>>>>> 872e675 (Fix)
=======
            class ReviewDecorator < Draper::Decorator
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
            class ReviewDecorator < Draper::Decorator
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
                Markdown.new(text).to_html
=======
              def markdown(text)
>>>>>>> 49e8a6c (Rebased)
>>>>>>> e055dd0 (Rebased)
          
      2. 
        
      
      
        
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
    2. 
            1
=======
=======
>>>>>>> e055dd0 (Rebased)
=======
>>>>>>> 0c57e4e (Fix)
=======
>>>>>>> 9e081dc (Fix)
<<<<<<< HEAD
          
    3. 
=======
          
    4. 
            13
<<<<<<< HEAD
>>>>>>> e18eb87 (Fix)
=======
=======
          
    5. 
            
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> e055dd0 (Rebased)
=======
=======
          
    6. 
            13
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 0c57e4e (Fix)
=======
=======
          
    7. 
            17
>>>>>>> 1d59aaa (Fix)
>>>>>>> 9e081dc (Fix)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              delegate :current_page, :per_page, :offset, :total_entries, :total_pages
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
              def markdown(text)
=======
              SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
=======
=======
              delegate_all
=======
              SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
              delegate_all
>>>>>>> b28889f (Fix)
=======
>>>>>>> 563720e (Featire specs)
=======
              SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze
>>>>>>> 4e81ea2 (Featire specs)
=======
              SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
=======
              SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
              delegate_all
>>>>>>> 872e675 (Fix)
=======
              delegate_all
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
              delegate_all
>>>>>>> e3e66f3 (Featire specs)
          
      8. 
        
      
      
        
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b28889f (Fix)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
          
    8. 
            
            

            

            
          
      9. 
        
      
      
        
      
          
    9. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              def full_name
=======
              def date_time
>>>>>>> b28889f (Fix)
=======
              def date_time
>>>>>>> 872e675 (Fix)
=======
              def date_time
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
              def date_time
>>>>>>> e3e66f3 (Featire specs)
          
      10. 
        
      
      
        
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
    10. 
            2
=======
          
    11. 
            1
>>>>>>> b28889f (Fix)
=======
          
    12. 
            1
>>>>>>> 872e675 (Fix)
=======
          
    13. 
            1
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> 5b7749a (Fix)
          
    14. 
            1
>>>>>>> e3e66f3 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                "#{first_name} #{last_name}"
=======
=======
>>>>>>> 5b7749a (Fix)
                created_at.strftime('%m/%d/%Y')
>>>>>>> b28889f (Fix)
=======
                created_at.strftime('%m/%d/%Y')
>>>>>>> 872e675 (Fix)
=======
                created_at.strftime('%m/%d/%Y')
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
                created_at.strftime('%m/%d/%Y')
>>>>>>> e3e66f3 (Featire specs)
=======
                Markdown.new(text).to_html.html_safe
>>>>>>> e18eb87 (Fix)
          
      15. 
        
      
      
        
      
          
    15. 
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b28889f (Fix)
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> b28889f (Fix)
=======
>>>>>>> 49e8a6c (Rebased)
>>>>>>> e055dd0 (Rebased)
            
            

            

              end
          
      16. 
        
      
      
        
      
          
    16. 
<<<<<<< HEAD
            
            

            

            end
          
      17.
    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD

    app/decorators/book_decorator.rb

    90.0% ======= ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)

    app/decorators/user_decorator.rb

    100.0% <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) lines covered

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 10 relevant lines. 9 lines covered and ======= >>>>>>> 49e8a6c (Rebased) 1 lines missed. ======= ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) 5 relevant lines. 5 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            class UserDecorator < Draper::Decorator
          
      2. 
        
      
      
        
      
          
    2. 
            1
            

            

              delegate_all
          
      3. 
        
      
      
        
      
          
    3. 
            
            

            

            
          
      4. 
        
      
      
        
      
          
    4. 
            1
            

            

              def name_or_email
          
      5. 
        
      
      
        
      
          
    5. 
            2
            

            

                return name if name.present?
          
      6. 
        
      
      
        
      
          
    6. 
            
            

            

            
          
      7. 
        
      
      
        
      
          
    7. 
            2
            

            

                email.split('@').first.capitalize
          
      8. 
        
      
      
        
      
          
    8. 
            
            

            

              end
          
      9. 
        
      
      
        
      
          
    9. 
            
            

            

            end
          
      10.

    app/helpers/application_helper.rb

    100.0% lines covered

    4 relevant lines. 4 lines covered and 0 lines missed. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) 
        
      
      
        
      
          
    1. 
            1
            

            

            require 'image_processing'
          
      2. 
        
      
      
        
      
          
    2. 
            
            

            

            
          
      3. 
        
      
      
        
      
          
    3. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              decorates_association :authors
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> b3f2049 (Featire specs)
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
          
      4. 
        
      
      
        
      
          
    4. 
            
            

            

            end
          
      5.
    <<<<<<< HEAD

    app/helpers/application_helper.rb

    =======

    app/decorators/review_decorator.rb

    >>>>>>> c7a726c5 (Rebased)

    100.0% lines covered

    <<<<<<< HEAD 2 relevant lines. 2 lines covered and ======= 4 relevant lines. 4 lines covered and >>>>>>> c7a726c5 (Rebased) 0 lines missed. 
        
      
      
<<<<<<< HEAD
        
      
          
    1. 
            1
            

            

            module ApplicationHelper
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
            class AuthorDecorator < Draper::Decorator
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 8cbdfeb (Manifest_cache true)
          
      2. 
        
      
      
        
      
          
    2. 
            1
            

            

<<<<<<< HEAD
              DESCRIPTION_LENGTH = 25
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> aa7b40c (Manifest_cache true)
=======
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
              delegate_all
          
      3. 
        
      
      
        
      
=======
        
      
          
    3. 
            1
            

            

            class ReviewDecorator < Draper::Decorator
=======
=======
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> e9f3851 (Manifest_cache true)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 5b7749a (Fix)
            module ApplicationHelper
>>>>>>> 49e8a6c (Rebased)
>>>>>>> 311e9fa (Rebased)
=======
            module ApplicationHelper
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
            module ApplicationHelper
>>>>>>> e3e66f3 (Featire specs)
          
      4. 
        
      
      
        
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
          
    4. 
            1
=======
=======
          
    5. 
            12
=======
          
    6. 
            1
>>>>>>> 49e8a6c (Rebased)
=======
          
    7. 
            1
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
          
    8. 
            1
>>>>>>> e3e66f3 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                Markdown.new(text).to_html
=======
              def markdown(text)
>>>>>>> 49e8a6c (Rebased)
=======
              def markdown(text)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
              def markdown(text)
>>>>>>> e3e66f3 (Featire specs)
          
      9. 
        
      
      
        
      
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
    9. 
=======
          
    10. 
            13
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
=======
=======
          
    11. 
            
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
=======
=======
          
    12. 
            13
>>>>>>> 872e675 (Fix)
>>>>>>> 557c1b8 (Fix)
=======
          
    13. 
            13
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
          
    14. 
            13
>>>>>>> e3e66f3 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              delegate_all
          
      15. 
        
      
      
        
      
>>>>>>> c7a726c5 (Rebased)
          
    15. 
            
            

            

            
          
      16. 
        
      
      
        
      
<<<<<<< HEAD
          
    16. 
=======
          
    17. 
>>>>>>> 824bb2b (Featire specs)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
              def full_name
          
      18. 
        
      
      
        
      
<<<<<<< HEAD
          
    18. 
            3
=======
<<<<<<< HEAD
          
    19. 
            1
=======
          
    20. 
            17
>>>>>>> 5b7749a (Fix)
>>>>>>> ef483b6d (Fix)
            

            

<<<<<<< HEAD
                "#{first_name} #{last_name}"
=======
                created_at.strftime('%m/%d/%Y')
=======
                Markdown.new(text).to_html.html_safe
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> fdab719f (Fix)
=======
=======
                Markdown.new(text).to_html.html_safe
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
                Markdown.new(text).to_html.html_safe
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
          
      21. 
        
      
      
        
      
          
    21. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b28889f (Fix)
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> b28889f (Fix)
=======
>>>>>>> 49e8a6c (Rebased)
>>>>>>> 311e9fa (Rebased)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
            
            

            

              end
          
      22. 
        
      
      
        
      
          
    22. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
            
            

            

            end
          
      23.

    app/decorators/book_decorator.rb

    100.0% lines covered

    10 relevant lines. 10 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            class BookDecorator < Draper::Decorator
          
      2. 
        
      
      
        
      
          
    2. 
            1
            

            

              decorates_association :authors
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 8cbdfeb (Manifest_cache true)
          
      3. 
        
      
      
        
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
    3. 
            1
            

            

                user = context.current_user
          
      4. 
        
      
      
        
      
          
    4. 
            
            

            

            
          
      5. 
        
      
      
        
      
          
    5. 
            1
            

            

                return if params[:shipping].nil?
          
      6. 
        
      
      
        
      
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
>>>>>>> 5b7749a (Fix)
          
    6. 
            
            

            

            
          
      7. 
        
      
      
        
      
          
    7. 
            1
            

            

                return if user.shipping.update(params[:shipping])
          
      8. 
        
      
      
        
      
          
    8. 
            
            

            

            
          
      9. 
        
      
      
        
      
          
    9. 
            
            

            

                context.fail!
          
      10. 
        
      
      
        
      
          
    10. 
            
            

            

              end
          
      11. 
        
      
      
        
      
          
    11. 
            
            

            

            end
          
      12.

    app/interactors/user_update.rb

    100.0% lines covered

    13 relevant lines. 13 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            class UserUpdate
          
      2. 
        
      
      
        
      
          
    2. 
            1
            

            

              include Interactor
          
      3. 
        
      
      
        
      
          
    3. 
            
            

            

            
          
      4. 
        
      
      
        
      
          
    4. 
            1
            

            

              def call
          
      5. 
        
      
      
        
      
          
    5. 
            5
            

            

                params = context.permitted_params
          
      6. 
        
      
      
        
      
          
    6. 
            5
            

            

                user = context.current_user
          
      7. 
        
      
      
        
      
          
    7. 
            
            

            

            
          
      8. 
        
      
      
        
      
          
    8. 
            5
            

            

                billing_and_shipping_update(params, user)
          
      9. 
        
      
      
        
      
          
    9. 
            
            

            

            
          
      10. 
        
      
      
        
      
          
    10. 
            5
            

            

                return if params[:user].nil?
          
      11. 
        
      
      
        
      
          
    11. 
            
            

            

            
          
      12. 
        
      
      
        
      
          
    12. 
            3
            

            

                return if !params[:user][:email].nil? && user.update(email: params[:user][:email])
          
      13. 
        
      
      
        
      
          
    13. 
            
            

            

            
          
      14. 
        
      
      
        
      
          
    14. 
            2
            

            

                return if !params[:user][:password].nil? &&
          
      15. 
        
      
      
        
      
          
    15. 
            
            

            

                          user.reset_password(params[:user][:password], params[:user][:password_confirmation])
          
      16. 
        
      
      
        
      
          
    16. 
            
            

            

            
          
      17. 
        
      
      
        
      
          
    17. 
            1
            

            

                context.fail!
          
      18. 
        
      
      
        
      
          
    18. 
            
            

            

              end
          
      19. 
        
      
      
        
      
          
    19. 
            
            

            

            
          
      20. 
        
      
      
        
      
          
    20. 
            1
            

            

              def billing_and_shipping_update(params, user)
          
      21. 
        
      
      
        
      
          
    21. 
            5
            

            

                return if !params[:billing].nil? && BillingUpdate.call(permitted_params: params, current_user: user)
          
      22. 
        
      
      
        
      
          
    22. 
            
            

            

            
          
      23. 
        
      
      
        
      
          
    23. 
            4
            

            

                !params[:shipping].nil? && ShippingUpdate.call(permitted_params: params, current_user: user)
          
      24. 
        
      
      
        
      
          
    24. 
            
            

            

              end
          
      25. 
        
      
      
        
      
          
    25. 
            
            

            

            end
          
      26.

    app/jobs/application_job.rb

    100.0% lines covered

    1 relevant lines. 1 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            class ApplicationJob < ActiveJob::Base
          
      2. 
        
      
      
        
      
          
    2. 
            
            

            

              # Automatically retry jobs that encountered a deadlock
          
      3. 
        
      
      
        
      
          
    3. 
            
            

            

              # retry_on ActiveRecord::Deadlocked
          
      4. 
        
      
      
        
      
          
    4. 
            
            

            

            
          
      5. 
        
      
      
        
      
          
    5. 
            
            

            

              # Most jobs are safe to ignore if the underlying records are no longer available
          
      6. 
        
      
      
        
      
          
    6. 
            
            

            

              # discard_on ActiveJob::DeserializationError
          
      7. 
        
      
      
        
      
          
    7. 
            
            

            

            end
          
      8.

    app/jobs/cart_cleaner.rb

    60.0% lines covered

    5 relevant lines. 3 lines covered and 2 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            class CartCleaner < ApplicationJob
          
      2. 
        
      
      
        
      
          
    2. 
            
            

            

              # include Sidekiq::Job
          
      3. 
        
      
      
        
      
          
    3. 
            1
            

            

              queue_as :default
          
      4. 
        
      
      
        
      
          
    4. 
            1
            

            

              def perform(order_id)
          
      5. 
        
      
      
        
      
          
    5. 
            
            

            

                order = Order.find(order_id)
          
      6. 
        
      
      
        
      
          
    6. 
            
            

            

                order.destroy if order.status.eql?('initialized')
          
      7. 
        
      
      
        
      
          
    7. 
            
            

            

              end
          
      8. 
        
      
      
        
      
          
    8. 
            
            

            

            end
          
      9.

    app/models/address.rb

    100.0% lines covered

    7 relevant lines. 7 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            class Address < ApplicationRecord
          
      2. 
        
      
      
        
      
          
    2. 
            1
            

            

              belongs_to :user
          
      3. 
        
      
      
        
      
          
    3. 
            
            

            

            
          
      4. 
        
      
      
        
      
          
    4. 
            1
            

            

              validates :first_name, :last_name,
          
      5. 
        
      
      
        
      
          
    5. 
            
            

            

                        length: { maximum: Constants::VALIDATES_NAME_LENGTH_MAX },
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
=======
            
          
      6.

    app/helpers/application_helper.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            module ApplicationHelper
=======
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 490b01d6 (Manifest_cache true)
          
      2. 
        
      
      
        
      
<<<<<<< HEAD
          
    2. 
=======
          
    3. 
            1
            

            

<<<<<<< HEAD
>>>>>>> bd8bda4 (Manifest_cache true)
=======
              delegate_all
          
      4. 
        
      
      
        
      
          
    4. 
            
            

            

            
          
      5. 
        
      
      
        
      
          
    5. 
            1
            

            

              def full_name
          
      6. 
        
      
      
        
      
          
    6. 
            2
            

            

                "#{first_name} #{last_name}"
=======
>>>>>>> 67ab5299 (Fix)
=======
=======
              DESCRIPTION_LENGTH = 25
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> c05ee511 (Featire specs)
=======
>>>>>>> ae884b47 (Fix)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
<<<<<<< HEAD
=======
=======
            
          
      7.

    app/helpers/application_helper.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            module ApplicationHelper
=======
>>>>>>> aa7b40c (Manifest_cache true)
          
      2. 
        
      
      
        
      
          
    2. 
            1
            

            

<<<<<<< HEAD
>>>>>>> bd8bda4 (Manifest_cache true)
=======
              delegate_all
          
      3. 
        
      
      
        
      
          
    3. 
            
            

            

            
          
      4. 
        
      
      
        
      
          
    4. 
            1
            

            

              def full_name
          
      5. 
        
      
      
        
      
          
    5. 
            2
            

            

                "#{first_name} #{last_name}"
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
          
      6. 
        
      
      
        
      
          
    6. 
<<<<<<< HEAD
=======
          
    7. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
    8. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
    9. 
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              end
          
      10. 
        
      
      
        
      
          
    10. 
            
            

            

            end
          
      11.

    app/decorators/book_decorator.rb

    90.0% lines covered

    10 relevant lines. 9 lines covered and 1 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            class BookDecorator < Draper::Decorator
          
      2. 
        
      
      
        
      
          
    2. 
            1
            

            

              decorates_association :authors
          
      3. 
        
      
      
        
      
          
    3. 
            1
            

            

              decorates_association :categories
          
      4. 
        
      
      
        
      
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> 7a02bbe (Featire specs)
          
    4. 
            
            

            

            
=======
              def date_time
>>>>>>> c7a726c5 (Rebased)
          
      5. 
        
      
      
        
      
          
    5. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
              def self.collection_decorator_class
=======
>>>>>>> e5752db (Featire specs)
              def self.collection_decorator_class
<<<<<<< HEAD
=======
=======
              def self.collection_decorator_class
=======
                created_at.strftime('%m/%d/%Y')
>>>>>>> c7a726c5 (Rebased)
          
      6. 
        
      
      
        
      
<<<<<<< HEAD
          
    6. 
            31
=======
          
    7. 
            
>>>>>>> c7a726c5 (Rebased)
            

            

<<<<<<< HEAD
                PaginatingDecorator
=======
              end
>>>>>>> c7a726c5 (Rebased)
          
      8. 
        
      
      
        
      
          
    8. 
            
            

            

<<<<<<< HEAD
              end
=======
            end
          
      9.

    app/decorators/user_decorator.rb

    100.0% lines covered

    5 relevant lines. 5 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            class UserDecorator < Draper::Decorator
          
      2. 
        
      
      
        
      
          
    2. 
            1
            

            

              delegate_all
          
      3. 
        
      
      
        
      
          
    3. 
            
            

            

            
          
      4. 
        
      
      
        
      
          
    4. 
            1
            

            

              def name_or_email
          
      5. 
        
      
      
        
      
          
    5. 
            2
            

            

                return name if name.present?
          
      6. 
        
      
      
        
      
          
    6. 
            
            

            

            
          
      7. 
        
      
      
        
      
          
    7. 
            2
            

            

                email.split('@').first.capitalize
>>>>>>> c7a726c5 (Rebased)
          
      8. 
        
      
      
        
      
          
    8. 
            
            

            

<<<<<<< HEAD
            
          
      9. 
        
      
      
        
      
          
    9. 
            1
            

            

              delegate_all
          
      10. 
        
      
      
        
      
          
    10. 
            
            

            

            
          
      11. 
        
      
      
        
      
          
    11. 
            1
            

            

              def authors_names
          
      12. 
        
      
      
        
      
          
    12. 
            90
            

            

                authors.map(&:full_name).join(', ')
          
      13. 
        
      
      
        
      
          
    13. 
            
            

            

=======
>>>>>>> c7a726c5 (Rebased)
              end
          
      14. 
        
      
      
        
      
<<<<<<< HEAD
          
    14. 
            
            

            

            
          
      15. 
        
      
      
        
      
          
    15. 
            1
            

            

              def categories_names
          
      16. 
        
      
      
        
      
          
    16. 
            1
            

            

                categories.map(&:name).join(', ')
          
      17. 
        
      
      
        
      
          
    17. 
            
            

            

              end
          
      18. 
        
      
      
        
      
          
    18. 
            
            

            

            end
          
      19.
    <<<<<<< HEAD
    ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 6da9530 (Featire specs)
    >>>>>>> 0f8241bb (Featire specs)

    app/decorators/category_decorator.rb

    100.0% lines covered

    <<<<<<< HEAD 2 relevant lines. 2 lines covered and ======= <<<<<<< HEAD <<<<<<< HEAD 4 relevant lines. 4 lines covered and ======= <<<<<<< HEAD ======= >>>>>>> 6da9530 (Featire specs) 3 relevant lines. 3 lines covered and ======= 4 relevant lines. 4 lines covered and >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

<<<<<<< HEAD
            class CategoryDecorator < Draper::Decorator
=======
<<<<<<< HEAD
<<<<<<< HEAD
            require 'image_processing'
>>>>>>> 0f8241bb (Featire specs)
          
      2. 
        
      
      
        
      
          
    2. 
            1
            

            

              delegate_all
          
      3. 
        
      
      
        
      
          
    3. 
            
            

            

            end
          
      4.

    app/decorators/paginating_decorator.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            class PaginatingDecorator < Draper::CollectionDecorator
          
      2. 
        
      
      
        
      
          
    2. 
            1
            

            

              delegate :current_page, :per_page, :offset, :total_entries, :total_pages
          
      3. 
        
      
      
        
      
          
    3. 
=======
<<<<<<< HEAD
          
    4. 
>>>>>>> c7a726c5 (Rebased)
            
            

            

            end
          
      5.

    app/helpers/application_helper.rb

    100.0% lines covered

    3 relevant lines. 3 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
>>>>>>> 0f8241bb (Featire specs)
            module ApplicationHelper
          
      2. 
        
      
      
        
      
<<<<<<< HEAD
          
    2. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
          
    3. 
=======
          
    4. 
>>>>>>> 824bb2b (Featire specs)
=======
          
    5. 
>>>>>>> 6da9530 (Featire specs)
>>>>>>> 0f8241bb (Featire specs)
            1
            

            

=======
>>>>>>> 84003439 (Featire specs)
              def markdown(text)
=======
<<<<<<< HEAD
<<<<<<< HEAD
              def markdown(text)
=======
              SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 824bb2b (Featire specs)
=======
              SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 6da9530 (Featire specs)
          
      6. 
        
      
      
        
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
    6. 
            12
=======
          
    7. 
            1
>>>>>>> 11792758 (Rebased)
            

            

<<<<<<< HEAD
                Markdown.new(text).to_html
=======
              def markdown(text)
>>>>>>> 11792758 (Rebased)
          
      8. 
        
      
      
        
      
          
    8. 
            
=======
          
    9. 
            13
>>>>>>> 31d15e66 (Fix)
=======
=======
>>>>>>> 0f8241bb (Featire specs)
          
    10. 
            13
=======
<<<<<<< HEAD
          
    11. 
            12
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
          
    12. 
            12
>>>>>>> 6da9530 (Featire specs)
>>>>>>> 0f8241bb (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
                Markdown.new(text).to_html.html_safe
=======
                Markdown.new(text).to_html
>>>>>>> 824bb2b (Featire specs)
=======
                Markdown.new(text).to_html
>>>>>>> 6da9530 (Featire specs)
          
      13. 
        
      
      
        
      
<<<<<<< HEAD
<<<<<<< HEAD
          
    13. 
=======
          
    14. 
>>>>>>> 824bb2b (Featire specs)
=======
          
    15. 
>>>>>>> 6da9530 (Featire specs)
            
            

            

              end
          
      16. 
        
      
      
        
      
<<<<<<< HEAD
<<<<<<< HEAD
          
    16. 
=======
          
    17. 
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 311e9fa (Rebased)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
    18. 
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> e055dd0 (Rebased)
            
            

            

            end
          
      19.

    app/helpers/constants.rb

    100.0% lines covered

    21 relevant lines. 21 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            module Constants
          
      2. 
        
      
      
        
      
          
    2. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> bdc24a1a (Rebased)
=======
>>>>>>> f3d746cb (Featire specs)
=======
=======
>>>>>>> 311e9fa (Rebased)
=======
>>>>>>> e055dd0 (Rebased)
=======
>>>>>>> 216fe41 (Featire specs)
=======
          
    3. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
    4. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
    5. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
    6. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 610b6138 (Featire specs)
=======
=======
          
    7. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 11792758 (Rebased)
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
>>>>>>> 824bb2b (Featire specs)
=======
=======
          
    8. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
          
    9. 
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
=======
          
    10. 
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
          
    11. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
          
    12. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> bc6bc8d2 (Rebased)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
=======
          
    13. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
          
    14. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
          
    15. 
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
=======
          
    16. 
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
          
    17. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
=======
          
    18. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
>>>>>>> 49e8a6c (Rebased)
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
          
    19. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
=======
          
    20. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            1
            

            

              PAGINATION_PER_PAGE = 12
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> d34a0770 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> ef483b6d (Fix)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> bdc24a1a (Rebased)
=======
>>>>>>> 1b8f36d8 (Manifest_cache true)
=======
>>>>>>> 1049b80c (Fix)
=======
>>>>>>> 2612be03 (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> e055dd0 (Rebased)
=======
>>>>>>> 3be4d14 (Manifest_cache true)
=======
>>>>>>> 9e081dc (Fix)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> 5506bd0 (Featire specs)
=======
              decorates_association :categories
>>>>>>> 183b6c5 (Manifest_cache true)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 11792758 (Rebased)
=======
=======
>>>>>>> 2612be03 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> bdc24a1a (Rebased)
=======
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> bc6bc8d2 (Rebased)
=======
=======
=======
              decorates_association :categories
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 51bc18c (Featire specs)
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d34a0770 (Manifest_cache true)
=======
=======
=======
              PAGINATION_PER_PAGE = 12
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 973ba8c (Featire specs)
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
=======
              PAGINATION_PER_PAGE = 12
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c12b71de (Featire specs)
=======
=======
>>>>>>> b97bb382 (Featire specs)
=======
>>>>>>> 1049b80c (Fix)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
              decorates_association :categories
>>>>>>> 02a399d (Manifest_cache true)
=======
              PAGINATION_PER_PAGE = 12
>>>>>>> 752f0c0 (Featire specs)
=======
              PAGINATION_PER_PAGE = 12
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
>>>>>>> ef483b6d (Fix)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
>>>>>>> 49e8a6c (Rebased)
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
>>>>>>> e9f3851 (Manifest_cache true)
>>>>>>> 3be4d14 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1b8f36d8 (Manifest_cache true)
=======
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
=======
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      21. 
        
      
      
        
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 11792758 (Rebased)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> c12b71de (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> ef483b6d (Fix)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> bdc24a1a (Rebased)
=======
>>>>>>> 53db2224 (Featire specs)
=======
>>>>>>> 7b22ad7e (Featire specs)
=======
>>>>>>> b97bb382 (Featire specs)
=======
>>>>>>> 1049b80c (Fix)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> e055dd0 (Rebased)
=======
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 973ba8c (Featire specs)
=======
>>>>>>> 9e081dc (Fix)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> 53db2224 (Featire specs)
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> d52f9efe (Featire specs)
=======
=======
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
>>>>>>> 7b22ad7e (Featire specs)
=======
>>>>>>> b97bb382 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c12b71de (Featire specs)
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
    21. 
=======
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> 5507b42 (Featire specs)
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> 973ba8c (Featire specs)
          
    22. 
=======
          
    23. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
=======
=======
          
    24. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
          
    25. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
=======
=======
=======
          
    26. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
          
    27. 
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
=======
=======
>>>>>>> 51bc18c (Featire specs)
=======
=======
          
    28. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
=======
=======
>>>>>>> 973ba8c (Featire specs)
=======
          
    29. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bf05825 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
    30. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
    31. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
    32. 
>>>>>>> 5b7749a (Fix)
=======
>>>>>>> 6da9530 (Featire specs)
=======
=======
          
    33. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
=======
=======
>>>>>>> 0676508 (Featire specs)
=======
          
    34. 
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 659083f (Featire specs)
=======
=======
=======
          
    35. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
=======
=======
          
    36. 
>>>>>>> 49e8a6c (Rebased)
>>>>>>> e055dd0 (Rebased)
=======
=======
>>>>>>> 5507b42 (Featire specs)
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 973ba8c (Featire specs)
=======
=======
          
    37. 
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
=======
=======
=======
          
    38. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
>>>>>>> 3cf8dd4 (Featire specs)
            
            

            

            
          
      39. 
        
      
      
        
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
=======
=======
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
=======
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 5b7749a (Fix)
=======
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
=======
=======
>>>>>>> e055dd0 (Rebased)
=======
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 973ba8c (Featire specs)
=======
>>>>>>> 9e081dc (Fix)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
=======
=======
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> e055dd0 (Rebased)
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5e31aeb (Featire specs)
=======
=======
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 51bc18c (Featire specs)
=======
=======
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 973ba8c (Featire specs)
=======
=======
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
=======
=======
>>>>>>> 3e9f99d (Featire specs)
>>>>>>> 3cf8dd4 (Featire specs)
          
    39. 
            1
            

            

              STAR_MIN = 0
          
      40. 
        
      
      
        
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 311e9fa (Rebased)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 932dbec (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 77d62af (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 5b7749a (Fix)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> e055dd0 (Rebased)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 5e31aeb (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 9e081dc (Fix)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 216fe41 (Featire specs)
          
    40. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 311e9fa (Rebased)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> b719333 (Manifest_cache true)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 5b7749a (Fix)
=======
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> e055dd0 (Rebased)
=======
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> 3be4d14 (Manifest_cache true)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 9e081dc (Fix)
=======
>>>>>>> 216fe41 (Featire specs)
              STAR_MAX = 5
          
      41. 
        
      
      
        
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 3be4d14 (Manifest_cache true)
=======
>>>>>>> a71befd (Manifest_cache true)
=======
>>>>>>> 1d11874 (Add login registration pages)
          
    41. 
=======
          
    42. 
            
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a71befd (Manifest_cache true)
=======
          
    43. 
            30
=======
          
    44. 
            
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 1d11874 (Add login registration pages)
=======
          
    45. 
            31
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 3be4d14 (Manifest_cache true)
=======
>>>>>>> a71befd (Manifest_cache true)
=======
>>>>>>> 1d11874 (Add login registration pages)
            

            

                PaginatingDecorator
          
      46. 
        
      
      
        
      
          
    46. 
            
            

            

              end
          
      47. 
        
      
      
        
      
          
    47. 
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
=======
          
    48. 
>>>>>>> 5b7749a (Fix)
=======
          
    49. 
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> 3be4d14 (Manifest_cache true)
=======
          
    50. 
>>>>>>> 9e081dc (Fix)
            
            

            

            
          
      51. 
        
      
      
        
      
          
    51. 
            1
            

            

              CATALOG_BOOK_COUNT = 3
          
      52. 
        
      
      
        
      
          
    52. 
            1
            

            

              BEST_SELLER_COUNT = 4
          
      53. 
        
      
      
        
      
          
    53. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 824bb2b (Featire specs)
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 5e31aeb (Featire specs)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
              delegate_all
          
      54. 
        
      
      
        
      
          
    54. 
            
            

            

            
          
      55. 
        
      
      
        
      
          
    55. 
            1
            

            

              def authors_names
          
      56. 
        
      
      
        
      
<<<<<<< HEAD
<<<<<<< HEAD
          
    56. 
            1
=======
<<<<<<< HEAD
          
    57. 
            89
=======
          
    58. 
            1
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
=======
          
    59. 
            90
>>>>>>> 1214e1f (Add login registration pages)
            

            

                authors.map(&:full_name).join(', ')
          
      60. 
        
      
      
        
      
          
    60. 
            
            

            

              end
          
      61. 
        
      
      
        
      
          
    61. 
            
            

            

            
          
      62. 
        
      
      
        
      
          
    62. 
            1
            

            

              def categories_names
          
      63. 
        
      
      
        
      
          
    63. 
            1
            

            

                categories.map(&:name).join(', ')
          
      64. 
        
      
      
        
      
          
    64. 
            
            

            

              end
          
      65. 
        
      
      
        
      
          
    65. 
            
            

            

            end
          
      66.

    app/decorators/category_decorator.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            class CategoryDecorator < Draper::Decorator
          
      2. 
        
      
      
        
      
          
    2. 
            1
            

            

              delegate_all
          
      3. 
        
      
      
        
      
          
    3. 
            
            

            

<<<<<<< HEAD
            
=======
<<<<<<< HEAD
            end
          
      4.

    app/decorators/paginating_decorator.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            class PaginatingDecorator < Draper::CollectionDecorator
=======
            
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
          
      2. 
        
      
      
        
      
<<<<<<< HEAD
          
    2. 
=======
<<<<<<< HEAD
          
    3. 
            1
            

            

              delegate :current_page, :per_page, :offset, :total_entries, :total_pages
          
      4. 
        
      
      
        
      
          
    4. 
=======
          
    5. 
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
            
            

            

            end
          
      6. 
        
      
      
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> 7375d4b (Manifest_cache true)
        
      
          
    6. 
            
            

            

            
          
      7. 
        
      
      
<<<<<<< HEAD
=======
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)

    app/helpers/application_helper.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            module ApplicationHelper
=======
>>>>>>> bd8bda4 (Manifest_cache true)
          
      2. 
        
      
      
        
      
          
    2. 
            1
            

            

<<<<<<< HEAD
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 3be4d14 (Manifest_cache true)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 9e081dc (Fix)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 216fe41 (Featire specs)
              DESCRIPTION_LENGTH = 25
          
      3. 
        
      
      
        
      
<<<<<<< HEAD
          
    3. 
            1
            

            

              MIN_PRICE_IN_CENTS = 0
          
      4. 
        
      
      
        
      
          
    4. 
            1
            

            

              MAX_PRICE_IN_CENTS = 50_000
          
      5. 
        
      
      
        
      
          
    5. 
            
            

            

            
          
      6. 
        
      
      
        
      
          
    6. 
            1
            

            

              TEXT_FORMAT = %r{\A[A-Za-z0-9!#$%&'*+-/=?^_`{|}~. ]+\z}.freeze
          
      7. 
        
      
      
        
      
          
    7. 
            1
            

            

              NAME_FORMAT = /\A[A-Za-z]+\z/.freeze
          
      8. 
        
      
      
        
      
          
    8. 
            1
            

            

              COUNTY_FORMAT = /\A[A-Za-z ]+\z/.freeze
          
      9. 
        
      
      
        
      
          
    9. 
            1
            

            

              PHONE_FORMAT = /\A[\\+]?[(]?[0-9]{3}[)]?[-\s\\.]?[0-9]{3}[-\s\\.]?[0-9]{4,6}\z/.freeze
          
      10. 
        
      
      
        
      
          
    10. 
            1
            

            

              ZIP_FORMAT = /\A[0-9]+\z/.freeze
          
      11. 
        
      
      
        
      
          
    11. 
            
            

            

            
          
      12. 
        
      
      
        
      
          
    12. 
            1
            

            

              VALIDATES_NAME_LENGTH_MAX = 50
          
      13. 
        
      
      
        
      
          
    13. 
            1
            

            

              VALIDATES_TEXT_LENGTH_MAX = 500
          
      14. 
        
      
      
        
      
          
    14. 
            1
            

            

              VALIDATES_TITLE_LENGTH_MAX = 80
          
      15. 
        
      
      
        
      
          
    15. 
            1
            

            

              VALIDATES_PHONE_LENGTH_MAX = 15
          
      16. 
        
      
      
        
      
          
    16. 
            1
            

            

              VALIDATES_ZIP_LENGTH_MAX = 10
          
      17. 
        
      
      
        
      
          
    17. 
            
            

            

            
          
      18. 
        
      
      
        
      
          
    18. 
            1
            

            

              FOOTER_NUMBER = '(555)-555-5555'.freeze
          
      19. 
        
      
      
        
      
          
    19. 
            1
            

            

              FOOTER_EMAIL = 'support@bookstore.com'.freeze
          
      20. 
        
      
      
        
      
          
    20. 
            
            

            

            end
          
      21.
    <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix)

    app/interactors/billing_update.rb

    87.5% lines covered

    8 relevant lines. 7 lines covered and 1 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            class BillingUpdate
          
      2. 
        
      
      
        
      
          
    2. 
            1
            

            

              include Interactor
          
      3. 
        
      
      
        
      
          
    3. 
            
            

            

            
          
      4. 
        
      
      
        
      
          
    4. 
            1
            

            

              def call
          
      5. 
        
      
      
        
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e055dd0 (Rebased)
=======
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
=======
<<<<<<< HEAD
>>>>>>> 973ba8c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 0c57e4e (Fix)
=======
>>>>>>> 311e9fa (Rebased)
=======
=======
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 1d59aaa (Fix)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
          
    5. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0c57e4e (Fix)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
=======
                params = context.permitted_params
>>>>>>> 3e9f99d (Featire specs)
>>>>>>> 3cf8dd4 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
=======
<<<<<<< HEAD
>>>>>>> 973ba8c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 551c6ab (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> d782a28 (Manifest_cache true)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 1d59aaa (Fix)
                params = context.permitted_params
          
      6. 
        
      
      
        
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0c57e4e (Fix)
=======
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
=======
<<<<<<< HEAD
>>>>>>> 551c6ab (Manifest_cache true)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
          
    6. 
            30
=======
          
    7. 
            
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
=======
          
    8. 
            31
>>>>>>> 1214e1f (Add login registration pages)
=======
          
    9. 
            
>>>>>>> d782a28 (Manifest_cache true)
=======
>>>>>>> 03c0867 (Add login registration pages)
            

            

                PaginatingDecorator
          
      10. 
        
      
      
        
      
          
    10. 
            
            

            

              end
          
      11. 
        
      
      
        
      
          
    11. 
            
            

            

            
          
      12. 
        
      
      
        
      
          
    12. 
            1
            

            

>>>>>>> 551c6ab (Manifest_cache true)
              delegate_all
          
      13. 
        
      
      
        
      
          
    13. 
            
            

            

            
          
      14. 
        
      
      
        
      
          
    14. 
            1
            

            

              def authors_names
          
      15. 
        
      
      
        
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 551c6ab (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 22ee41c (Add login registration pages)
>>>>>>> 03c0867 (Add login registration pages)
>>>>>>> 8d4ec55 (Add login registration pages)
          
    15. 
            1
=======
<<<<<<< HEAD
          
    16. 
            89
=======
          
    17. 
            1
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
    18. 
            90
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
    19. 
            1
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 551c6ab (Manifest_cache true)
=======
=======
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
    20. 
            89
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
=======
          
    21. 
            90
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 22ee41c (Add login registration pages)
>>>>>>> 03c0867 (Add login registration pages)
>>>>>>> 8d4ec55 (Add login registration pages)
            

            

                authors.map(&:full_name).join(', ')
          
      22. 
        
      
      
        
      
          
    22. 
            
            

            

              end
          
      23. 
        
      
      
        
      
          
    23. 
            
            

            

            
          
      24. 
        
      
      
        
      
          
    24. 
            1
            

            

              def categories_names
          
      25. 
        
      
      
        
      
          
    25. 
            1
            

            

                categories.map(&:name).join(', ')
          
      26. 
        
      
      
        
      
          
    26. 
            
            

            

              end
          
      27. 
        
      
      
        
      
          
    27. 
            
            

            

            end
          
      28.

    app/decorators/category_decorator.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            class CategoryDecorator < Draper::Decorator
          
      2. 
        
      
      
        
      
          
    2. 
            1
            

            

              delegate_all
          
      3. 
        
      
      
        
      
          
    3. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
            
=======
<<<<<<< HEAD
<<<<<<< HEAD
            end
          
      4.

    app/decorators/paginating_decorator.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            class PaginatingDecorator < Draper::CollectionDecorator
=======
            
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
=======
            
>>>>>>> d782a28 (Manifest_cache true)
=======
              PAGINATION_PER_PAGE = 12
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
              PAGINATION_PER_PAGE = 12
>>>>>>> 4552227 (Featire specs)
>>>>>>> 6fba6be (Featire specs)
          
      2. 
        
      
      
        
      
<<<<<<< HEAD
<<<<<<< HEAD
          
    2. 
=======
<<<<<<< HEAD
          
    3. 
            1
            

            

              delegate :current_page, :per_page, :offset, :total_entries, :total_pages
          
      4. 
        
      
      
        
      
          
    4. 
=======
          
    5. 
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
=======
          
    6. 
>>>>>>> d782a28 (Manifest_cache true)
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
            end
          
      7. 
        
      
      
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> 7375d4b (Manifest_cache true)
=======
>>>>>>> d782a28 (Manifest_cache true)
        
      
          
    7. 
            
            

            

=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> 4552227 (Featire specs)
            
          
      8. 
        
      
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
=======
>>>>>>> d782a28 (Manifest_cache true)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 6fba6be (Featire specs)

    app/helpers/application_helper.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            module ApplicationHelper
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> bd8bda4 (Manifest_cache true)
=======
>>>>>>> d782a28 (Manifest_cache true)
=======
=======
            class AuthorDecorator < Draper::Decorator
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 35d17b9 (Manifest_cache true)
          
      2. 
        
      
      
        
      
          
    2. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b719333 (Manifest_cache true)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 77d62af (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 5b7749a (Fix)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 6da9530 (Featire specs)
              DESCRIPTION_LENGTH = 25
          
      3. 
        
      
      
        
      
<<<<<<< HEAD
<<<<<<< HEAD
          
    3. 
            
            

            

            
          
      4. 
        
      
      
        
      
          
    4. 
            1
            

            

              def full_name
          
      5. 
        
      
      
        
      
          
    5. 
            2
            

            

                "#{first_name} #{last_name}"
<<<<<<< HEAD
=======
=======
              DESCRIPTION_LENGTH = 25
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
          
      6. 
        
      
      
        
      
          
    6. 
            
            

            

<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
              end
          
      7. 
        
      
      
        
      
          
    7. 
            
            

            

            end
          
      8.

    app/decorators/book_decorator.rb

    90.0% lines covered

    10 relevant lines. 9 lines covered and 1 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            class BookDecorator < Draper::Decorator
          
      2. 
        
      
      
        
      
          
    2. 
            1
            

            

              decorates_association :authors
>>>>>>> bd8bda4 (Manifest_cache true)
          
      3. 
        
      
      
        
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 311e9fa (Rebased)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> b719333 (Manifest_cache true)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 5b7749a (Fix)
=======
>>>>>>> 6da9530 (Featire specs)
          
    3. 
            1
            

            

              MIN_PRICE_IN_CENTS = 0
          
      4. 
        
      
      
        
      
          
    4. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              MAX_PRICE_IN_CENTS = 50_000
=======
              MAX_PRICE_IN_CENTS = 10_000
>>>>>>> 824bb2b (Featire specs)
=======
              MAX_PRICE_IN_CENTS = 50_000
>>>>>>> 311e9fa (Rebased)
=======
              MAX_PRICE_IN_CENTS = 50_000
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
              MAX_PRICE_IN_CENTS = 50_000
>>>>>>> e3e66f3 (Featire specs)
=======
              MAX_PRICE_IN_CENTS = 10_000
>>>>>>> 6da9530 (Featire specs)
          
      5. 
        
      
      
        
      
          
    5. 
            
            

            

            
          
      6. 
        
      
      
        
      
          
    6. 
            1
            

            

              TEXT_FORMAT = %r{\A[A-Za-z0-9!#$%&'*+-/=?^_`{|}~. ]+\z}.freeze
          
      7. 
        
      
      
        
      
          
    7. 
            1
            

            

              NAME_FORMAT = /\A[A-Za-z]+\z/.freeze
          
      8. 
        
      
      
        
      
          
    8. 
            1
            

            

              COUNTY_FORMAT = /\A[A-Za-z ]+\z/.freeze
          
      9. 
        
      
      
        
      
          
    9. 
            1
            

            

              PHONE_FORMAT = /\A[\\+]?[(]?[0-9]{3}[)]?[-\s\\.]?[0-9]{3}[-\s\\.]?[0-9]{4,6}\z/.freeze
          
      10. 
        
      
      
        
      
          
    10. 
            1
            

            

              ZIP_FORMAT = /\A[0-9]+\z/.freeze
          
      11. 
        
      
      
        
      
          
    11. 
            
            

            

            
          
      12. 
        
      
      
        
      
          
    12. 
            1
            

            

              VALIDATES_NAME_LENGTH_MAX = 50
          
      13. 
        
      
      
        
      
          
    13. 
            1
            

            

              VALIDATES_TEXT_LENGTH_MAX = 500
          
      14. 
        
      
      
        
      
          
    14. 
            1
            

            

              VALIDATES_TITLE_LENGTH_MAX = 80
          
      15. 
        
      
      
        
      
          
    15. 
            1
            

            

              VALIDATES_PHONE_LENGTH_MAX = 15
          
      16. 
        
      
      
        
      
          
    16. 
            1
            

            

              VALIDATES_ZIP_LENGTH_MAX = 10
          
      17. 
        
      
      
        
      
          
    17. 
            
            

            

            
          
      18. 
        
      
      
        
      
          
    18. 
            1
            

            

              FOOTER_NUMBER = '(555)-555-5555'.freeze
          
      19. 
        
      
      
        
      
          
    19. 
            1
            

            

              FOOTER_EMAIL = 'support@bookstore.com'.freeze
          
      20. 
        
      
      
        
      
          
    20. 
            
            

            

            end
          
      21.
    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)

    app/interactors/billing_update.rb

    87.5% lines covered

    8 relevant lines. 7 lines covered and 1 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            class BillingUpdate
          
      2. 
        
      
      
        
      
          
    2. 
            1
            

            

              include Interactor
          
      3. 
        
      
      
        
      
          
    3. 
            
            

            

            
          
      4. 
        
      
      
        
      
          
    4. 
            1
            

            

              def call
          
      5. 
        
      
      
        
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0676508 (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 5b7749a (Fix)
=======
>>>>>>> 6da9530 (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> 0676508 (Featire specs)
          
    5. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> 0676508 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b28889f (Fix)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> d782a28 (Manifest_cache true)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 5b7749a (Fix)
=======
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
=======
>>>>>>> b28889f (Fix)
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> 0676508 (Featire specs)
                params = context.permitted_params
          
      6. 
        
      
      
        
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> bd30d038 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> ef483b6d (Fix)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
          
    6. 
            
=======
<<<<<<< HEAD
          
    7. 
            30
=======
          
    8. 
            
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
=======
          
    9. 
            31
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
=======
          
    10. 
            
>>>>>>> d782a28 (Manifest_cache true)
=======
          
    11. 
            
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
          
    12. 
            
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
            

            

                PaginatingDecorator
          
      13. 
        
      
      
        
      
          
    13. 
            
            

            

              end
          
      14. 
        
      
      
        
      
          
    14. 
            
            

            

            
          
      15. 
        
      
      
        
      
          
    15. 
            1
            

            

              delegate_all
          
      16. 
        
      
      
        
      
          
    16. 
            
            

            

            
          
      17. 
        
      
      
        
      
          
    17. 
            1
            

            

              def authors_names
          
      18. 
        
      
      
        
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
          
    18. 
            1
=======
<<<<<<< HEAD
          
    19. 
            89
=======
          
    20. 
            1
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
=======
          
    21. 
            90
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
=======
          
    22. 
            1
>>>>>>> d782a28 (Manifest_cache true)
=======
          
    23. 
            1
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
          
    24. 
            1
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
            

            

                authors.map(&:full_name).join(', ')
          
      25. 
        
      
      
        
      
          
    25. 
            
            

            

              end
          
      26. 
        
      
      
        
      
          
    26. 
            
            

            

            
          
      27. 
        
      
      
        
      
          
    27. 
            1
            

            

              def categories_names
          
      28. 
        
      
      
        
      
          
    28. 
            1
            

            

                categories.map(&:name).join(', ')
          
      29. 
        
      
      
        
      
          
    29. 
            
            

            

              end
          
      30. 
        
      
      
        
      
          
    30. 
            
            

            

            end
          
      31.

    app/decorators/category_decorator.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            class CategoryDecorator < Draper::Decorator
          
      2. 
        
      
      
        
      
          
    2. 
            1
            

            

              delegate_all
          
      3. 
        
      
      
        
      
          
    3. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
            
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
            
=======
              PAGINATION_PER_PAGE = 12
>>>>>>> 08edf50 (Featire specs)
=======
              PAGINATION_PER_PAGE = 12
>>>>>>> 4552227 (Featire specs)
          
      4. 
        
      
      
        
      
          
    4. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 36356d3 (Featire specs)
=======
            
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
            end
          
      5. 
        
      
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)

    app/decorators/paginating_decorator.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            class PaginatingDecorator < Draper::CollectionDecorator
=======
            
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
            
>>>>>>> d782a28 (Manifest_cache true)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
          
      2. 
        
      
      
        
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
          
    2. 
=======
<<<<<<< HEAD
          
    3. 
            1
            

            

              delegate :current_page, :per_page, :offset, :total_entries, :total_pages
          
      4. 
        
      
      
        
      
          
    4. 
=======
          
    5. 
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
          
    6. 
>>>>>>> d782a28 (Manifest_cache true)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
            
            

            

            end
          
      7. 
        
      
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
=======
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
>>>>>>> d782a28 (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
        
      
          
    7. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 4552227 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
            
          
      8. 
        
      
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
=======
>>>>>>> d782a28 (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)

    app/helpers/application_helper.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            module ApplicationHelper
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> bd8bda4 (Manifest_cache true)
=======
>>>>>>> d782a28 (Manifest_cache true)
=======
=======
            class AuthorDecorator < Draper::Decorator
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 35d17b9 (Manifest_cache true)
=======
=======
            class AuthorDecorator < Draper::Decorator
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
            class AuthorDecorator < Draper::Decorator
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
          
      2. 
        
      
      
        
      
          
    2. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 35d17b9 (Manifest_cache true)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 551c6ab (Manifest_cache true)
=======
<<<<<<< HEAD
=======
>>>>>>> 35d17b9 (Manifest_cache true)
>>>>>>> fd310ed (Manifest_cache true)
              DESCRIPTION_LENGTH = 25
>>>>>>> 02a399d (Manifest_cache true)
=======
              delegate_all
          
      3. 
        
      
      
        
      
          
    3. 
            
            

            

            
          
      4. 
        
      
      
        
      
          
    4. 
            1
            

            

              def full_name
          
      5. 
        
      
      
        
      
          
    5. 
            2
=======
          
    6. 
            3
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            

            

                "#{first_name} #{last_name}"
          
      7. 
        
      
      
        
      
          
    7. 
            
            

            

              end
          
      8. 
        
      
      
        
      
          
    8. 
            
            

            

            end
          
      9.

    app/decorators/book_decorator.rb

    100.0% lines covered

    10 relevant lines. 10 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            class BookDecorator < Draper::Decorator
          
      2. 
        
      
      
        
      
          
    2. 
            1
            

            

              decorates_association :authors
<<<<<<< HEAD
<<<<<<< HEAD
=======
              DESCRIPTION_LENGTH = 25
>>>>>>> d782a28 (Manifest_cache true)
=======
              DESCRIPTION_LENGTH = 25
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
              DESCRIPTION_LENGTH = 25
>>>>>>> e3e66f3 (Featire specs)
=======
=======
              DESCRIPTION_LENGTH = 25
>>>>>>> d782a28 (Manifest_cache true)
>>>>>>> 551c6ab (Manifest_cache true)
>>>>>>> bd8bda4 (Manifest_cache true)
=======
              DESCRIPTION_LENGTH = 25
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
              delegate_all
=======
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 973ba8c (Featire specs)
=======
=======
              delegate_all
          
      3. 
        
      
      
        
      
          
    3. 
            
            

            

            
          
      4. 
        
      
      
        
      
          
    4. 
            1
            

            

              def full_name
          
      5. 
        
      
      
        
      
          
    5. 
            3
            

            

                "#{first_name} #{last_name}"
          
      6. 
        
      
      
        
      
          
    6. 
            
            

            

              end
          
      7. 
        
      
      
        
      
          
    7. 
            
            

            

            end
          
      8.

    app/decorators/book_decorator.rb

    100.0% lines covered

    10 relevant lines. 10 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            class BookDecorator < Draper::Decorator
          
      2. 
        
      
      
        
      
          
    2. 
            1
            

            

              decorates_association :authors
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> fd310ed (Manifest_cache true)
          
      3. 
        
      
      
        
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
    3. 
            
            

            

            
          
      4. 
        
      
      
        
      
          
    4. 
            1
            

            

              def full_name
          
      5. 
        
      
      
        
      
          
    5. 
            3
            

            

                "#{first_name} #{last_name}"
          
      6. 
        
      
      
        
      
          
    6. 
            
            

            

              end
          
      7. 
        
      
      
        
      
          
    7. 
            
            

            

            end
          
      8.

    app/decorators/book_decorator.rb

    100.0% lines covered

    10 relevant lines. 10 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            class BookDecorator < Draper::Decorator
          
      2. 
        
      
      
        
      
          
    2. 
            1
            

            

              decorates_association :authors
>>>>>>> aa7b40c (Manifest_cache true)
          
      3. 
        
      
      
        
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 551c6ab (Manifest_cache true)
=======
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bae2b7de (Add login registration pages)
=======
>>>>>>> 31d15e66 (Fix)
=======
=======
>>>>>>> bd30d038 (Manifest_cache true)
=======
>>>>>>> c12b71de (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8288136d (Fix)
=======
=======
>>>>>>> 8887ba5b (Fix)
=======
>>>>>>> 56531f25 (Manifest_cache true)
=======
>>>>>>> d782a28 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> bd30d038 (Manifest_cache true)
=======
=======
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c12b71de (Featire specs)
=======
=======
>>>>>>> b97bb382 (Featire specs)
=======
>>>>>>> 1049b80c (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
>>>>>>> ef483b6d (Fix)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0c57e4e (Fix)
<<<<<<< HEAD
>>>>>>> 8887ba5b (Fix)
=======
=======
=======
>>>>>>> d782a28 (Manifest_cache true)
>>>>>>> 551c6ab (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 56531f25 (Manifest_cache true)
=======
=======
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
=======
>>>>>>> 1d59aaa (Fix)
>>>>>>> 9e081dc (Fix)
>>>>>>> 1049b80c (Fix)
          
    3. 
            1
            

            

                user = context.current_user
          
      4. 
        
      
      
        
      
          
    4. 
            
            

            

            
          
      5. 
        
      
      
        
      
          
    5. 
            1
            

            

                return if params[:billing].nil?
          
      6. 
        
      
      
        
      
          
    6. 
            
            

            

            
          
      7. 
        
      
      
        
      
          
    7. 
            1
            

            

                return if user.billing.update(params[:billing])
          
      8. 
        
      
      
        
      
          
    8. 
            
            

            

            
          
      9. 
        
      
      
        
      
          
    9. 
            
            

            

                context.fail!
          
      10. 
        
      
      
        
      
          
    10. 
            
            

            

              end
          
      11. 
        
      
      
        
      
          
    11. 
            
            

            

            end
          
      12.

    app/interactors/shipping_update.rb

    87.5% lines covered

    8 relevant lines. 7 lines covered and 1 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            class ShippingUpdate
          
      2. 
        
      
      
        
      
          
    2. 
            1
            

            

              include Interactor
          
      3. 
        
      
      
        
      
          
    3. 
            
            

            

            
          
      4. 
        
      
      
        
      
          
    4. 
            1
            

            

              def call
          
      5. 
        
      
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 4552227 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 5b7749a (Fix)
=======
>>>>>>> 6da9530 (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 8181d13 (Featire specs)
=======
=======
>>>>>>> 4552227 (Featire specs)
>>>>>>> 15c51b7 (Featire specs)
=======
>>>>>>> 9e081dc (Fix)
        
      
          
    5. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 5b7749a (Fix)
=======
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> fd310ed (Manifest_cache true)
=======
>>>>>>> 8181d13 (Featire specs)
=======
>>>>>>> 15c51b7 (Featire specs)
=======
>>>>>>> 9e081dc (Fix)
                params = context.permitted_params
          
      6. 
        
      
      
        
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd310ed (Manifest_cache true)
          
    6. 
            
            

            

                PaginatingDecorator
          
      7. 
        
      
      
        
      
          
    7. 
            
            

            

              end
          
      8. 
        
      
      
        
      
          
    8. 
            
            

            

            
          
      9. 
        
      
      
        
      
          
    9. 
            1
            

            

              delegate_all
          
      10. 
        
      
      
        
      
          
    10. 
            
            

            

            
          
      11. 
        
      
      
        
      
          
    11. 
            1
            

            

              def authors_names
          
      12. 
        
      
      
        
      
          
    12. 
            1
            

            

                authors.map(&:full_name).join(', ')
          
      13. 
        
      
      
        
      
          
    13. 
            
            

            

              end
          
      14. 
        
      
      
        
      
          
    14. 
            
            

            

            
          
      15. 
        
      
      
        
      
          
    15. 
            1
            

            

              def categories_names
          
      16. 
        
      
      
        
      
          
    16. 
            1
            

            

                categories.map(&:name).join(', ')
          
      17. 
        
      
      
        
      
          
    17. 
            
            

            

              end
          
      18. 
        
      
      
        
      
          
    18. 
            
            

            

            end
          
      19.

    app/decorators/category_decorator.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            class CategoryDecorator < Draper::Decorator
          
      2. 
        
      
      
        
      
          
    2. 
            1
            

            

              delegate_all
          
      3. 
        
      
      
        
      
          
    3. 
            
            

            

            
          
      4. 
        
      
      
        
      
          
    4. 
            
            

            

            end
          
      5. 
        
      
      
        
      
          
    5. 
            
            

            

            
          
      6.

    app/helpers/application_helper.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            module ApplicationHelper
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
            class AuthorDecorator < Draper::Decorator
>>>>>>> 183b6c5 (Manifest_cache true)
=======
>>>>>>> fd310ed (Manifest_cache true)
=======
=======
            class AuthorDecorator < Draper::Decorator
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 42e9c2e (Manifest_cache true)
          
      2. 
        
      
      
        
      
          
    2. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 42e9c2e (Manifest_cache true)
              DESCRIPTION_LENGTH = 25
>>>>>>> aa7b40c (Manifest_cache true)
=======
              DESCRIPTION_LENGTH = 25
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
              delegate_all
=======
>>>>>>> 8181d13 (Featire specs)
=======
=======
              delegate_all
          
      3. 
        
      
      
        
      
          
    3. 
            
            

            

            
          
      4. 
        
      
      
        
      
          
    4. 
            1
            

            

              def full_name
          
      5. 
        
      
      
        
      
          
    5. 
            2
            

            

                "#{first_name} #{last_name}"
=======
              DESCRIPTION_LENGTH = 25
>>>>>>> 4552227 (Featire specs)
          
      6. 
        
      
      
        
      
          
    6. 
            
            

            

<<<<<<< HEAD
              end
          
      7. 
        
      
      
        
      
          
    7. 
            
            

            

            end
          
      8.

    app/decorators/book_decorator.rb

    90.0% lines covered

    10 relevant lines. 9 lines covered and 1 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            class BookDecorator < Draper::Decorator
          
      2. 
        
      
      
        
      
          
    2. 
            1
            

            

              decorates_association :authors
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 42e9c2e (Manifest_cache true)
          
      3. 
        
      
      
        
      
          
    3. 
            
            

            

            
          
      4. 
        
      
      
        
      
          
    4. 
            1
            

            

              def full_name
          
      5. 
        
      
      
        
      
          
    5. 
            2
            

            

                "#{first_name} #{last_name}"
=======
              DESCRIPTION_LENGTH = 25
>>>>>>> 4552227 (Featire specs)
          
      6. 
        
      
      
        
      
          
    6. 
            
            

            

<<<<<<< HEAD
              end
          
      7. 
        
      
      
        
      
          
    7. 
            
            

            

            end
          
      8.

    app/decorators/book_decorator.rb

    90.0% lines covered

    10 relevant lines. 9 lines covered and 1 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            class BookDecorator < Draper::Decorator
          
      2. 
        
      
      
        
      
          
    2. 
            1
            

            

              decorates_association :authors
>>>>>>> 183b6c5 (Manifest_cache true)
=======
              DESCRIPTION_LENGTH = 25
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> fd310ed (Manifest_cache true)
          
      3. 
        
      
      
        
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5b7749a (Fix)
=======
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> fd310ed (Manifest_cache true)
          
    3. 
            1
            

            

                user = context.current_user
          
      4. 
        
      
      
        
      
          
    4. 
            
            

            

            
          
      5. 
        
      
      
        
      
          
    5. 
            1
            

            

                return if params[:shipping].nil?
          
      6. 
        
      
      
        
      
<<<<<<< HEAD
<<<<<<< HEAD
          
    6. 
            31
            

            

                PaginatingDecorator
          
      7. 
        
      
      
        
      
          
    7. 
            
            

            

              end
          
      8. 
        
      
      
        
      
          
    8. 
            
            

            

            
          
      9. 
        
      
      
        
      
          
    9. 
            1
            

            

              delegate_all
          
      10. 
        
      
      
        
      
          
    10. 
            
            

            

            
          
      11. 
        
      
      
        
      
          
    11. 
            1
            

            

              def authors_names
          
      12. 
        
      
      
        
      
          
    12. 
            90
            

            

                authors.map(&:full_name).join(', ')
          
      13. 
        
      
      
        
      
          
    13. 
            
            

            

              end
          
      14. 
        
      
      
        
      
          
    14. 
            
            

            

            
          
      15. 
        
      
      
        
      
          
    15. 
            1
            

            

              def categories_names
          
      16. 
        
      
      
        
      
          
    16. 
            1
            

            

                categories.map(&:name).join(', ')
          
      17. 
        
      
      
        
      
          
    17. 
            
            

            

              end
          
      18. 
        
      
      
        
      
          
    18. 
            
            

            

            end
          
      19.

    app/decorators/category_decorator.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            class CategoryDecorator < Draper::Decorator
          
      2. 
        
      
      
        
      
          
    2. 
            1
            

            

              delegate_all
          
      3. 
        
      
      
        
      
          
    3. 
            
            

            

            end
          
      4.

    app/decorators/paginating_decorator.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            class PaginatingDecorator < Draper::CollectionDecorator
          
      2. 
        
      
      
        
      
          
    2. 
            1
            

            

              delegate :current_page, :per_page, :offset, :total_entries, :total_pages
          
      3. 
        
      
      
        
      
          
    3. 
            
            

            

            end
          
      4.

    app/helpers/application_helper.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            module ApplicationHelper
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
            class AuthorDecorator < Draper::Decorator
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 8cbdfeb (Manifest_cache true)
          
      2. 
        
      
      
        
      
          
    2. 
            1
            

            

<<<<<<< HEAD
              DESCRIPTION_LENGTH = 25
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> aa7b40c (Manifest_cache true)
=======
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
              delegate_all
          
      3. 
        
      
      
        
      
          
    3. 
            
            

            

            
          
      4. 
        
      
      
        
      
          
    4. 
            1
            

            

              def full_name
          
      5. 
        
      
      
        
      
          
    5. 
            3
            

            

                "#{first_name} #{last_name}"
          
      6. 
        
      
      
        
      
          
    6. 
            
            

            

              end
          
      7. 
        
      
      
        
      
          
    7. 
            
            

            

            end
          
      8.

    app/decorators/book_decorator.rb

    100.0% lines covered

    10 relevant lines. 10 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            class BookDecorator < Draper::Decorator
          
      2. 
        
      
      
        
      
          
    2. 
            1
            

            

              decorates_association :authors
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 8cbdfeb (Manifest_cache true)
          
      3. 
        
      
      
        
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9e081dc (Fix)
          
    3. 
            1
            

            

                user = context.current_user
          
      4. 
        
      
      
        
      
          
    4. 
            
            

            

            
          
      5. 
        
      
      
        
      
          
    5. 
            1
            

            

                return if params[:shipping].nil?
          
      6. 
        
      
      
        
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
>>>>>>> 5b7749a (Fix)
=======
>>>>>>> 6da9530 (Featire specs)
=======
          
    6. 
            
=======
          
    7. 
            30
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
=======
          
    8. 
            31
>>>>>>> 06e5e41 (Add login registration pages)
            

            

                PaginatingDecorator
          
      9. 
        
      
      
        
      
          
    9. 
            
            

            

              end
          
      10. 
        
      
      
        
      
          
    10. 
            
            

            

            
          
      11. 
        
      
      
        
      
          
    11. 
            1
            

            

              delegate_all
          
      12. 
        
      
      
        
      
          
    12. 
            
            

            

            
          
      13. 
        
      
      
        
      
          
    13. 
            1
            

            

              def authors_names
          
      14. 
        
      
      
        
      
          
    14. 
            90
            

            

                authors.map(&:full_name).join(', ')
          
      15. 
        
      
      
        
      
          
    15. 
            
            

            

              end
          
      16. 
        
      
      
        
      
          
    16. 
            
            

            

            
          
      17. 
        
      
      
        
      
          
    17. 
            1
            

            

              def categories_names
          
      18. 
        
      
      
        
      
          
    18. 
            1
            

            

                categories.map(&:name).join(', ')
          
      19. 
        
      
      
        
      
          
    19. 
            
            

            

              end
          
      20. 
        
      
      
        
      
          
    20. 
            
            

            

            end
          
      21.

    app/decorators/category_decorator.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            class CategoryDecorator < Draper::Decorator
          
      2. 
        
      
      
        
      
          
    2. 
            1
            

            

              delegate_all
          
      3. 
        
      
      
        
      
          
    3. 
            
            

            

            end
          
      4.

    app/decorators/paginating_decorator.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            class PaginatingDecorator < Draper::CollectionDecorator
          
      2. 
        
      
      
        
      
          
    2. 
            1
            

            

              delegate :current_page, :per_page, :offset, :total_entries, :total_pages
          
      3. 
        
      
      
        
      
          
    3. 
            
            

            

            end
          
      4.

    app/helpers/application_helper.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            module ApplicationHelper
=======
            class AuthorDecorator < Draper::Decorator
>>>>>>> fd6db03 (Manifest_cache true)
          
      2. 
        
      
      
        
      
          
    2. 
            1
            

            

<<<<<<< HEAD
              DESCRIPTION_LENGTH = 25
>>>>>>> 183b6c5 (Manifest_cache true)
=======
              delegate_all
          
      3. 
        
      
      
        
      
          
    3. 
            
            

            

            
          
      4. 
        
      
      
        
      
          
    4. 
            1
            

            

              def full_name
          
      5. 
        
      
      
        
      
          
    5. 
            3
            

            

                "#{first_name} #{last_name}"
          
      6. 
        
      
      
        
      
          
    6. 
            
            

            

              end
          
      7. 
        
      
      
        
      
          
    7. 
            
            

            

            end
          
      8.

    app/decorators/book_decorator.rb

    100.0% lines covered

    10 relevant lines. 10 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            class BookDecorator < Draper::Decorator
          
      2. 
        
      
      
        
      
          
    2. 
            1
            

            

              decorates_association :authors
>>>>>>> fd6db03 (Manifest_cache true)
          
      3. 
        
      
      
        
      
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 42e9c2e (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> c0159bf (Manifest_cache true)
=======
>>>>>>> 9e081dc (Fix)
          
    3. 
            
            

            

            
          
      4. 
        
      
      
        
      
          
    4. 
            1
            

            

                return if user.shipping.update(params[:shipping])
          
      5. 
        
      
      
        
      
          
    5. 
            
            

            

            
          
      6. 
        
      
      
        
      
          
    6. 
            
            

            

                context.fail!
          
      7. 
        
      
      
        
      
          
    7. 
            
            

            

              end
          
      8. 
        
      
      
        
      
          
    8. 
            
            

            

            end
          
      9.

    app/interactors/user_update.rb

    100.0% lines covered

    13 relevant lines. 13 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            class UserUpdate
          
      2. 
        
      
      
        
      
          
    2. 
            1
            

            

              include Interactor
          
      3. 
        
      
      
        
      
          
    3. 
            
            

            

            
          
      4. 
        
      
      
        
      
          
    4. 
            1
            

            

              def call
          
      5. 
        
      
      
        
      
          
    5. 
            5
            

            

                params = context.permitted_params
          
      6. 
        
      
      
        
      
          
    6. 
            5
            

            

                user = context.current_user
          
      7. 
        
      
      
        
      
          
    7. 
            
            

            

            
          
      8. 
        
      
      
        
      
          
    8. 
            5
            

            

                billing_and_shipping_update(params, user)
          
      9. 
        
      
      
        
      
          
    9. 
            
            

            

            
          
      10. 
        
      
      
        
      
          
    10. 
            5
            

            

                return if params[:user].nil?
          
      11. 
        
      
      
        
      
          
    11. 
            
            

            

            
          
      12. 
        
      
      
        
      
          
    12. 
            3
            

            

                return if !params[:user][:email].nil? && user.update(email: params[:user][:email])
          
      13. 
        
      
      
        
      
          
    13. 
            
            

            

            
          
      14. 
        
      
      
        
      
          
    14. 
            2
            

            

                return if !params[:user][:password].nil? &&
          
      15. 
        
      
      
        
      
          
    15. 
            
            

            

                          user.reset_password(params[:user][:password], params[:user][:password_confirmation])
          
      16. 
        
      
      
        
      
          
    16. 
            
            

            

            
          
      17. 
        
      
      
        
      
          
    17. 
            1
            

            

                context.fail!
          
      18. 
        
      
      
        
      
          
    18. 
            
            

            

              end
          
      19. 
        
      
      
        
      
          
    19. 
            
            

            

            
          
      20. 
        
      
      
        
      
          
    20. 
            1
            

            

              def billing_and_shipping_update(params, user)
          
      21. 
        
      
      
        
      
          
    21. 
            5
            

            

                return if !params[:billing].nil? && BillingUpdate.call(permitted_params: params, current_user: user)
          
      22. 
        
      
      
        
      
          
    22. 
            
            

            

            
          
      23. 
        
      
      
        
      
          
    23. 
            4
            

            

                !params[:shipping].nil? && ShippingUpdate.call(permitted_params: params, current_user: user)
          
      24. 
        
      
      
        
      
          
    24. 
            
            

            

              end
          
      25. 
        
      
      
        
      
          
    25. 
            
            

            

            end
          
      26.
    <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9e081dc (Fix)

    app/jobs/application_job.rb

    100.0% lines covered

    1 relevant lines. 1 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            class ApplicationJob < ActiveJob::Base
          
      2. 
        
      
      
        
      
          
    2. 
            
            

            

              # Automatically retry jobs that encountered a deadlock
          
      3. 
        
      
      
        
      
          
    3. 
            
            

            

              # retry_on ActiveRecord::Deadlocked
          
      4. 
        
      
      
        
      
          
    4. 
            
            

            

            
          
      5. 
        
      
      
        
      
          
    5. 
            
            

            

              # Most jobs are safe to ignore if the underlying records are no longer available
          
      6. 
        
      
      
        
      
          
    6. 
            
            

            

              # discard_on ActiveJob::DeserializationError
          
      7. 
        
      
      
        
      
          
    7. 
            
            

            

            end
          
      8.

    app/jobs/cart_cleaner.rb

    60.0% lines covered

    5 relevant lines. 3 lines covered and 2 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            class CartCleaner < ApplicationJob
          
      2. 
        
      
      
        
      
          
    2. 
            
            

            

              # include Sidekiq::Job
          
      3. 
        
      
      
        
      
          
    3. 
            1
            

            

              queue_as :default
          
      4. 
        
      
      
        
      
          
    4. 
            1
            

            

              def perform(order_id)
          
      5. 
        
      
      
        
      
          
    5. 
            
            

            

                order = Order.find(order_id)
          
      6. 
        
      
      
        
      
          
    6. 
            
            

            

                order.destroy if order.status.eql?('initialized')
          
      7. 
        
      
      
        
      
          
    7. 
            
            

            

              end
          
      8. 
        
      
      
        
      
          
    8. 
            
            

            

            end
          
      9.
    <<<<<<< HEAD ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 9e081dc (Fix)

    app/models/address.rb

    100.0% lines covered

    7 relevant lines. 7 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            class Address < ApplicationRecord
          
      2. 
        
      
      
        
      
          
    2. 
            1
            

            

              belongs_to :user
          
      3. 
        
      
      
        
      
          
    3. 
            
            

            

            
          
      4. 
        
      
      
        
      
          
    4. 
            1
            

            

              validates :first_name, :last_name,
          
      5. 
        
      
      
        
      
          
    5. 
            
            

            

                        length: { maximum: Constants::VALIDATES_NAME_LENGTH_MAX },
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
=======
            
          
      6.

    app/helpers/application_helper.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            module ApplicationHelper
=======
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> c59d1a99 (Manifest_cache true)
          
      2. 
        
      
      
        
      
<<<<<<< HEAD
          
    2. 
=======
          
    3. 
            1
            

            

<<<<<<< HEAD
>>>>>>> bd8bda4 (Manifest_cache true)
=======
              delegate_all
          
      4. 
        
      
      
        
      
          
    4. 
            
            

            

            
          
      5. 
        
      
      
        
      
          
    5. 
            1
            

            

              def full_name
          
      6. 
        
      
      
        
      
          
    6. 
            2
=======
          
    7. 
            3
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
            

            

                "#{first_name} #{last_name}"
=======
>>>>>>> 31d15e66 (Fix)
=======
=======
              DESCRIPTION_LENGTH = 25
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 8887ba5b (Fix)
=======
>>>>>>> aa4361fd (Featire specs)
=======
<<<<<<< HEAD
=======
=======
            
          
      8.

    app/helpers/application_helper.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            module ApplicationHelper
=======
>>>>>>> aa7b40c (Manifest_cache true)
          
      2. 
        
      
      
        
      
          
    2. 
            1
            

            

<<<<<<< HEAD
>>>>>>> bd8bda4 (Manifest_cache true)
=======
              delegate_all
          
      3. 
        
      
      
        
      
          
    3. 
            
            

            

            
          
      4. 
        
      
      
        
      
          
    4. 
            1
            

            

              def full_name
          
      5. 
        
      
      
        
      
          
    5. 
            2
            

            

                "#{first_name} #{last_name}"
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
=======
=======
              DESCRIPTION_LENGTH = 25
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
=======
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> 0c57e4e (Fix)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
<<<<<<< HEAD
=======
=======
            
          
      6.

    app/helpers/application_helper.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            module ApplicationHelper
=======
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
          
      2. 
        
      
      
        
      
          
    2. 
            1
            

            

<<<<<<< HEAD
>>>>>>> bd8bda4 (Manifest_cache true)
=======
              delegate_all
          
      3. 
        
      
      
        
      
          
    3. 
            
            

            

            
          
      4. 
        
      
      
        
      
          
    4. 
            1
            

            

              def full_name
          
      5. 
        
      
      
        
      
          
    5. 
            2
            

            

                "#{first_name} #{last_name}"
=======
>>>>>>> 872e675 (Fix)
=======
=======
              DESCRIPTION_LENGTH = 25
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
          
      6. 
        
      
      
        
      
          
    6. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              end
          
      7. 
        
      
      
        
      
          
    7. 
            
            

            

            end
          
      8.

    app/decorators/book_decorator.rb

    90.0% lines covered

    10 relevant lines. 9 lines covered and 1 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            class BookDecorator < Draper::Decorator
          
      2. 
        
      
      
        
      
          
    2. 
            1
            

            

              decorates_association :authors
          
      3. 
        
      
      
        
      
          
    3. 
            1
            

            

              decorates_association :categories
          
      4. 
        
      
      
        
      
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> 7a02bbe (Featire specs)
          
    4. 
            
            

            

            
          
      5. 
        
      
      
        
      
          
    5. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> 5506bd0 (Featire specs)
<<<<<<< HEAD
              def self.collection_decorator_class
=======
>>>>>>> e5752db (Featire specs)
              def self.collection_decorator_class
<<<<<<< HEAD
=======
=======
              def self.collection_decorator_class
          
      6. 
        
      
      
        
      
          
    6. 
            31
            

            

                PaginatingDecorator
          
      7. 
        
      
      
        
      
          
    7. 
            
            

            

              end
          
      8. 
        
      
      
        
      
          
    8. 
            
            

            

            
          
      9. 
        
      
      
        
      
          
    9. 
            1
            

            

              delegate_all
          
      10. 
        
      
      
        
      
          
    10. 
            
            

            

            
          
      11. 
        
      
      
        
      
          
    11. 
            1
            

            

              def authors_names
          
      12. 
        
      
      
        
      
          
    12. 
            90
            

            

                authors.map(&:full_name).join(', ')
          
      13. 
        
      
      
        
      
          
    13. 
            
            

            

              end
          
      14. 
        
      
      
        
      
          
    14. 
            
            

            

            
          
      15. 
        
      
      
        
      
          
    15. 
            1
            

            

              def categories_names
          
      16. 
        
      
      
        
      
          
    16. 
            1
            

            

                categories.map(&:name).join(', ')
          
      17. 
        
      
      
        
      
          
    17. 
            
            

            

              end
          
      18. 
        
      
      
        
      
          
    18. 
            
            

            

            end
          
      19.

    app/decorators/category_decorator.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            class CategoryDecorator < Draper::Decorator
          
      2. 
        
      
      
        
      
          
    2. 
            1
            

            

              delegate_all
          
      3. 
        
      
      
        
      
          
    3. 
            
            

            

            end
          
      4.

    app/decorators/paginating_decorator.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            class PaginatingDecorator < Draper::CollectionDecorator
          
      2. 
        
      
      
        
      
          
    2. 
            1
            

            

              delegate :current_page, :per_page, :offset, :total_entries, :total_pages
          
      3. 
        
      
      
        
      
          
    3. 
            
            

            

            end
          
      4.

    app/helpers/application_helper.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            module ApplicationHelper
          
      2. 
        
      
      
        
      
          
    2. 
            1
            

            

<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> bd8bda4 (Manifest_cache true)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> aa7b40c (Manifest_cache true)
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
              DESCRIPTION_LENGTH = 25
<<<<<<< HEAD
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 183b6c5 (Manifest_cache true)
=======
              DESCRIPTION_LENGTH = 25
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
          
      3. 
        
      
      
        
      
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
    3. 
            31
            

            

                PaginatingDecorator
          
      4. 
        
      
      
        
      
          
    4. 
            
            

            

              end
          
      5. 
        
      
      
        
      
          
    5. 
            
            

            

            
          
      6. 
        
      
      
        
      
          
    6. 
            1
            

            

              delegate_all
          
      7. 
        
      
      
        
      
          
    7. 
            
            

            

            
          
      8. 
        
      
      
        
      
          
    8. 
            1
            

            

              def authors_names
          
      9. 
        
      
      
        
      
          
    9. 
            90
            

            

                authors.map(&:full_name).join(', ')
          
      10. 
        
      
      
        
      
          
    10. 
            
            

            

              end
          
      11. 
        
      
      
        
      
          
    11. 
            
            

            

            
          
      12. 
        
      
      
        
      
          
    12. 
            1
            

            

              def categories_names
          
      13. 
        
      
      
        
      
          
    13. 
            1
            

            

                categories.map(&:name).join(', ')
          
      14. 
        
      
      
        
      
          
    14. 
            
            

            

              end
          
      15. 
        
      
      
        
      
          
    15. 
            
            

            

            end
          
      16.

    app/decorators/category_decorator.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            class CategoryDecorator < Draper::Decorator
          
      2. 
        
      
      
        
      
          
    2. 
            1
            

            

              delegate_all
          
      3. 
        
      
      
        
      
<<<<<<< HEAD
          
    3. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
    4. 
=======
          
    5. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
    6. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
    7. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
    8. 
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
    9. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
            
            

            

            end
          
      10.

    app/decorators/paginating_decorator.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            class PaginatingDecorator < Draper::CollectionDecorator
          
      2. 
        
      
      
        
      
          
    2. 
            1
            

            

              delegate :current_page, :per_page, :offset, :total_entries, :total_pages
          
      3. 
        
      
      
        
      
          
    3. 
            
            

            

            end
          
      4.

    app/helpers/application_helper.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            module ApplicationHelper
          
      2. 
        
      
      
        
      
          
    2. 
            1
            

            

              DESCRIPTION_LENGTH = 25
>>>>>>> 183b6c5 (Manifest_cache true)
=======
              DESCRIPTION_LENGTH = 25
>>>>>>> 7a02bbe (Featire specs)
          
      3. 
        
      
      
        
      
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
          
    3. 
            
            

            

                PaginatingDecorator
          
      4. 
        
      
      
        
      
          
    4. 
            
            

            

              end
          
      5. 
        
      
      
        
      
          
    5. 
            
            

            

            
          
      6. 
        
      
      
        
      
          
    6. 
            1
            

            

              delegate_all
          
      7. 
        
      
      
        
      
          
    7. 
            
            

            

            
          
      8. 
        
      
      
        
      
          
    8. 
            1
            

            

              def authors_names
          
      9. 
        
      
      
        
      
          
    9. 
            1
            

            

                authors.map(&:full_name).join(', ')
          
      10. 
        
      
      
        
      
          
    10. 
            
            

            

              end
          
      11. 
        
      
      
        
      
          
    11. 
            
            

            

            
          
      12. 
        
      
      
        
      
          
    12. 
            1
            

            

              def categories_names
          
      13. 
        
      
      
        
      
          
    13. 
            1
            

            

                categories.map(&:name).join(', ')
          
      14. 
        
      
      
        
      
          
    14. 
            
            

            

              end
          
      15. 
        
      
      
        
      
          
    15. 
            
            

            

            end
          
      16.

    app/decorators/category_decorator.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            class CategoryDecorator < Draper::Decorator
          
      2. 
        
      
      
        
      
          
    2. 
            1
            

            

              delegate_all
          
      3. 
        
      
      
        
      
          
    3. 
            
            

            

            
          
      4. 
        
      
      
        
      
          
    4. 
            
            

            

            end
          
      5. 
        
      
      
        
      
          
    5. 
            
            

            

            
          
      6.

    app/helpers/application_helper.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            module ApplicationHelper
=======
>>>>>>> 0b43b18 (Manifest_cache true)
          
      2. 
        
      
      
        
      
          
    2. 
            1
            

            

<<<<<<< HEAD
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 86d584a (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> bd8bda4 (Manifest_cache true)
=======
              delegate_all
          
      3. 
        
      
      
        
      
          
    3. 
            
            

            

            
          
      4. 
        
      
      
        
      
          
    4. 
            1
            

            

              def full_name
          
      5. 
        
      
      
        
      
          
    5. 
            2
            

            

                "#{first_name} #{last_name}"
          
      6. 
        
      
      
        
      
          
    6. 
            
            

            

              end
          
      7. 
        
      
      
        
      
          
    7. 
            
            

            

            end
          
      8.

    app/decorators/book_decorator.rb

    90.0% lines covered

    10 relevant lines. 9 lines covered and 1 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            class BookDecorator < Draper::Decorator
          
      2. 
        
      
      
        
      
          
    2. 
            1
            

            

              decorates_association :authors
          
      3. 
        
      
      
        
      
          
    3. 
            1
            

            

              decorates_association :categories
          
      4. 
        
      
      
        
      
=======
>>>>>>> 08edf50 (Featire specs)
          
    4. 
            
            

            

            
          
      5. 
        
      
      
        
      
          
    5. 
            1
            

            

<<<<<<< HEAD
              def self.collection_decorator_class
          
      6. 
        
      
      
        
      
=======
<<<<<<< HEAD
>>>>>>> 5506bd0 (Featire specs)
          
    6. 
            
            

            

                PaginatingDecorator
          
      7. 
        
      
      
        
      
          
    7. 
            
            

            

              end
          
      8. 
        
      
      
        
      
          
    8. 
            
            

            

            
          
      9. 
        
      
      
        
      
          
    9. 
            1
            

            

              delegate_all
          
      10. 
        
      
      
        
      
          
    10. 
            
            

            

            
          
      11. 
        
      
      
        
      
          
    11. 
            1
            

            

              def authors_names
          
      12. 
        
      
      
        
      
          
    12. 
            1
            

            

                authors.map(&:full_name).join(', ')
          
      13. 
        
      
      
        
      
          
    13. 
            
            

            

              end
          
      14. 
        
      
      
        
      
          
    14. 
            
            

            

            
          
      15. 
        
      
      
        
      
          
    15. 
            1
            

            

              def categories_names
          
      16. 
        
      
      
        
      
          
    16. 
            1
            

            

                categories.map(&:name).join(', ')
          
      17. 
        
      
      
        
      
          
    17. 
            
            

            

              end
          
      18. 
        
      
      
        
      
          
    18. 
            
            

            

            end
          
      19.

    app/decorators/category_decorator.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            class CategoryDecorator < Draper::Decorator
          
      2. 
        
      
      
        
      
          
    2. 
            1
            

            

              delegate_all
          
      3. 
        
      
      
        
      
          
    3. 
            
            

            

            
          
      4. 
        
      
      
        
      
          
    4. 
            
            

            

            end
          
      5. 
        
      
      
        
      
          
    5. 
            
            

            

            
          
      6.

    app/helpers/application_helper.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            module ApplicationHelper
          
      2. 
        
      
      
        
      
          
    2. 
            1
            

            

>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 0b43b18 (Manifest_cache true)
              DESCRIPTION_LENGTH = 25
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> e18eb87 (Fix)
=======
=======
=======
              DESCRIPTION_LENGTH = 25
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
          
      3. 
        
      
      
        
      
<<<<<<< HEAD
          
    3. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
    4. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
    5. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
    6. 
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6da9530 (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
          
    7. 
>>>>>>> 86d584a (Manifest_cache true)
>>>>>>> 0e864a5 (Manifest_cache true)
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              end
          
      8. 
        
      
      
        
      
          
    8. 
            
            

            

            end
          
      9.

    app/decorators/book_decorator.rb

    90.0% lines covered

    10 relevant lines. 9 lines covered and 1 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            class BookDecorator < Draper::Decorator
          
      2. 
        
      
      
        
      
          
    2. 
            1
            

            

              decorates_association :authors
          
      3. 
        
      
      
        
      
          
    3. 
            1
            

            

              decorates_association :categories
          
      4. 
        
      
      
        
      
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> 7a02bbe (Featire specs)
          
    4. 
            
            

            

            
          
      5. 
        
      
      
        
      
          
    5. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
              def self.collection_decorator_class
=======
>>>>>>> e5752db (Featire specs)
              def self.collection_decorator_class
<<<<<<< HEAD
=======
=======
              def self.collection_decorator_class
          
      6. 
        
      
      
        
      
          
    6. 
            31
            

            

                PaginatingDecorator
          
      7. 
        
      
      
        
      
          
    7. 
            
            

            

              end
          
      8. 
        
      
      
        
      
          
    8. 
            
            

            

            
          
      9. 
        
      
      
        
      
          
    9. 
            1
            

            

              delegate_all
          
      10. 
        
      
      
        
      
          
    10. 
            
            

            

            
          
      11. 
        
      
      
        
      
          
    11. 
            1
            

            

              def authors_names
          
      12. 
        
      
      
        
      
          
    12. 
            90
            

            

                authors.map(&:full_name).join(', ')
          
      13. 
        
      
      
        
      
          
    13. 
            
            

            

              end
          
      14. 
        
      
      
        
      
          
    14. 
            
            

            

            
          
      15. 
        
      
      
        
      
          
    15. 
            1
            

            

              def categories_names
          
      16. 
        
      
      
        
      
          
    16. 
            1
            

            

                categories.map(&:name).join(', ')
          
      17. 
        
      
      
        
      
          
    17. 
            
            

            

              end
          
      18. 
        
      
      
        
      
          
    18. 
            
            

            

            end
          
      19.

    app/decorators/category_decorator.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            class CategoryDecorator < Draper::Decorator
          
      2. 
        
      
      
        
      
          
    2. 
            1
            

            

              delegate_all
          
      3. 
        
      
      
        
      
          
    3. 
            
            

            

            end
          
      4.

    app/decorators/paginating_decorator.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            class PaginatingDecorator < Draper::CollectionDecorator
          
      2. 
        
      
      
        
      
          
    2. 
            1
            

            

              delegate :current_page, :per_page, :offset, :total_entries, :total_pages
          
      3. 
        
      
      
        
      
          
    3. 
            
            

            

            end
          
      4.

    app/helpers/application_helper.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            module ApplicationHelper
          
      2. 
        
      
      
        
      
          
    2. 
            1
            

            

              DESCRIPTION_LENGTH = 25
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
          
      3. 
        
      
      
        
      
<<<<<<< HEAD
=======
          
    3. 
            31
            

            

                PaginatingDecorator
          
      4. 
        
      
      
        
      
          
    4. 
            
            

            

              end
          
      5. 
        
      
      
        
      
          
    5. 
            
            

            

            
          
      6. 
        
      
      
        
      
          
    6. 
            1
            

            

              delegate_all
          
      7. 
        
      
      
        
      
          
    7. 
            
            

            

            
          
      8. 
        
      
      
        
      
          
    8. 
            1
            

            

              def authors_names
          
      9. 
        
      
      
        
      
          
    9. 
            90
            

            

                authors.map(&:full_name).join(', ')
          
      10. 
        
      
      
        
      
          
    10. 
            
            

            

              end
          
      11. 
        
      
      
        
      
          
    11. 
            
            

            

            
          
      12. 
        
      
      
        
      
          
    12. 
            1
            

            

              def categories_names
          
      13. 
        
      
      
        
      
          
    13. 
            1
            

            

                categories.map(&:name).join(', ')
          
      14. 
        
      
      
        
      
          
    14. 
            
            

            

              end
          
      15. 
        
      
      
        
      
          
    15. 
            
            

            

            end
          
      16.

    app/decorators/category_decorator.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            class CategoryDecorator < Draper::Decorator
          
      2. 
        
      
      
        
      
          
    2. 
            1
            

            

              delegate_all
          
      3. 
        
      
      
        
      
          
    3. 
            
            

            

            end
          
      4.

    app/decorators/paginating_decorator.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            class PaginatingDecorator < Draper::CollectionDecorator
          
      2. 
        
      
      
        
      
          
    2. 
            1
            

            

              delegate :current_page, :per_page, :offset, :total_entries, :total_pages
          
      3. 
        
      
      
        
      
          
    3. 
            
            

            

            end
          
      4.

    app/helpers/application_helper.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            module ApplicationHelper
          
      2. 
        
      
      
        
      
          
    2. 
            1
            

            

              DESCRIPTION_LENGTH = 25
>>>>>>> 183b6c5 (Manifest_cache true)
=======
              DESCRIPTION_LENGTH = 25
>>>>>>> 7a02bbe (Featire specs)
          
      3. 
        
      
      
        
      
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
          
    3. 
            
            

            

                PaginatingDecorator
          
      4. 
        
      
      
        
      
          
    4. 
            
            

            

              end
          
      5. 
        
      
      
        
      
          
    5. 
            
            

            

            
          
      6. 
        
      
      
        
      
          
    6. 
            1
            

            

              delegate_all
          
      7. 
        
      
      
        
      
          
    7. 
            
            

            

            
          
      8. 
        
      
      
        
      
          
    8. 
            1
            

            

              def authors_names
          
      9. 
        
      
      
        
      
          
    9. 
            1
            

            

                authors.map(&:full_name).join(', ')
          
      10. 
        
      
      
        
      
          
    10. 
            
            

            

              end
          
      11. 
        
      
      
        
      
          
    11. 
            
            

            

            
          
      12. 
        
      
      
        
      
          
    12. 
            1
            

            

              def categories_names
          
      13. 
        
      
      
        
      
          
    13. 
            1
            

            

                categories.map(&:name).join(', ')
          
      14. 
        
      
      
        
      
          
    14. 
            
            

            

              end
          
      15. 
        
      
      
        
      
          
    15. 
            
            

            

            end
          
      16.

    app/decorators/category_decorator.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            class CategoryDecorator < Draper::Decorator
          
      2. 
        
      
      
        
      
          
    2. 
            1
            

            

              delegate_all
          
      3. 
        
      
      
        
      
          
    3. 
            
            

            

            
          
      4. 
        
      
      
        
      
          
    4. 
            
            

            

            end
          
      5. 
        
      
      
        
      
          
    5. 
            
            

            

            
          
      6.

    app/helpers/application_helper.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            module ApplicationHelper
          
      2. 
        
      
      
        
      
          
    2. 
            1
            

            

>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 86d584a (Manifest_cache true)
              DESCRIPTION_LENGTH = 25
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> fdab719f (Fix)
=======
=======
=======
              DESCRIPTION_LENGTH = 25
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
              DESCRIPTION_LENGTH = 25
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
>>>>>>> e1ecabbe (Featire specs)
          
      3. 
        
      
      
        
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
    3. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0b43b18 (Manifest_cache true)
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
          
    4. 
>>>>>>> 86d584a (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
    5. 
>>>>>>> 08edf50 (Featire specs)
=======
          
    6. 
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
    7. 
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
=======
          
    8. 
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> 64dceec (Manifest_cache true)
=======
>>>>>>> 5b7749a (Fix)
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              end
          
      9. 
        
      
      
        
      
          
    9. 
            
            

            

            end
          
      10.

    app/decorators/book_decorator.rb

    100.0% lines covered

    10 relevant lines. 10 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            class BookDecorator < Draper::Decorator
          
      2. 
        
      
      
        
      
          
    2. 
            1
            

            

              decorates_association :authors
          
      3. 
        
      
      
        
      
          
    3. 
            1
            

            

              decorates_association :categories
          
      4. 
        
      
      
        
      
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> 7a02bbe (Featire specs)
          
    4. 
            
            

            

            
          
      5. 
        
      
      
        
      
          
    5. 
            1
            

            

<<<<<<< HEAD
              def self.collection_decorator_class
          
      6. 
        
      
      
        
      
          
    6. 
            31
            

            

                PaginatingDecorator
          
      7. 
        
      
      
        
      
          
    7. 
            
            

            

              end
          
      8. 
        
      
      
        
      
          
    8. 
            
            

            

            
          
      9. 
        
      
      
        
      
          
    9. 
            1
            

            

              delegate_all
          
      10. 
        
      
      
        
      
          
    10. 
            
            

            

            
          
      11. 
        
      
      
        
      
          
    11. 
            1
            

            

              def authors_names
          
      12. 
        
      
      
        
      
          
    12. 
            90
            

            

                authors.map(&:full_name).join(', ')
          
      13. 
        
      
      
        
      
          
    13. 
            
            

            

              end
          
      14. 
        
      
      
        
      
          
    14. 
            
            

            

            
          
      15. 
        
      
      
        
      
          
    15. 
            1
            

            

              def categories_names
          
      16. 
        
      
      
        
      
          
    16. 
            1
            

            

                categories.map(&:name).join(', ')
          
      17. 
        
      
      
        
      
          
    17. 
            
            

            

              end
          
      18. 
        
      
      
        
      
          
    18. 
            
            

            

            end
          
      19.

    app/decorators/category_decorator.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            class CategoryDecorator < Draper::Decorator
          
      2. 
        
      
      
        
      
          
    2. 
            1
            

            

              delegate_all
          
      3. 
        
      
      
        
      
          
    3. 
            
            

            

            end
          
      4.

    app/decorators/paginating_decorator.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            class PaginatingDecorator < Draper::CollectionDecorator
          
      2. 
        
      
      
        
      
          
    2. 
            1
            

            

              delegate :current_page, :per_page, :offset, :total_entries, :total_pages
          
      3. 
        
      
      
        
      
          
    3. 
            
            

            

            end
          
      4.

    app/helpers/application_helper.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            module ApplicationHelper
          
      2. 
        
      
      
        
      
          
    2. 
            1
            

            

>>>>>>> aa7b40c (Manifest_cache true)
              DESCRIPTION_LENGTH = 25
>>>>>>> 752f0c0 (Featire specs)
=======
              DESCRIPTION_LENGTH = 25
>>>>>>> 4e81ea2 (Featire specs)
=======
              DESCRIPTION_LENGTH = 25
>>>>>>> 08edf50 (Featire specs)
          
      3. 
        
      
      
        
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
    3. 
>>>>>>> c59d1a99 (Manifest_cache true)
            
            

            

=======
>>>>>>> 31d15e66 (Fix)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> b28889f (Fix)
>>>>>>> fdab719f (Fix)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> ef483b6d (Fix)
=======
>>>>>>> b28889f (Fix)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8288136d (Fix)
=======
=======
>>>>>>> 8887ba5b (Fix)
=======
>>>>>>> 7b22ad7e (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c12b71de (Featire specs)
=======
=======
>>>>>>> b97bb382 (Featire specs)
=======
>>>>>>> 4a2f2ad8 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
>>>>>>> ef483b6d (Fix)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> b28889f (Fix)
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
=======
>>>>>>> b28889f (Fix)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
                        format: { with: Constants::NAME_FORMAT,
          
      4. 
        
      
      
        
      
          
    4. 
            
            

            

                                  message: 'Please enter first or last in correct format' }, allow_blank: true
          
      5. 
        
      
      
        
      
          
    5. 
            1
            

            

              validates :phone,
          
      6. 
        
      
      
        
      
          
    6. 
            
            

            

                        length: { maximum: Constants::VALIDATES_PHONE_LENGTH_MAX },
          
      7. 
        
      
      
        
      
          
    7. 
            
            

            

                        format: { with: Constants::PHONE_FORMAT,
          
      8. 
        
      
      
        
      
          
    8. 
            
            

            

                                  message: 'Please enter phone in correct format' }, allow_blank: true
          
      9. 
        
      
      
        
      
          
    9. 
            1
            

            

              validates :address,
          
      10. 
        
      
      
        
      
          
    10. 
            
            

            

                        length: { maximum: Constants::VALIDATES_TITLE_LENGTH_MAX },
          
      11. 
        
      
      
        
      
          
    11. 
            
            

            

                        format: { with: Constants::TEXT_FORMAT,
          
      12. 
        
      
      
        
      
          
    12. 
            
            

            

                                  message: 'Please enter address in correct format' }, allow_blank: true
          
      13. 
        
      
      
        
      
          
    13. 
            1
            

            

              validates :country, :city,
          
      14. 
        
      
      
        
      
          
    14. 
            
            

            

                        length: { maximum: Constants::VALIDATES_TITLE_LENGTH_MAX },
          
      15. 
        
      
      
        
      
          
    15. 
            
            

            

                        format: { with: Constants::COUNTY_FORMAT,
          
      16. 
        
      
      
        
      
          
    16. 
            
            

            

                                  message: 'Please enter country in correct format' }, allow_blank: true
          
      17. 
        
      
      
        
      
          
    17. 
            1
            

            

              validates :zip,
          
      18. 
        
      
      
        
      
          
    18. 
            
            

            

                        length: { maximum: Constants::VALIDATES_ZIP_LENGTH_MAX },
          
      19. 
        
      
      
        
      
          
    19. 
            
            

            

                        format: { with: Constants::ZIP_FORMAT,
          
      20. 
        
      
      
        
      
          
    20. 
            
            

            

                                  message: 'Please enter zip in correct format' }, allow_blank: true
          
      21. 
        
      
      
        
      
          
    21. 
            
            

            

            end
          
      22.
    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 11792758 (Rebased)

    app/models/admin_user.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            class AdminUser < ApplicationRecord
          
      2. 
        
      
      
        
      
          
    2. 
            
            

            

<<<<<<< HEAD
              # Include default devise modules. Others available are:
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> bd8bda4 (Manifest_cache true)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> aa7b40c (Manifest_cache true)
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
              DESCRIPTION_LENGTH = 25
>>>>>>> 9bfbd88 (Featire specs)
          
      3. 
        
      
      
        
      
<<<<<<< HEAD
          
    3. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
    4. 
=======
          
    5. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
    6. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
    7. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
    8. 
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
    9. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
            
            

            

              # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
          
      10. 
        
      
      
        
      
          
    10. 
            1
            

            

<<<<<<< HEAD
              DESCRIPTION_LENGTH = 25
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
          
      11. 
        
      
      
        
      
<<<<<<< HEAD
=======
          
    11. 
            31
            

            

                PaginatingDecorator
          
      12. 
        
      
      
        
      
          
    12. 
            
            

            

              end
          
      13. 
        
      
      
        
      
          
    13. 
            
            

            

            
          
      14. 
        
      
      
        
      
          
    14. 
            1
            

            

              delegate_all
          
      15. 
        
      
      
        
      
          
    15. 
            
            

            

            
          
      16. 
        
      
      
        
      
          
    16. 
            1
            

            

              def authors_names
          
      17. 
        
      
      
        
      
          
    17. 
            90
            

            

                authors.map(&:full_name).join(', ')
          
      18. 
        
      
      
        
      
          
    18. 
            
            

            

              end
          
      19. 
        
      
      
        
      
          
    19. 
            
            

            

            
          
      20. 
        
      
      
        
      
          
    20. 
            1
            

            

              def categories_names
          
      21. 
        
      
      
        
      
          
    21. 
            1
            

            

                categories.map(&:name).join(', ')
          
      22. 
        
      
      
        
      
          
    22. 
            
            

            

              end
          
      23. 
        
      
      
        
      
          
    23. 
            
            

            

            end
          
      24.

    app/decorators/category_decorator.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            class CategoryDecorator < Draper::Decorator
          
      2. 
        
      
      
        
      
          
    2. 
            1
            

            

              delegate_all
          
      3. 
        
      
      
        
      
          
    3. 
            
            

            

            end
          
      4.

    app/decorators/paginating_decorator.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            class PaginatingDecorator < Draper::CollectionDecorator
          
      2. 
        
      
      
        
      
          
    2. 
            1
            

            

              delegate :current_page, :per_page, :offset, :total_entries, :total_pages
          
      3. 
        
      
      
        
      
          
    3. 
            
            

            

            end
          
      4.

    app/helpers/application_helper.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            module ApplicationHelper
          
      2. 
        
      
      
        
      
          
    2. 
            1
            

            

              DESCRIPTION_LENGTH = 25
>>>>>>> 183b6c5 (Manifest_cache true)
=======
              DESCRIPTION_LENGTH = 25
>>>>>>> 7a02bbe (Featire specs)
          
      3. 
        
      
      
        
      
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
          
    3. 
            
            

            

                PaginatingDecorator
          
      4. 
        
      
      
        
      
          
    4. 
            
            

            

              end
          
      5. 
        
      
      
        
      
          
    5. 
            
            

            

            
          
      6. 
        
      
      
        
      
          
    6. 
            1
            

            

              delegate_all
          
      7. 
        
      
      
        
      
          
    7. 
            
            

            

            
          
      8. 
        
      
      
        
      
          
    8. 
            1
            

            

              def authors_names
          
      9. 
        
      
      
        
      
          
    9. 
            1
            

            

                authors.map(&:full_name).join(', ')
          
      10. 
        
      
      
        
      
          
    10. 
            
            

            

              end
          
      11. 
        
      
      
        
      
          
    11. 
            
            

            

            
          
      12. 
        
      
      
        
      
          
    12. 
            1
            

            

              def categories_names
          
      13. 
        
      
      
        
      
          
    13. 
            1
            

            

                categories.map(&:name).join(', ')
          
      14. 
        
      
      
        
      
          
    14. 
            
            

            

              end
          
      15. 
        
      
      
        
      
          
    15. 
            
            

            

            end
          
      16.

    app/decorators/category_decorator.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            class CategoryDecorator < Draper::Decorator
          
      2. 
        
      
      
        
      
          
    2. 
            1
            

            

              delegate_all
          
      3. 
        
      
      
        
      
          
    3. 
            
            

            

            
          
      4. 
        
      
      
        
      
          
    4. 
            
            

            

            end
=======
              devise :database_authenticatable,
>>>>>>> c7a726c5 (Rebased)
          
      5. 
        
      
      
        
      
          
    5. 
            
            

            

<<<<<<< HEAD
            
          
      6.

    app/helpers/application_helper.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            module ApplicationHelper
          
      2. 
        
      
      
        
      
          
    2. 
            1
            

            

>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 86d584a (Manifest_cache true)
              DESCRIPTION_LENGTH = 25
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
=======
=======
=======
              DESCRIPTION_LENGTH = 25
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
              DESCRIPTION_LENGTH = 25
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> fc3774fd (Featire specs)
          
      3. 
        
      
      
        
      
<<<<<<< HEAD
          
    3. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
    4. 
>>>>>>> 86d584a (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
    5. 
>>>>>>> 08edf50 (Featire specs)
=======
          
    6. 
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
    7. 
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
=======
          
    8. 
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> 64dceec (Manifest_cache true)
=======
>>>>>>> 5b7749a (Fix)
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              end
          
      9. 
        
      
      
        
      
          
    9. 
            
            

            

            end
          
      10.

    app/decorators/book_decorator.rb

    90.0% lines covered

    10 relevant lines. 9 lines covered and 1 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            class BookDecorator < Draper::Decorator
          
      2. 
        
      
      
        
      
          
    2. 
            1
            

            

              decorates_association :authors
          
      3. 
        
      
      
        
      
          
    3. 
            1
            

            

              decorates_association :categories
          
      4. 
        
      
      
        
      
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> 7a02bbe (Featire specs)
          
    4. 
            
            

            

            
          
      5. 
        
      
      
        
      
          
    5. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              def self.collection_decorator_class
=======
>>>>>>> 34509eee (Featire specs)
              def self.collection_decorator_class
<<<<<<< HEAD
=======
=======
              def self.collection_decorator_class
          
      6. 
        
      
      
        
      
          
    6. 
            31
            

            

                PaginatingDecorator
          
      7. 
        
      
      
        
      
          
    7. 
            
            

            

              end
          
      8. 
        
      
      
        
      
          
    8. 
            
            

            

            
          
      9. 
        
      
      
        
      
          
    9. 
            1
            

            

              delegate_all
          
      10. 
        
      
      
        
      
          
    10. 
            
            

            

            
          
      11. 
        
      
      
        
      
          
    11. 
            1
            

            

              def authors_names
          
      12. 
        
      
      
        
      
          
    12. 
            90
            

            

                authors.map(&:full_name).join(', ')
          
      13. 
        
      
      
        
      
          
    13. 
            
            

            

              end
          
      14. 
        
      
      
        
      
          
    14. 
            
            

            

            
          
      15. 
        
      
      
        
      
          
    15. 
            1
            

            

              def categories_names
          
      16. 
        
      
      
        
      
          
    16. 
            1
            

            

                categories.map(&:name).join(', ')
          
      17. 
        
      
      
        
      
          
    17. 
            
            

            

              end
          
      18. 
        
      
      
        
      
          
    18. 
            
            

            

            end
          
      19.

    app/decorators/category_decorator.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            class CategoryDecorator < Draper::Decorator
          
      2. 
        
      
      
        
      
          
    2. 
            1
            

            

              delegate_all
          
      3. 
        
      
      
        
      
          
    3. 
            
            

            

            end
          
      4.

    app/decorators/paginating_decorator.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            class PaginatingDecorator < Draper::CollectionDecorator
          
      2. 
        
      
      
        
      
          
    2. 
            1
            

            

              delegate :current_page, :per_page, :offset, :total_entries, :total_pages
          
      3. 
        
      
      
        
      
          
    3. 
            
            

            

            end
          
      4.

    app/helpers/application_helper.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            module ApplicationHelper
          
      2. 
        
      
      
        
      
          
    2. 
            1
            

            

              DESCRIPTION_LENGTH = 25
<<<<<<< HEAD
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 183b6c5 (Manifest_cache true)
=======
              DESCRIPTION_LENGTH = 25
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 37e48018 (Featire specs)
          
      3. 
        
      
      
        
      
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
    3. 
            31
            

            

                PaginatingDecorator
          
      4. 
        
      
      
        
      
          
    4. 
            
            

            

              end
          
      5. 
        
      
      
        
      
          
    5. 
            
            

            

            
          
      6. 
        
      
      
        
      
          
    6. 
            1
            

            

              delegate_all
          
      7. 
        
      
      
        
      
          
    7. 
            
            

            

            
          
      8. 
        
      
      
        
      
          
    8. 
            1
            

            

              def authors_names
          
      9. 
        
      
      
        
      
          
    9. 
            90
            

            

                authors.map(&:full_name).join(', ')
          
      10. 
        
      
      
        
      
          
    10. 
            
            

            

              end
          
      11. 
        
      
      
        
      
          
    11. 
            
            

            

            
          
      12. 
        
      
      
        
      
          
    12. 
            1
            

            

              def categories_names
          
      13. 
        
      
      
        
      
          
    13. 
            1
            

            

                categories.map(&:name).join(', ')
          
      14. 
        
      
      
        
      
          
    14. 
            
            

            

              end
          
      15. 
        
      
      
        
      
          
    15. 
            
            

            

            end
          
      16.

    app/decorators/category_decorator.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            class CategoryDecorator < Draper::Decorator
          
      2. 
        
      
      
        
      
          
    2. 
            1
            

            

              delegate_all
          
      3. 
        
      
      
        
      
          
    3. 
            
            

            

            end
          
      4.

    app/decorators/paginating_decorator.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            class PaginatingDecorator < Draper::CollectionDecorator
          
      2. 
        
      
      
        
      
          
    2. 
            1
            

            

              delegate :current_page, :per_page, :offset, :total_entries, :total_pages
          
      3. 
        
      
      
        
      
          
    3. 
            
            

            

            end
          
      4.

    app/helpers/application_helper.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            module ApplicationHelper
          
      2. 
        
      
      
        
      
          
    2. 
            1
            

            

              DESCRIPTION_LENGTH = 25
>>>>>>> 183b6c5 (Manifest_cache true)
=======
              DESCRIPTION_LENGTH = 25
>>>>>>> 7a02bbe (Featire specs)
          
      3. 
        
      
      
        
      
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8249ff3c (Add login registration pages)
=======
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 37e48018 (Featire specs)
          
    3. 
            
            

            

                PaginatingDecorator
          
      4. 
        
      
      
        
      
          
    4. 
            
            

            

              end
          
      5. 
        
      
      
        
      
          
    5. 
            
            

            

            
          
      6. 
        
      
      
        
      
          
    6. 
            1
            

            

              delegate_all
          
      7. 
        
      
      
        
      
          
    7. 
            
            

            

            
          
      8. 
        
      
      
        
      
          
    8. 
            1
            

            

              def authors_names
          
      9. 
        
      
      
        
      
          
    9. 
            1
            

            

                authors.map(&:full_name).join(', ')
          
      10. 
        
      
      
        
      
          
    10. 
            
            

            

              end
          
      11. 
        
      
      
        
      
          
    11. 
            
            

            

            
          
      12. 
        
      
      
        
      
          
    12. 
            1
            

            

              def categories_names
          
      13. 
        
      
      
        
      
          
    13. 
            1
            

            

                categories.map(&:name).join(', ')
          
      14. 
        
      
      
        
      
          
    14. 
            
            

            

              end
          
      15. 
        
      
      
        
      
          
    15. 
            
            

            

            end
          
      16.

    app/decorators/category_decorator.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            class CategoryDecorator < Draper::Decorator
          
      2. 
        
      
      
        
      
          
    2. 
            1
            

            

              delegate_all
          
      3. 
        
      
      
        
      
          
    3. 
            
            

            

            
          
      4. 
        
      
      
        
      
          
    4. 
            
            

            

            end
          
      5. 
        
      
      
        
      
          
    5. 
            
            

            

            
          
      6.

    app/helpers/application_helper.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            module ApplicationHelper
          
      2. 
        
      
      
        
      
          
    2. 
            1
            

            

>>>>>>> aa7b40c (Manifest_cache true)
              DESCRIPTION_LENGTH = 25
>>>>>>> 752f0c0 (Featire specs)
=======
              DESCRIPTION_LENGTH = 25
>>>>>>> 4e81ea2 (Featire specs)
=======
              DESCRIPTION_LENGTH = 25
>>>>>>> 08edf50 (Featire specs)
          
      3. 
        
      
      
        
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
    3. 
>>>>>>> 490b01d6 (Manifest_cache true)
            
            

            

=======
>>>>>>> 67ab5299 (Fix)
=======
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> b28889f (Fix)
>>>>>>> 5a2009f1 (Fix)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> d9d85ca6 (Fix)
=======
>>>>>>> b28889f (Fix)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> ae884b47 (Fix)
=======
=======
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0ea (Featire specs)
=======
=======
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888bf (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
>>>>>>> 5b7749a (Fix)
>>>>>>> d9d85ca6 (Fix)
=======
=======
>>>>>>> 0c57e4e (Fix)
<<<<<<< HEAD
>>>>>>> 8887ba5b (Fix)
=======
=======
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
=======
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
=======
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
>>>>>>> 3cf8dd4 (Featire specs)
>>>>>>> aa4361fd (Featire specs)
                        format: { with: Constants::NAME_FORMAT,
          
      4. 
        
      
      
        
      
          
    4. 
            
            

            

                                  message: 'Please enter first or last in correct format' }, allow_blank: true
          
      5. 
        
      
      
        
      
          
    5. 
            1
            

            

              validates :phone,
          
      6. 
        
      
      
        
      
          
    6. 
            
            

            

                        length: { maximum: Constants::VALIDATES_PHONE_LENGTH_MAX },
          
      7. 
        
      
      
        
      
          
    7. 
            
            

            

                        format: { with: Constants::PHONE_FORMAT,
          
      8. 
        
      
      
        
      
          
    8. 
            
            

            

                                  message: 'Please enter phone in correct format' }, allow_blank: true
          
      9. 
        
      
      
        
      
          
    9. 
            1
            

            

              validates :address,
          
      10. 
        
      
      
        
      
          
    10. 
            
            

            

                        length: { maximum: Constants::VALIDATES_TITLE_LENGTH_MAX },
          
      11. 
        
      
      
        
      
          
    11. 
            
            

            

                        format: { with: Constants::TEXT_FORMAT,
          
      12. 
        
      
      
        
      
          
    12. 
            
            

            

                                  message: 'Please enter address in correct format' }, allow_blank: true
          
      13. 
        
      
      
        
      
          
    13. 
            1
            

            

              validates :country, :city,
          
      14. 
        
      
      
        
      
          
    14. 
            
            

            

                        length: { maximum: Constants::VALIDATES_TITLE_LENGTH_MAX },
          
      15. 
        
      
      
        
      
          
    15. 
            
            

            

                        format: { with: Constants::COUNTY_FORMAT,
          
      16. 
        
      
      
        
      
          
    16. 
            
            

            

                                  message: 'Please enter country in correct format' }, allow_blank: true
          
      17. 
        
      
      
        
      
          
    17. 
            1
            

            

              validates :zip,
          
      18. 
        
      
      
        
      
          
    18. 
            
            

            

                        length: { maximum: Constants::VALIDATES_ZIP_LENGTH_MAX },
          
      19. 
        
      
      
        
      
          
    19. 
            
            

            

                        format: { with: Constants::ZIP_FORMAT,
          
      20. 
        
      
      
        
      
          
    20. 
            
            

            

                                  message: 'Please enter zip in correct format' }, allow_blank: true
          
      21. 
        
      
      
        
      
          
    21. 
            
            

            

            end
          
      22.
    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> 13fca83d (Rebased) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= >>>>>>> 8887ba5b (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> bc6bc8d2 (Rebased) ======= ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix)

    app/models/admin_user.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            class AdminUser < ApplicationRecord
          
      2. 
        
      
      
        
      
          
    2. 
            
<<<<<<< HEAD
=======
            

            

<<<<<<< HEAD
              # Include default devise modules. Others available are:
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> bd8bda4 (Manifest_cache true)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> aa7b40c (Manifest_cache true)
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
              DESCRIPTION_LENGTH = 25
>>>>>>> df37394 (Featire specs)
          
      3. 
        
      
      
        
      
<<<<<<< HEAD
          
    3. 
=======
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
          
    4. 
=======
          
    5. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
    6. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
    7. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
    8. 
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
    9. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
            
            

            

              # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
          
      10. 
        
      
      
        
      
          
    10. 
            1
>>>>>>> f92a45b (Featire specs)
>>>>>>> e6fc67c7 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 4f4ea3f9 (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 7a08014b (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
              # Include default devise modules. Others available are:
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> bd8bda4 (Manifest_cache true)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> aa7b40c (Manifest_cache true)
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
              DESCRIPTION_LENGTH = 25
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
              # Include default devise modules. Others available are:
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
              # Include default devise modules. Others available are:
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 7a08014b (Featire specs)
=======
=======
              # Include default devise modules. Others available are:
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
              # Include default devise modules. Others available are:
>>>>>>> 6da9530 (Featire specs)
>>>>>>> 0f8241bb (Featire specs)
          
      11. 
        
      
      
        
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 7a08014b (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
          
    11. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
    12. 
=======
          
    13. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
    14. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
    15. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
    16. 
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
    17. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
    18. 
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
          
    19. 
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 7a08014b (Featire specs)
=======
=======
          
    20. 
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
          
    21. 
>>>>>>> 6da9530 (Featire specs)
>>>>>>> 0f8241bb (Featire specs)
            
            

            

              # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
          
      22. 
        
      
      
        
      
          
    22. 
            1
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
>>>>>>> 9a49b7b (Rebased)
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 9a49b7b (Rebased)
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
>>>>>>> 0f8241bb (Featire specs)
            

            

<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              # Include default devise modules. Others available are:
=======
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 84003439 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> bd8bda4 (Manifest_cache true)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> aa7b40c (Manifest_cache true)
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
              DESCRIPTION_LENGTH = 25
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9bfbd88 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9bfbd88 (Featire specs)
=======
=======
              devise :database_authenticatable,
>>>>>>> 9a49b7b (Rebased)
=======
=======
              devise :database_authenticatable,
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
              devise :database_authenticatable,
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
              devise :database_authenticatable,
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
              devise :database_authenticatable,
>>>>>>> 6da9530 (Featire specs)
>>>>>>> 0f8241bb (Featire specs)
          
      23. 
        
      
      
        
      
          
    23. 
            
            

            

>>>>>>> 84003439 (Featire specs)
                     :recoverable, :rememberable, :validatable
>>>>>>> c7a726c5 (Rebased)
          
      24. 
        
      
      
        
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> ef483b6d (Fix)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> bdc24a1a (Rebased)
=======
>>>>>>> 53db2224 (Featire specs)
=======
>>>>>>> 1049b80c (Fix)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 11792758 (Rebased)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
=======
>>>>>>> 932dbec (Featire specs)
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> ef483b6d (Fix)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
>>>>>>> 5e31aeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 53db2224 (Featire specs)
=======
=======
>>>>>>> 9e081dc (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
>>>>>>> 216fe41 (Featire specs)
>>>>>>> f3d746cb (Featire specs)
          
    24. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
    25. 
=======
<<<<<<< HEAD
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f136376a (Featire specs)
=======
>>>>>>> d52f9efe (Featire specs)
=======
=======
>>>>>>> 2a25e4c (Featire specs)
>>>>>>> f3d746cb (Featire specs)
          
    26. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> d34a0770 (Manifest_cache true)
=======
=======
>>>>>>> 3be4d14 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b719333 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0341d6de (Manifest_cache true)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> d34a0770 (Manifest_cache true)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
          
    27. 
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 3be4d14 (Manifest_cache true)
>>>>>>> 1b8f36d8 (Manifest_cache true)
>>>>>>> 752f0c0 (Featire specs)
=======
          
    28. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
    29. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
    30. 
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> cc390719 (Manifest_cache true)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> d365be68 (Manifest_cache true)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> e5890c2 (Manifest_cache true)
=======
>>>>>>> 9440753 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c59d1a99 (Manifest_cache true)
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> e5890c2 (Manifest_cache true)
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0e864a5 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> cc390719 (Manifest_cache true)
=======
>>>>>>> 416166f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 0b43b18 (Manifest_cache true)
>>>>>>> 1cce66c (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> d365be68 (Manifest_cache true)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
          
    31. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
          
    32. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
          
    33. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 6da9530 (Featire specs)
>>>>>>> 0f8241bb (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
=======
=======
          
    34. 
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> cc390719 (Manifest_cache true)
=======
=======
<<<<<<< HEAD
=======
=======
>>>>>>> e5890c2 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
=======
=======
>>>>>>> 0e864a5 (Manifest_cache true)
>>>>>>> cc390719 (Manifest_cache true)
          
    35. 
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
=======
          
    36. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 490b01d6 (Manifest_cache true)
=======
=======
>>>>>>> 251144b4 (Manifest_cache true)
=======
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> cc390719 (Manifest_cache true)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> d365be68 (Manifest_cache true)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
    37. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
=======
          
    38. 
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 24b58e6 (Manifest_cache true)
=======
=======
          
    39. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
=======
          
    40. 
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 00f8b58 (Manifest_cache true)
=======
          
    41. 
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 75fa7e1b (Rebased)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
          
    42. 
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> c59d1a99 (Manifest_cache true)
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 11792758 (Rebased)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
>>>>>>> 0e864a5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> cc390719 (Manifest_cache true)
=======
=======
=======
>>>>>>> 1cce66c (Manifest_cache true)
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 86d584a (Manifest_cache true)
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
=======
          
    43. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
=======
=======
          
    44. 
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 24b58e6 (Manifest_cache true)
=======
=======
          
    45. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
=======
=======
          
    46. 
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 00f8b58 (Manifest_cache true)
=======
          
    47. 
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
=======
=======
=======
          
    48. 
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 3be4d14 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1b8f36d8 (Manifest_cache true)
=======
=======
=======
=======
          
    49. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
=======
>>>>>>> 0b43b18 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1cce66c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d365be68 (Manifest_cache true)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            
            

            

<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
>>>>>>> 34509eee (Featire specs)
=======
>>>>>>> 75fa7e1b (Rebased)
=======
>>>>>>> 84809242 (Featire specs)
=======
>>>>>>> d8dd3b4a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 11792758 (Rebased)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> bdc24a1a (Rebased)
=======
>>>>>>> 7b22ad7e (Featire specs)
=======
>>>>>>> 1049b80c (Fix)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
              # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
          
      50. 
        
      
      
        
      
          
    50. 
            1
            

            

              devise :database_authenticatable,
          
      51. 
        
      
      
        
      
          
    51. 
            
            

            

                     :recoverable, :rememberable, :validatable
          
      52. 
        
      
      
        
      
          
    52. 
=======
>>>>>>> 86d584a (Manifest_cache true)
>>>>>>> e5890c2 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
=======
=======
          
    53. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
=======
=======
          
    54. 
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 24b58e6 (Manifest_cache true)
=======
=======
          
    55. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
=======
=======
=======
=======
          
    56. 
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 00f8b58 (Manifest_cache true)
=======
          
    57. 
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
          
    58. 
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
>>>>>>> b719333 (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
    59. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
=======
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
=======
>>>>>>> 4d4cf6b4 (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
=======
          
    60. 
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 24b58e6 (Manifest_cache true)
=======
=======
          
    61. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> bc6bc8d2 (Rebased)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
=======
          
    62. 
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 00f8b58 (Manifest_cache true)
=======
          
    63. 
>>>>>>> bf554f4 (Rebased)
=======
>>>>>>> d34a0770 (Manifest_cache true)
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> bc6bc8d2 (Rebased)
=======
=======
=======
=======
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
          
    64. 
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
>>>>>>> b719333 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d34a0770 (Manifest_cache true)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> ef483b6d (Fix)
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> 13fca83d (Rebased)
=======
>>>>>>> 1ca9c0ea (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> d9d85ca6 (Fix)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> ef483b6d (Fix)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> ae409ca (Featire specs)
=======
=======
>>>>>>> adc21e0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4d90e3d (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> c12b71de (Featire specs)
>>>>>>> 9440753 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bf05825 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> 4d90e3d (Featire specs)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> bf05825 (Featire specs)
=======
>>>>>>> c12b71de (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> e055dd0 (Rebased)
>>>>>>> bdc24a1a (Rebased)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 9e081dc (Fix)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 973ba8c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
>>>>>>> 379a979 (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> adc21e0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> adc21e0 (Featire specs)
>>>>>>> 37e48018 (Featire specs)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 4d90e3d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> aa3618b (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 75fa7e1b (Rebased)
=======
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> 13fca83d (Rebased)
=======
=======
=======
>>>>>>> 51bc18c (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0ea (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4bf888bf (Featire specs)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> b904d7ae (Featire specs)
=======
=======
>>>>>>> 4552227 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 393eff3b (Featire specs)
=======
=======
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
>>>>>>> d9d85ca6 (Fix)
=======
>>>>>>> adc21e0 (Featire specs)
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
>>>>>>> aa3618b (Rebased)
>>>>>>> 11792758 (Rebased)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> bc6bc8d2 (Rebased)
=======
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
>>>>>>> c12b71de (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> b904d7ae (Featire specs)
=======
=======
>>>>>>> 5b7749a (Fix)
>>>>>>> ef483b6d (Fix)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
>>>>>>> 49e8a6c (Rebased)
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
=======
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
=======
=======
>>>>>>> 4552227 (Featire specs)
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 392646b5 (Featire specs)
=======
=======
=======
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            end
          
      65.

    app/models/application_record.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            class ApplicationRecord < ActiveRecord::Base
          
      2. 
        
      
      
        
      
          
    2. 
            1
            

            

              self.abstract_class = true
          
      3. 
        
      
      
        
      
          
    3. 
            
            

            

            end
          
      4.

    app/models/author.rb

    100.0% lines covered

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> b97bb382 (Featire specs) ======= >>>>>>> 4a2f2ad8 (Featire specs) ======= >>>>>>> 21873de0 (Featire specs) ======= >>>>>>> 392646b5 (Featire specs) ======= >>>>>>> 1049b80c (Fix) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> 0676508 (Featire specs) >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> 15c51b7 (Featire specs) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> b97bb382 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> d52f9efe (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 2612be03 (Featire specs) 4 relevant lines. 4 lines covered and ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 973ba8c (Featire specs) >>>>>>> b97bb382 (Featire specs) 4 relevant lines. 4 lines covered and ======= 5 relevant lines. 5 lines covered and >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= 5 relevant lines. 5 lines covered and >>>>>>> 752f0c0 (Featire specs) ======= 5 relevant lines. 5 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= 5 relevant lines. 5 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 37e48018 (Featire specs) ======= 5 relevant lines. 5 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= 4 relevant lines. 4 lines covered and >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= 5 relevant lines. 5 lines covered and >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= 5 relevant lines. 5 lines covered and >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= 5 relevant lines. 5 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= 5 relevant lines. 5 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= 4 relevant lines. 4 lines covered and >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= 5 relevant lines. 5 lines covered and >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= >>>>>>> ef483b6d (Fix) ======= 4 relevant lines. 4 lines covered and >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= 4 relevant lines. 4 lines covered and >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= 4 relevant lines. 4 lines covered and >>>>>>> 11792758 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= 5 relevant lines. 5 lines covered and >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= 5 relevant lines. 5 lines covered and >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= 5 relevant lines. 5 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= 5 relevant lines. 5 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= 4 relevant lines. 4 lines covered and >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= 5 relevant lines. 5 lines covered and >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) ======= 5 relevant lines. 5 lines covered and >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= 5 relevant lines. 5 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= 5 relevant lines. 5 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= 4 relevant lines. 4 lines covered and >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= 5 relevant lines. 5 lines covered and >>>>>>> 4552227 (Featire specs) >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= 4 relevant lines. 4 lines covered and >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            class Author < ApplicationRecord
          
      2. 
        
      
      
        
      
          
    2. 
            1
            

            

              has_many :authors_books, dependent: :destroy
          
      3. 
        
      
      
        
      
          
    3. 
            1
            

            

              has_many :books, through: :authors_books
          
      4. 
        
      
      
        
      
          
    4. 
            
            

            

            
          
      5. 
        
      
      
        
      
          
    5. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 365d41ed (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
>>>>>>> 13fca83d (Rebased)
=======
>>>>>>> f136376a (Featire specs)
=======
>>>>>>> 1ca9c0ea (Featire specs)
=======
>>>>>>> 4bf888bf (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 393eff3b (Featire specs)
=======
>>>>>>> d9d85ca6 (Fix)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> c12b71de (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> b904d7ae (Featire specs)
=======
>>>>>>> ef483b6d (Fix)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> bdc24a1a (Rebased)
=======
>>>>>>> 53db2224 (Featire specs)
=======
>>>>>>> 7b22ad7e (Featire specs)
=======
>>>>>>> b97bb382 (Featire specs)
=======
>>>>>>> 4a2f2ad8 (Featire specs)
=======
>>>>>>> 21873de0 (Featire specs)
=======
>>>>>>> 392646b5 (Featire specs)
=======
>>>>>>> 1049b80c (Fix)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> e055dd0 (Rebased)
=======
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 973ba8c (Featire specs)
=======
>>>>>>> 8181d13 (Featire specs)
=======
>>>>>>> 72b9cab (Featire specs)
=======
>>>>>>> 15c51b7 (Featire specs)
=======
>>>>>>> 9e081dc (Fix)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> 53db2224 (Featire specs)
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f136376a (Featire specs)
=======
=======
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1ca9c0ea (Featire specs)
=======
=======
>>>>>>> 7b22ad7e (Featire specs)
=======
>>>>>>> b97bb382 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888bf (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> efd6af09 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 5507b42 (Featire specs)
>>>>>>> d52f9efe (Featire specs)
=======
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> ae07231a (Featire specs)
=======
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> c12b71de (Featire specs)
=======
=======
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 392646b5 (Featire specs)
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
              validates :first_name, :last_name, presence: true
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
              validates :first_name, :last_name, presence: true
=======
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 393eff3b (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> 37e48018 (Featire specs)
=======
              validates :first_name, :last_name, presence: true
=======
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 36356d3 (Featire specs)
>>>>>>> b904d7ae (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
>>>>>>> 5507b42 (Featire specs)
>>>>>>> 5e31aeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 53db2224 (Featire specs)
=======
=======
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> 973ba8c (Featire specs)
>>>>>>> b97bb382 (Featire specs)
              validates :first_name, :last_name, presence: true
=======
              validates :first_name, presence: true
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
              validates :first_name, presence: true
>>>>>>> 752f0c0 (Featire specs)
=======
              validates :first_name, presence: true
>>>>>>> 4e81ea2 (Featire specs)
=======
              validates :first_name, presence: true
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
              validates :first_name, presence: true
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 34509eee (Featire specs)
=======
              validates :first_name, :last_name, presence: true
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
              validates :first_name, presence: true
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 37e48018 (Featire specs)
          
      6. 
        
      
      
        
      
<<<<<<< HEAD
<<<<<<< HEAD
          
    6. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
    7. 
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 37e48018 (Featire specs)
          
    8. 
            1
            

            

              validates :last_name, presence: true
          
      9. 
        
      
      
        
      
          
    9. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> 37e48018 (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 34509eee (Featire specs)
=======
          
    10. 
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 37e48018 (Featire specs)
            
            

            

            end
          
      11.

    app/models/authors_book.rb

    100.0% lines covered

    4 relevant lines. 4 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            class AuthorsBook < ApplicationRecord
          
      2. 
        
      
      
        
      
          
    2. 
            1
            

            

              belongs_to :author
          
      3. 
        
      
      
        
      
          
    3. 
            1
            

            

              belongs_to :book
          
      4. 
        
      
      
        
      
          
    4. 
            
            

            

            
          
      5. 
        
      
      
        
      
          
    5. 
            1
            

            

              validates :author, :book, presence: true
=======
              validates :first_name, :last_name, presence: true
>>>>>>> 75fa7e1b (Rebased)
=======
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 53db2224 (Featire specs)
=======
>>>>>>> 7b22ad7e (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 365d41ed (Featire specs)
=======
>>>>>>> c05ee511 (Featire specs)
=======
>>>>>>> f136376a (Featire specs)
=======
>>>>>>> 1ca9c0ea (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
              validates :first_name, presence: true
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
              validates :first_name, presence: true
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 973ba8c (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
=======
              validates :first_name, presence: true
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
=======
              validates :first_name, presence: true
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
              validates :first_name, presence: true
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 4e81ea2 (Featire specs)
=======
              validates :first_name, presence: true
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
              validates :first_name, presence: true
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
=======
              validates :first_name, presence: true
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
>>>>>>> b904d7ae (Featire specs)
=======
=======
              validates :first_name, presence: true
>>>>>>> 4552227 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 393eff3b (Featire specs)
=======
=======
              validates :first_name, :last_name, presence: true
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
>>>>>>> d9d85ca6 (Fix)
=======
>>>>>>> b904d7ae (Featire specs)
=======
=======
              validates :first_name, :last_name, presence: true
>>>>>>> 5b7749a (Fix)
>>>>>>> ef483b6d (Fix)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
              validates :first_name, presence: true
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 0676508 (Featire specs)
=======
              validates :first_name, presence: true
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
=======
              validates :first_name, presence: true
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
              validates :first_name, presence: true
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
=======
              validates :first_name, presence: true
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
=======
              validates :first_name, presence: true
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      6. 
        
      
      
        
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b904d7ae (Featire specs)
=======
>>>>>>> ef483b6d (Fix)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
          
    6. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
          
    7. 
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
<<<<<<< HEAD
          
    8. 
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
          
    9. 
=======
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 4552227 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
=======
          
    10. 
=======
>>>>>>> 6da9530 (Featire specs)
=======
          
    11. 
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
=======
=======
>>>>>>> 0676508 (Featire specs)
=======
<<<<<<< HEAD
          
    12. 
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 659083f (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
          
    13. 
            1
            

            

              validates :last_name, presence: true
          
      14. 
        
      
      
        
      
          
    14. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
=======
=======
=======
>>>>>>> 36356d3 (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 4552227 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
    15. 
>>>>>>> 5b7749a (Fix)
=======
<<<<<<< HEAD
>>>>>>> b904d7ae (Featire specs)
=======
=======
          
    16. 
>>>>>>> 5b7749a (Fix)
>>>>>>> ef483b6d (Fix)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
>>>>>>> afa56d1 (Featire specs)
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            
            

            

            end
          
      17.
    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= >>>>>>> 34509eee (Featire specs) =======

    app/models/authors_book.rb

    100.0% lines covered

    4 relevant lines. 4 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            class AuthorsBook < ApplicationRecord
          
      2. 
        
      
      
        
      
          
    2. 
            1
            

            

              belongs_to :author
          
      3. 
        
      
      
        
      
          
    3. 
            1
            

            

              belongs_to :book
          
      4. 
        
      
      
        
      
          
    4. 
            
            

            

            
          
      5. 
        
      
      
        
      
          
    5. 
            1
            

            

              validates :author, :book, presence: true
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
              validates :first_name, :last_name, presence: true
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 51bc18c (Featire specs)
=======
=======
              validates :first_name, presence: true
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 973ba8c (Featire specs)
=======
              validates :first_name, presence: true
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
=======
              validates :first_name, presence: true
>>>>>>> 08edf50 (Featire specs)
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
=======
=======
=======
              validates :first_name, presence: true
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
=======
=======
=======
              validates :first_name, presence: true
>>>>>>> 4552227 (Featire specs)
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
=======
=======
              validates :first_name, :last_name, presence: true
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
=======
=======
=======
              validates :first_name, presence: true
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
>>>>>>> 3cf8dd4 (Featire specs)
          
      6. 
        
      
      
        
      
<<<<<<< HEAD
<<<<<<< HEAD
          
    6. 
=======
=======
>>>>>>> 752f0c0 (Featire specs)
          
    7. 
            1
            

            

              validates :last_name, presence: true
          
      8. 
        
      
      
        
      
          
    8. 
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
            
            

            

            end
          
      9.
    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> d8dd3b4a (Featire specs) ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> ae884b47 (Fix) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix)

    app/models/authors_book.rb

    100.0% lines covered

    4 relevant lines. 4 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            class AuthorsBook < ApplicationRecord
          
      2. 
        
      
      
        
      
          
    2. 
            1
            

            

              belongs_to :author
          
      3. 
        
      
      
        
      
          
    3. 
            1
            

            

              belongs_to :book
          
      4. 
        
      
      
        
      
          
    4. 
            
            

            

            
          
      5. 
        
      
      
        
      
          
    5. 
            1
            

            

              validates :author, :book, presence: true
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
              validates :first_name, :last_name, presence: true
>>>>>>> 11792758 (Rebased)
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
              validates :first_name, presence: true
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
=======
              validates :first_name, presence: true
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
=======
              validates :first_name, presence: true
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
              validates :first_name, presence: true
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 4e81ea2 (Featire specs)
=======
              validates :first_name, presence: true
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
              validates :first_name, presence: true
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
=======
              validates :first_name, presence: true
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
          
      6. 
        
      
      
        
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
          
    6. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
          
    7. 
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
<<<<<<< HEAD
          
    8. 
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
          
    9. 
=======
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
          
    10. 
            1
            

            

              validates :last_name, presence: true
          
      11. 
        
      
      
        
      
          
    11. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
            
            

            

            end
          
      12.
    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) =======

    app/models/authors_book.rb

    100.0% lines covered

    4 relevant lines. 4 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            class AuthorsBook < ApplicationRecord
          
      2. 
        
      
      
        
      
          
    2. 
            1
            

            

              belongs_to :author
          
      3. 
        
      
      
        
      
          
    3. 
            1
            

            

              belongs_to :book
          
      4. 
        
      
      
        
      
          
    4. 
            
            

            

            
          
      5. 
        
      
      
        
      
          
    5. 
            1
            

            

              validates :author, :book, presence: true
<<<<<<< HEAD
<<<<<<< HEAD
=======
              validates :first_name, :last_name, presence: true
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
              validates :first_name, presence: true
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
              validates :first_name, presence: true
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
          
      6. 
        
      
      
        
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
    6. 
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
          
    7. 
            1
            

            

              validates :last_name, presence: true
          
      8. 
        
      
      
        
      
          
    8. 
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
            
            

            

            end
          
      9.
    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix)

    app/models/authors_book.rb

    100.0% lines covered

    4 relevant lines. 4 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            class AuthorsBook < ApplicationRecord
          
      2. 
        
      
      
        
      
          
    2. 
            1
            

            

              belongs_to :author
          
      3. 
        
      
      
        
      
          
    3. 
            1
            

            

              belongs_to :book
          
      4. 
        
      
      
        
      
          
    4. 
            
            

            

            
          
      5. 
        
      
      
        
      
          
    5. 
            1
            

            

              validates :author, :book, presence: true
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
=======
=======
              validates :first_name, :last_name, presence: true
>>>>>>> 49e8a6c (Rebased)
>>>>>>> e055dd0 (Rebased)
=======
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 973ba8c (Featire specs)
          
      6. 
        
      
      
        
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
    6. 
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
          
    7. 
            1
            

            

              validates :last_name, presence: true
          
      8. 
        
      
      
        
      
          
    8. 
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
            
            

            

            end
          
      9.
    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 0c57e4e (Fix) ======= ======= >>>>>>> 872e675 (Fix)

    app/models/authors_book.rb

    100.0% lines covered

    4 relevant lines. 4 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            class AuthorsBook < ApplicationRecord
          
      2. 
        
      
      
        
      
          
    2. 
            1
            

            

              belongs_to :author
          
      3. 
        
      
      
        
      
          
    3. 
            1
            

            

              belongs_to :book
          
      4. 
        
      
      
        
      
          
    4. 
            
            

            

            
          
      5. 
        
      
      
        
      
          
    5. 
            1
            

            

              validates :author, :book, presence: true
          
      6. 
        
      
      
        
      
          
    6. 
            
            

            

            end
          
      7.
    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)

    app/models/billing.rb

    100.0% lines covered

    1 relevant lines. 1 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            class Billing < Address
          
      2. 
        
      
      
        
      
          
    2. 
            
            

            

            end
          
      3.
    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 8887ba5b (Fix) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 1049b80c (Fix) ======= >>>>>>> f3d746cb (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 0676508 (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> d52f9efe (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)

    app/models/book.rb

    100.0% lines covered

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 1049b80c (Fix) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) 9 relevant lines. 9 lines covered and ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> f8e5c9db (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) 8 relevant lines. 8 lines covered and ======= 9 relevant lines. 9 lines covered and >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) 8 relevant lines. 8 lines covered and ======= 9 relevant lines. 9 lines covered and >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= 9 relevant lines. 9 lines covered and >>>>>>> 752f0c0 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 37e48018 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> d8dd3b4a (Featire specs) ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) 9 relevant lines. 9 lines covered and ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) ======= 9 relevant lines. 9 lines covered and ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) 8 relevant lines. 8 lines covered and ======= 9 relevant lines. 9 lines covered and >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= 10 relevant lines. 10 lines covered and >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= 8 relevant lines. 8 lines covered and >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 11792758 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 3cf8dd4 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> e055dd0 (Rebased) ======= 9 relevant lines. 9 lines covered and >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= 10 relevant lines. 10 lines covered and >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= 10 relevant lines. 10 lines covered and >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            class Book < ApplicationRecord
          
      2. 
        
      
      
        
      
          
    2. 
            1
            

            

              has_many :authors_books, dependent: :destroy
          
      3. 
        
      
      
        
      
          
    3. 
            1
            

            

              has_many :authors, through: :authors_books
          
      4. 
        
      
      
        
      
          
    4. 
            
            

            

            
          
      5. 
        
      
      
        
      
          
    5. 
            1
            

            

              has_many :books_categories, dependent: :destroy
          
      6. 
        
      
      
        
      
          
    6. 
            1
            

            

              has_many :categories, through: :books_categories
          
      7. 
        
      
      
        
      
          
    7. 
            
            

            

            
          
      8. 
        
      
      
        
      
          
    8. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 365d41ed (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
>>>>>>> 13fca83d (Rebased)
=======
>>>>>>> f136376a (Featire specs)
=======
>>>>>>> 1ca9c0ea (Featire specs)
=======
>>>>>>> 4bf888bf (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 393eff3b (Featire specs)
=======
>>>>>>> d9d85ca6 (Fix)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> c12b71de (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> b904d7ae (Featire specs)
=======
>>>>>>> ef483b6d (Fix)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> bdc24a1a (Rebased)
=======
>>>>>>> 53db2224 (Featire specs)
=======
>>>>>>> 7b22ad7e (Featire specs)
=======
>>>>>>> b97bb382 (Featire specs)
=======
>>>>>>> 4a2f2ad8 (Featire specs)
=======
>>>>>>> 21873de0 (Featire specs)
=======
>>>>>>> 392646b5 (Featire specs)
=======
>>>>>>> 1049b80c (Fix)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> e055dd0 (Rebased)
=======
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 973ba8c (Featire specs)
=======
>>>>>>> 8181d13 (Featire specs)
=======
>>>>>>> 72b9cab (Featire specs)
=======
>>>>>>> 15c51b7 (Featire specs)
=======
>>>>>>> 9e081dc (Fix)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> 53db2224 (Featire specs)
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f136376a (Featire specs)
=======
=======
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1ca9c0ea (Featire specs)
=======
=======
>>>>>>> 7b22ad7e (Featire specs)
=======
>>>>>>> b97bb382 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888bf (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> efd6af09 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 5507b42 (Featire specs)
>>>>>>> d52f9efe (Featire specs)
=======
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> ae07231a (Featire specs)
=======
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> c12b71de (Featire specs)
=======
=======
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 392646b5 (Featire specs)
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
              has_many :reviews, dependent: :destroy
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
              has_many :reviews, dependent: :destroy
=======
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 393eff3b (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> 37e48018 (Featire specs)
=======
              has_many :reviews, dependent: :destroy
=======
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 36356d3 (Featire specs)
>>>>>>> b904d7ae (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
>>>>>>> 5507b42 (Featire specs)
>>>>>>> 5e31aeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 53db2224 (Featire specs)
=======
=======
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> 973ba8c (Featire specs)
>>>>>>> b97bb382 (Featire specs)
              has_many :reviews, dependent: :destroy
=======
              validates :title, presence: true
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
              validates :title, presence: true
>>>>>>> 752f0c0 (Featire specs)
=======
              validates :title, presence: true
>>>>>>> 4e81ea2 (Featire specs)
=======
              validates :title, presence: true
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
              validates :title, presence: true
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 34509eee (Featire specs)
=======
              has_many :reviews, dependent: :destroy
>>>>>>> 75fa7e1b (Rebased)
=======
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 53db2224 (Featire specs)
=======
>>>>>>> 7b22ad7e (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 365d41ed (Featire specs)
=======
>>>>>>> c05ee511 (Featire specs)
=======
>>>>>>> f136376a (Featire specs)
=======
>>>>>>> 1ca9c0ea (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
              validates :title, presence: true
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
              validates :title, presence: true
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 973ba8c (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
=======
              validates :title, presence: true
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
=======
              validates :title, presence: true
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
              validates :title, presence: true
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 4e81ea2 (Featire specs)
=======
              validates :title, presence: true
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
              validates :title, presence: true
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
              has_many :reviews, dependent: :destroy
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> 13fca83d (Rebased)
=======
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376a (Featire specs)
=======
=======
=======
=======
              validates :title, presence: true
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0ea (Featire specs)
=======
=======
=======
              validates :title, presence: true
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888bf (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
=======
              validates :title, presence: true
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
>>>>>>> b904d7ae (Featire specs)
=======
=======
              validates :title, presence: true
>>>>>>> 4552227 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 393eff3b (Featire specs)
=======
=======
              has_many_attached :images
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
>>>>>>> d9d85ca6 (Fix)
=======
              has_many :reviews, dependent: :destroy
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
              validates :title, presence: true
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 37e48018 (Featire specs)
=======
              has_many :reviews, dependent: :destroy
>>>>>>> 11792758 (Rebased)
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
              validates :title, presence: true
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
=======
              validates :title, presence: true
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
=======
              validates :title, presence: true
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
              validates :title, presence: true
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 4e81ea2 (Featire specs)
=======
              validates :title, presence: true
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
              validates :title, presence: true
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
              has_many :reviews, dependent: :destroy
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> bc6bc8d2 (Rebased)
=======
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> d52f9efe (Featire specs)
=======
=======
=======
=======
              validates :title, presence: true
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
=======
              validates :title, presence: true
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> c12b71de (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
=======
              validates :title, presence: true
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> b904d7ae (Featire specs)
=======
=======
              has_many_attached :images
>>>>>>> 5b7749a (Fix)
>>>>>>> ef483b6d (Fix)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
              validates :title, presence: true
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 0676508 (Featire specs)
=======
              validates :title, presence: true
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
=======
              validates :title, presence: true
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
              validates :title, presence: true
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
=======
              validates :title, presence: true
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
              has_many :reviews, dependent: :destroy
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5e31aeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 53db2224 (Featire specs)
=======
=======
=======
=======
              validates :title, presence: true
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
              validates :title, presence: true
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
=======
=======
              validates :title, presence: true
>>>>>>> 08edf50 (Featire specs)
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
=======
=======
              validates :title, presence: true
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
=======
=======
              validates :title, presence: true
>>>>>>> 4552227 (Featire specs)
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 392646b5 (Featire specs)
=======
=======
=======
              has_many_attached :images
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
              validates :title, presence: true
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
=======
              validates :title, presence: true
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
=======
              validates :title, presence: true
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      9. 
        
      
      
        
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84809242 (Featire specs)
=======
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 365d41ed (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
>>>>>>> 13fca83d (Rebased)
=======
>>>>>>> f136376a (Featire specs)
=======
>>>>>>> 1ca9c0ea (Featire specs)
=======
>>>>>>> 4bf888bf (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 393eff3b (Featire specs)
=======
>>>>>>> d9d85ca6 (Fix)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> c12b71de (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> b904d7ae (Featire specs)
=======
>>>>>>> ef483b6d (Fix)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> bdc24a1a (Rebased)
=======
>>>>>>> 53db2224 (Featire specs)
=======
>>>>>>> 7b22ad7e (Featire specs)
=======
>>>>>>> b97bb382 (Featire specs)
=======
>>>>>>> 4a2f2ad8 (Featire specs)
=======
>>>>>>> 21873de0 (Featire specs)
=======
>>>>>>> 392646b5 (Featire specs)
=======
>>>>>>> 1049b80c (Fix)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> e055dd0 (Rebased)
=======
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 973ba8c (Featire specs)
=======
>>>>>>> 8181d13 (Featire specs)
=======
>>>>>>> 72b9cab (Featire specs)
=======
>>>>>>> 15c51b7 (Featire specs)
=======
>>>>>>> 9e081dc (Fix)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> 53db2224 (Featire specs)
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f136376a (Featire specs)
=======
=======
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1ca9c0ea (Featire specs)
=======
=======
>>>>>>> 7b22ad7e (Featire specs)
=======
>>>>>>> b97bb382 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888bf (Featire specs)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> efd6af09 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 5507b42 (Featire specs)
>>>>>>> d52f9efe (Featire specs)
=======
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> ae07231a (Featire specs)
=======
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> c12b71de (Featire specs)
=======
=======
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 392646b5 (Featire specs)
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
    9. 
            
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 393eff3b (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 36356d3 (Featire specs)
>>>>>>> b904d7ae (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
>>>>>>> 5507b42 (Featire specs)
>>>>>>> 5e31aeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 53db2224 (Featire specs)
=======
=======
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> 973ba8c (Featire specs)
>>>>>>> b97bb382 (Featire specs)
          
    10. 
            
=======
          
    11. 
            1
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
    12. 
            1
>>>>>>> 752f0c0 (Featire specs)
=======
          
    13. 
            1
>>>>>>> 4e81ea2 (Featire specs)
=======
          
    14. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> 37e48018 (Featire specs)
=======
          
    15. 
            1
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
          
    16. 
            
>>>>>>> 75fa7e1b (Rebased)
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 365d41ed (Featire specs)
=======
>>>>>>> c05ee511 (Featire specs)
=======
>>>>>>> f136376a (Featire specs)
=======
>>>>>>> 1ca9c0ea (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 53db2224 (Featire specs)
=======
>>>>>>> 7b22ad7e (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
          
    17. 
            1
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> bf05825 (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 973ba8c (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
    18. 
            1
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
    19. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
    20. 
            1
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
          
    21. 
            
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> 13fca83d (Rebased)
=======
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376a (Featire specs)
=======
=======
=======
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0ea (Featire specs)
=======
=======
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888bf (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
          
    22. 
            1
>>>>>>> 4552227 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 393eff3b (Featire specs)
=======
=======
          
    23. 
            
>>>>>>> 5b7749a (Fix)
=======
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ef483b6d (Fix)
=======
=======
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
          
    24. 
            
>>>>>>> 5b7749a (Fix)
>>>>>>> d9d85ca6 (Fix)
=======
          
    25. 
            
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> 37e48018 (Featire specs)
=======
          
    26. 
            
>>>>>>> 11792758 (Rebased)
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
>>>>>>> 0676508 (Featire specs)
=======
=======
>>>>>>> 96394f1 (Featire specs)
=======
          
    27. 
            1
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
          
    28. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
=======
=======
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
          
    29. 
            1
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
=======
=======
          
    30. 
            
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> e055dd0 (Rebased)
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5e31aeb (Featire specs)
=======
=======
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 51bc18c (Featire specs)
=======
=======
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 973ba8c (Featire specs)
=======
=======
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
=======
=======
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
=======
=======
=======
          
    31. 
            1
>>>>>>> 4552227 (Featire specs)
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
=======
=======
          
    32. 
            
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> e055dd0 (Rebased)
=======
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 973ba8c (Featire specs)
=======
>>>>>>> 8181d13 (Featire specs)
=======
>>>>>>> 72b9cab (Featire specs)
=======
>>>>>>> 15c51b7 (Featire specs)
=======
>>>>>>> 9e081dc (Fix)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
            
=======
<<<<<<< HEAD
=======
>>>>>>> 4a2f2ad8 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
    33. 
            1
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> bf05825 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
    34. 
            1
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
    35. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
    36. 
            1
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
          
    37. 
            
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> bc6bc8d2 (Rebased)
=======
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> d52f9efe (Featire specs)
=======
=======
=======
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> c12b71de (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
          
    38. 
            1
>>>>>>> 4552227 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b904d7ae (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 365d41ed (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
>>>>>>> 13fca83d (Rebased)
=======
>>>>>>> f136376a (Featire specs)
=======
>>>>>>> 1ca9c0ea (Featire specs)
=======
>>>>>>> 4bf888bf (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 393eff3b (Featire specs)
=======
>>>>>>> d9d85ca6 (Fix)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> c12b71de (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> b904d7ae (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f136376a (Featire specs)
=======
=======
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1ca9c0ea (Featire specs)
=======
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> 4bf888bf (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> efd6af09 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 5507b42 (Featire specs)
>>>>>>> d52f9efe (Featire specs)
=======
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> ae07231a (Featire specs)
=======
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> c12b71de (Featire specs)
            
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
            
=======
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
>>>>>>> 36356d3 (Featire specs)
>>>>>>> 393eff3b (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> 37e48018 (Featire specs)
=======
            
=======
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 36356d3 (Featire specs)
>>>>>>> b904d7ae (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
>>>>>>> 5507b42 (Featire specs)
>>>>>>> 5e31aeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 53db2224 (Featire specs)
=======
=======
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> 973ba8c (Featire specs)
>>>>>>> b97bb382 (Featire specs)
            
=======
              validates :description, presence: true
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
              validates :description, presence: true
>>>>>>> 752f0c0 (Featire specs)
=======
              validates :description, presence: true
>>>>>>> 4e81ea2 (Featire specs)
=======
              validates :description, presence: true
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
              validates :description, presence: true
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 34509eee (Featire specs)
=======
            
>>>>>>> 75fa7e1b (Rebased)
=======
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 53db2224 (Featire specs)
=======
>>>>>>> 7b22ad7e (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 365d41ed (Featire specs)
=======
>>>>>>> c05ee511 (Featire specs)
=======
>>>>>>> f136376a (Featire specs)
=======
>>>>>>> 1ca9c0ea (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
              validates :description, presence: true
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
              validates :description, presence: true
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 973ba8c (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
=======
              validates :description, presence: true
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
=======
              validates :description, presence: true
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
              validates :description, presence: true
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 4e81ea2 (Featire specs)
=======
              validates :description, presence: true
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
              validates :description, presence: true
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
            
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> 13fca83d (Rebased)
=======
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376a (Featire specs)
=======
=======
=======
=======
              validates :description, presence: true
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0ea (Featire specs)
=======
=======
=======
              validates :description, presence: true
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888bf (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
=======
              validates :description, presence: true
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
>>>>>>> b904d7ae (Featire specs)
=======
=======
              validates :description, presence: true
>>>>>>> 4552227 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 393eff3b (Featire specs)
=======
=======
            
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
>>>>>>> d9d85ca6 (Fix)
=======
            
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
              validates :description, presence: true
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 37e48018 (Featire specs)
=======
            
>>>>>>> 11792758 (Rebased)
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
              validates :description, presence: true
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
=======
              validates :description, presence: true
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
=======
              validates :description, presence: true
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
              validates :description, presence: true
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 4e81ea2 (Featire specs)
=======
              validates :description, presence: true
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
              validates :description, presence: true
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
            
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> bc6bc8d2 (Rebased)
=======
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> d52f9efe (Featire specs)
=======
=======
=======
=======
              validates :description, presence: true
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
=======
              validates :description, presence: true
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> c12b71de (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
=======
              validates :description, presence: true
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> b904d7ae (Featire specs)
=======
=======
            
>>>>>>> 5b7749a (Fix)
>>>>>>> ef483b6d (Fix)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
              validates :description, presence: true
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 0676508 (Featire specs)
=======
              validates :description, presence: true
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
=======
              validates :description, presence: true
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
              validates :description, presence: true
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
=======
              validates :description, presence: true
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
            
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5e31aeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 53db2224 (Featire specs)
=======
=======
=======
=======
              validates :description, presence: true
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
              validates :description, presence: true
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
=======
=======
              validates :description, presence: true
>>>>>>> 08edf50 (Featire specs)
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
=======
=======
              validates :description, presence: true
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
=======
=======
              validates :description, presence: true
>>>>>>> 4552227 (Featire specs)
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 392646b5 (Featire specs)
=======
=======
=======
            
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
              validates :description, presence: true
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
=======
              validates :description, presence: true
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
=======
              validates :description, presence: true
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      39. 
        
      
      
        
      
          
    39. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              validates :title, :description, :year_of_publication, :materials, :dimensions, presence: true
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> 37e48018 (Featire specs)
              validates :title, :description, :year_of_publication, :materials, :dimensions, presence: true
=======
              validates :year_of_publication, :materials, :dimensions, presence: true
>>>>>>> d0dc1f1 (Featire specs)
=======
              validates :year_of_publication, :materials, :dimensions, presence: true
>>>>>>> 752f0c0 (Featire specs)
=======
              validates :year_of_publication, :materials, :dimensions, presence: true
>>>>>>> 4e81ea2 (Featire specs)
=======
              validates :year_of_publication, :materials, :dimensions, presence: true
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
              validates :year_of_publication, :materials, :dimensions, presence: true
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> 84809242 (Featire specs)
              has_many_attached :images
>>>>>>> 75fa7e1b (Rebased)
=======
=======
>>>>>>> 365d41ed (Featire specs)
=======
>>>>>>> c05ee511 (Featire specs)
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
>>>>>>> 13fca83d (Rebased)
=======
>>>>>>> f136376a (Featire specs)
=======
>>>>>>> 1ca9c0ea (Featire specs)
=======
>>>>>>> 4bf888bf (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 393eff3b (Featire specs)
=======
>>>>>>> d9d85ca6 (Fix)
              has_many_attached :images
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> 311e9fa (Rebased)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> ed32b84 (Featire specs)
              validates :title, :description, :year_of_publication, :materials, :dimensions, presence: true
=======
              validates :year_of_publication, :materials, :dimensions, presence: true
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
              validates :year_of_publication, :materials, :dimensions, presence: true
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
=======
              validates :year_of_publication, :materials, :dimensions, presence: true
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 36356d3 (Featire specs)
              has_many_attached :images
=======
              validates :year_of_publication, :materials, :dimensions, presence: true
>>>>>>> d0dc1f1 (Featire specs)
=======
              validates :year_of_publication, :materials, :dimensions, presence: true
>>>>>>> 752f0c0 (Featire specs)
=======
              validates :year_of_publication, :materials, :dimensions, presence: true
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 4e81ea2 (Featire specs)
=======
              validates :year_of_publication, :materials, :dimensions, presence: true
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
              validates :year_of_publication, :materials, :dimensions, presence: true
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
              has_many_attached :images
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> 13fca83d (Rebased)
=======
=======
=======
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
              has_many_attached :images
=======
              validates :year_of_publication, :materials, :dimensions, presence: true
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376a (Featire specs)
=======
=======
=======
=======
              validates :year_of_publication, :materials, :dimensions, presence: true
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0ea (Featire specs)
=======
=======
=======
=======
              validates :year_of_publication, :materials, :dimensions, presence: true
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888bf (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
=======
              validates :year_of_publication, :materials, :dimensions, presence: true
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
              validates :year_of_publication, :materials, :dimensions, presence: true
>>>>>>> 4552227 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 393eff3b (Featire specs)
=======
=======
              has_many :reviews, dependent: :destroy
>>>>>>> 5b7749a (Fix)
>>>>>>> d9d85ca6 (Fix)
=======
              validates :title, :description, :year_of_publication, :materials, :dimensions, presence: true
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
              validates :year_of_publication, :materials, :dimensions, presence: true
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 37e48018 (Featire specs)
=======
              has_many_attached :images
>>>>>>> 11792758 (Rebased)
          
      40. 
        
      
      
        
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
    40. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
              validates :price_cents, :quantity, presence: true,
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              validates :price_cents, :quantity, presence: true,
=======
              validates :price, :quantity, presence: true,
>>>>>>> d0dc1f1 (Featire specs)
=======
              validates :price, :quantity, presence: true,
>>>>>>> 752f0c0 (Featire specs)
=======
              validates :price, :quantity, presence: true,
>>>>>>> 4e81ea2 (Featire specs)
=======
              validates :price, :quantity, presence: true,
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
              validates :price, :quantity, presence: true,
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 34509eee (Featire specs)
=======
              validates :price_cents, :quantity, presence: true,
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
              validates :price, :quantity, presence: true,
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 37e48018 (Featire specs)
          
      41. 
        
      
      
        
      
          
    41. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
                                                 numericality:
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                                                 numericality:
=======
                                           numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 }
>>>>>>> d0dc1f1 (Featire specs)
=======
                                           numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 }
>>>>>>> 752f0c0 (Featire specs)
=======
                                           numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 }
>>>>>>> 4e81ea2 (Featire specs)
=======
                                           numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
                                           numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 }
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 34509eee (Featire specs)
=======
                                                 numericality:
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
                                           numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 }
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 37e48018 (Featire specs)
          
      42. 
        
      
      
        
      
          
    42. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
>>>>>>> 34509eee (Featire specs)
=======
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> 37e48018 (Featire specs)
                                             { greater_than_or_equal_to: Constants::MIN_PRICE_IN_CENTS,
          
      43. 
        
      
      
        
      
          
    43. 
            
            

            

                                               less_than_or_equal_to: Constants::MAX_PRICE_IN_CENTS }
          
      44. 
        
      
      
        
      
          
    44. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 34509eee (Featire specs)
            end
          
      45.

    app/models/books_category.rb

    100.0% lines covered

    4 relevant lines. 4 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            class BooksCategory < ApplicationRecord
          
      2. 
        
      
      
        
      
          
    2. 
            1
            

            

              belongs_to :category
          
      3. 
        
      
      
        
      
          
    3. 
            1
            

            

              belongs_to :book
          
      4. 
        
      
      
        
      
          
    4. 
=======
=======
>>>>>>> 13fca83d (Rebased)
=======
>>>>>>> f136376a (Featire specs)
=======
>>>>>>> 1ca9c0ea (Featire specs)
=======
>>>>>>> 4bf888bf (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
=======
=======
>>>>>>> d9d85ca6 (Fix)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 393eff3b (Featire specs)
=======
=======
>>>>>>> 5b7749a (Fix)
>>>>>>> d9d85ca6 (Fix)
          
    5. 
>>>>>>> 75fa7e1b (Rebased)
            
            

            

            
          
      6. 
        
      
      
        
      
          
    6. 
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
          
    7. 
>>>>>>> 311e9fa (Rebased)
            1
            

            

              validates :title, :description, :year_of_publication, :materials, :dimensions, presence: true
=======
<<<<<<< HEAD
              validates :title, :description, :year_of_publication, :materials, :dimensions, presence: true
=======
              validates :year_of_publication, :materials, :dimensions, presence: true
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 824bb2b (Featire specs)
          
      8. 
        
      
      
        
      
<<<<<<< HEAD
          
    8. 
=======
          
    9. 
>>>>>>> 824bb2b (Featire specs)
            1
            

            

<<<<<<< HEAD
              validates :price_cents, :quantity, presence: true,
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
              validates :price_cents, :quantity, presence: true,
=======
              validates :price, :quantity, presence: true,
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
              validates :price, :quantity, presence: true,
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
=======
              validates :price, :quantity, presence: true,
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
              validates :price, :quantity, presence: true,
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
=======
              validates :price, :quantity, presence: true,
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
          
      10. 
        
      
      
        
      
          
    10. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
                                                 numericality:
=======
                                           numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 }
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                                           numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 }
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
=======
                                           numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 }
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
                                           numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
=======
                                           numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 }
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
          
      11. 
        
      
      
        
      
          
    11. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
                                             { greater_than_or_equal_to: Constants::MIN_PRICE_IN_CENTS,
>>>>>>> 824bb2b (Featire specs)
          
      12. 
        
      
      
        
      
          
    12. 
            
            

            

<<<<<<< HEAD
                                                 numericality:
=======
                                               less_than_or_equal_to: Constants::MAX_PRICE_IN_CENTS }
>>>>>>> 824bb2b (Featire specs)
          
      13. 
        
      
      
        
      
          
    13. 
            
            

            

<<<<<<< HEAD
                                             { greater_than_or_equal_to: Constants::MIN_PRICE_IN_CENTS,
          
      14. 
        
      
      
        
      
          
    14. 
            
            

            

                                               less_than_or_equal_to: Constants::MAX_PRICE_IN_CENTS }
          
      15. 
        
      
      
        
      
          
    15. 
            
            

            

=======
=======
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
            end
          
      16.

    app/models/books_category.rb

    100.0% lines covered

    4 relevant lines. 4 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
=======
          
    2. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
    3. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
    4. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
    5. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
          
    6. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
    7. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
    8. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
    9. 
>>>>>>> 08edf50 (Featire specs)
=======
          
    10. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
            class BooksCategory < ApplicationRecord
          
      11. 
        
      
      
        
      
          
    11. 
            1
            

            

              belongs_to :category
          
      12. 
        
      
      
        
      
          
    12. 
            1
            

            

              belongs_to :book
          
      13. 
        
      
      
        
      
          
    13. 
            
            

            

            
          
      14. 
        
      
      
        
      
          
    14. 
            1
            

            

              validates :category, :book, presence: true
          
      15. 
        
      
      
        
      
          
    15. 
            
            

            

=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
            end
          
      16.

    app/models/books_category.rb

    100.0% lines covered

    4 relevant lines. 4 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            class BooksCategory < ApplicationRecord
          
      2. 
        
      
      
        
      
          
    2. 
            1
            

            

              belongs_to :category
          
      3. 
        
      
      
        
      
          
    3. 
            1
            

            

              belongs_to :book
          
      4. 
        
      
      
        
      
          
    4. 
=======
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
          
    5. 
>>>>>>> 49e8a6c (Rebased)
            
            

            

            
          
      6. 
        
      
      
        
      
          
    6. 
=======
          
    7. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
    8. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
    9. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
=======
=======
          
    10. 
>>>>>>> 08edf50 (Featire specs)
=======
          
    11. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
    12. 
>>>>>>> 4552227 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 5b7749a (Fix)
            1
            

            

<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              validates :title, :description, :year_of_publication, :materials, :dimensions, presence: true
=======
              validates :price, :quantity, presence: true,
>>>>>>> d0dc1f1 (Featire specs)
=======
              validates :price, :quantity, presence: true,
>>>>>>> 752f0c0 (Featire specs)
=======
              validates :price, :quantity, presence: true,
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
              validates :price, :quantity, presence: true,
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
              validates :price, :quantity, presence: true,
>>>>>>> 08edf50 (Featire specs)
=======
              validates :price, :quantity, presence: true,
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
              validates :price, :quantity, presence: true,
>>>>>>> 4552227 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> c12b71de (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> b904d7ae (Featire specs)
=======
>>>>>>> ef483b6d (Fix)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> bdc24a1a (Rebased)
=======
>>>>>>> 53db2224 (Featire specs)
=======
>>>>>>> 7b22ad7e (Featire specs)
=======
>>>>>>> b97bb382 (Featire specs)
=======
>>>>>>> 4a2f2ad8 (Featire specs)
=======
>>>>>>> 21873de0 (Featire specs)
=======
>>>>>>> 392646b5 (Featire specs)
=======
>>>>>>> 1049b80c (Fix)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
              has_many_attached :images
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> 311e9fa (Rebased)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> e055dd0 (Rebased)
=======
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 973ba8c (Featire specs)
=======
>>>>>>> 8181d13 (Featire specs)
=======
>>>>>>> 72b9cab (Featire specs)
=======
>>>>>>> 15c51b7 (Featire specs)
=======
>>>>>>> 9e081dc (Fix)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
              validates :title, :description, :year_of_publication, :materials, :dimensions, presence: true
=======
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 6fba6be (Featire specs)
              has_many_attached :images
>>>>>>> ee5242b (Featire specs)
=======
              validates :year_of_publication, :materials, :dimensions, presence: true
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
              validates :year_of_publication, :materials, :dimensions, presence: true
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
=======
=======
=======
              validates :year_of_publication, :materials, :dimensions, presence: true
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 36356d3 (Featire specs)
              has_many_attached :images
=======
              validates :year_of_publication, :materials, :dimensions, presence: true
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
              validates :year_of_publication, :materials, :dimensions, presence: true
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
              validates :year_of_publication, :materials, :dimensions, presence: true
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 4e81ea2 (Featire specs)
=======
              validates :year_of_publication, :materials, :dimensions, presence: true
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 72b9cab (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
=======
              validates :year_of_publication, :materials, :dimensions, presence: true
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
=======
=======
              has_many_attached :images
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
=======
=======
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
              has_many_attached :images
=======
              validates :year_of_publication, :materials, :dimensions, presence: true
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
=======
=======
=======
              validates :year_of_publication, :materials, :dimensions, presence: true
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
=======
=======
=======
              validates :year_of_publication, :materials, :dimensions, presence: true
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> bf05825 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
              validates :year_of_publication, :materials, :dimensions, presence: true
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
              validates :year_of_publication, :materials, :dimensions, presence: true
>>>>>>> 4552227 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
=======
              has_many :reviews, dependent: :destroy
>>>>>>> 5b7749a (Fix)
=======
>>>>>>> 6da9530 (Featire specs)
=======
=======
              validates :year_of_publication, :materials, :dimensions, presence: true
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 659083f (Featire specs)
=======
=======
=======
              validates :year_of_publication, :materials, :dimensions, presence: true
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
              validates :year_of_publication, :materials, :dimensions, presence: true
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
=======
=======
=======
              validates :year_of_publication, :materials, :dimensions, presence: true
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
=======
=======
              has_many_attached :images
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> e055dd0 (Rebased)
=======
=======
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
              has_many_attached :images
=======
              validates :year_of_publication, :materials, :dimensions, presence: true
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5e31aeb (Featire specs)
=======
=======
=======
              validates :year_of_publication, :materials, :dimensions, presence: true
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 51bc18c (Featire specs)
=======
=======
=======
              validates :year_of_publication, :materials, :dimensions, presence: true
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> 973ba8c (Featire specs)
=======
=======
=======
              validates :year_of_publication, :materials, :dimensions, presence: true
>>>>>>> 08edf50 (Featire specs)
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
=======
=======
=======
              validates :year_of_publication, :materials, :dimensions, presence: true
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
=======
=======
=======
              validates :year_of_publication, :materials, :dimensions, presence: true
>>>>>>> 4552227 (Featire specs)
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
=======
=======
              has_many :reviews, dependent: :destroy
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
              validates :title, :description, :year_of_publication, :materials, :dimensions, presence: true
=======
              validates :year_of_publication, :materials, :dimensions, presence: true
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
=======
=======
=======
              validates :year_of_publication, :materials, :dimensions, presence: true
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
=======
=======
=======
              validates :year_of_publication, :materials, :dimensions, presence: true
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
=======
=======
=======
              validates :year_of_publication, :materials, :dimensions, presence: true
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
          
      13. 
        
      
      
        
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
    13. 
            
            

            

            
          
      14. 
        
      
      
        
      
          
    14. 
            1
            

            

              validates :title, :description, :year_of_publication, :materials, :dimensions, presence: true
>>>>>>> 5b7749a (Fix)
          
      15. 
        
      
      
        
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> b904d7ae (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> ef483b6d (Fix)
=======
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
<<<<<<< HEAD
>>>>>>> 53db2224 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 392646b5 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
          
    15. 
            1
=======
          
    16. 
            
>>>>>>> d0dc1f1 (Featire specs)
=======
          
    17. 
            
>>>>>>> 752f0c0 (Featire specs)
=======
          
    18. 
            
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
    19. 
            
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
    20. 
            
>>>>>>> 7a02bbe (Featire specs)
=======
          
    21. 
            
>>>>>>> 4552227 (Featire specs)
=======
          
    22. 
            1
>>>>>>> 5b7749a (Fix)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
              validates :price_cents, :quantity, presence: true,
=======
                                           numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 }
>>>>>>> d0dc1f1 (Featire specs)
=======
                                           numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 }
>>>>>>> 752f0c0 (Featire specs)
=======
                                           numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 }
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
                                           numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 }
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                                           numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 }
>>>>>>> 08edf50 (Featire specs)
=======
                                           numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                                           numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 }
>>>>>>> 4552227 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
          
      23. 
        
      
      
        
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
          
    23. 
            
            

            

                                                 numericality:
          
      24. 
        
      
      
        
      
          
    24. 
            
            

            

                                             { greater_than_or_equal_to: Constants::MIN_PRICE_IN_CENTS,
=======
              validates :price_cents, :quantity, presence: true,
>>>>>>> 5b7749a (Fix)
          
      25. 
        
      
      
        
      
          
    25. 
            
            

            

                                                 numericality:
          
      26. 
        
      
      
        
      
          
    26. 
<<<<<<< HEAD
=======
          
    27. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
    28. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
    29. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
          
    30. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
    31. 
>>>>>>> 08edf50 (Featire specs)
=======
          
    32. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
    33. 
>>>>>>> 4552227 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
=======
            
            

            

                                             { greater_than_or_equal_to: Constants::MIN_PRICE_IN_CENTS,
          
      34. 
        
      
      
        
      
          
    34. 
            
            

            

                                               less_than_or_equal_to: Constants::MAX_PRICE_IN_CENTS }
          
      35. 
        
      
      
        
      
          
    35. 
>>>>>>> 5b7749a (Fix)
            
            

            

=======
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 37e48018 (Featire specs)
            end
          
      36.

    app/models/books_category.rb

    100.0% lines covered

    4 relevant lines. 4 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            class BooksCategory < ApplicationRecord
          
      2. 
        
      
      
        
      
          
    2. 
            1
            

            

              belongs_to :category
          
      3. 
        
      
      
        
      
          
    3. 
            1
            

            

              belongs_to :book
          
      4. 
        
      
      
        
      
          
    4. 
=======
=======
<<<<<<< HEAD
>>>>>>> bc6bc8d2 (Rebased)
=======
<<<<<<< HEAD
>>>>>>> d52f9efe (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> c12b71de (Featire specs)
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> b904d7ae (Featire specs)
=======
=======
>>>>>>> 5b7749a (Fix)
>>>>>>> ef483b6d (Fix)
          
    5. 
>>>>>>> 11792758 (Rebased)
            
            

            

            
          
      6. 
        
      
      
        
      
          
    6. 
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> e055dd0 (Rebased)
=======
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 973ba8c (Featire specs)
=======
>>>>>>> 8181d13 (Featire specs)
=======
>>>>>>> 72b9cab (Featire specs)
=======
>>>>>>> 15c51b7 (Featire specs)
=======
>>>>>>> 9e081dc (Fix)
          
    7. 
>>>>>>> 311e9fa (Rebased)
            1
            

            

              validates :title, :description, :year_of_publication, :materials, :dimensions, presence: true
=======
<<<<<<< HEAD
              validates :title, :description, :year_of_publication, :materials, :dimensions, presence: true
=======
              validates :year_of_publication, :materials, :dimensions, presence: true
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 824bb2b (Featire specs)
          
      8. 
        
      
      
        
      
<<<<<<< HEAD
          
    8. 
=======
          
    9. 
>>>>>>> 824bb2b (Featire specs)
=======
          
    10. 
>>>>>>> 6da9530 (Featire specs)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
              validates :price_cents, :quantity, presence: true,
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
              validates :price_cents, :quantity, presence: true,
=======
              validates :price, :quantity, presence: true,
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 659083f (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
              validates :price, :quantity, presence: true,
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
              validates :price, :quantity, presence: true,
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
              validates :price, :quantity, presence: true,
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
=======
              validates :price, :quantity, presence: true,
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
              validates :price, :quantity, presence: true,
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 6da9530 (Featire specs)
=======
=======
              validates :price, :quantity, presence: true,
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
=======
=======
              validates :price, :quantity, presence: true,
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
              validates :price, :quantity, presence: true,
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
=======
=======
=======
              validates :price, :quantity, presence: true,
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
=======
=======
=======
              validates :price, :quantity, presence: true,
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
          
      11. 
        
      
      
        
      
          
    11. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
                                                 numericality:
=======
                                           numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 }
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 659083f (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
                                           numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 }
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
                                           numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 }
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
                                           numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
=======
                                           numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 }
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6da9530 (Featire specs)
=======
=======
                                           numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
=======
=======
                                           numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 }
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
                                           numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 }
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
=======
=======
=======
                                           numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
=======
=======
=======
                                           numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 }
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
          
      12. 
        
      
      
        
      
          
    12. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
                                             { greater_than_or_equal_to: Constants::MIN_PRICE_IN_CENTS,
>>>>>>> 824bb2b (Featire specs)
=======
                                             { greater_than_or_equal_to: Constants::MIN_PRICE_IN_CENTS,
>>>>>>> 6da9530 (Featire specs)
          
      13. 
        
      
      
        
      
          
    13. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
                                                 numericality:
=======
                                               less_than_or_equal_to: Constants::MAX_PRICE_IN_CENTS }
>>>>>>> 824bb2b (Featire specs)
=======
                                               less_than_or_equal_to: Constants::MAX_PRICE_IN_CENTS }
>>>>>>> 6da9530 (Featire specs)
          
      14. 
        
      
      
        
      
          
    14. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
                                             { greater_than_or_equal_to: Constants::MIN_PRICE_IN_CENTS,
          
      15. 
        
      
      
        
      
          
    15. 
            
            

            

                                               less_than_or_equal_to: Constants::MAX_PRICE_IN_CENTS }
          
      16. 
        
      
      
        
      
          
    16. 
            
            

            

=======
=======
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
            end
          
      17.

    app/models/books_category.rb

    100.0% lines covered

    4 relevant lines. 4 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
=======
          
    2. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
    3. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
    4. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
    5. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
          
    6. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
    7. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
    8. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
    9. 
>>>>>>> 08edf50 (Featire specs)
=======
          
    10. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
            class BooksCategory < ApplicationRecord
          
      11. 
        
      
      
        
      
          
    11. 
            1
            

            

              belongs_to :category
          
      12. 
        
      
      
        
      
          
    12. 
            1
            

            

              belongs_to :book
          
      13. 
        
      
      
        
      
          
    13. 
            
            

            

            
          
      14. 
        
      
      
        
      
          
    14. 
            1
            

            

              validates :category, :book, presence: true
          
      15. 
        
      
      
        
      
          
    15. 
            
            

            

=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
            end
          
      16.

    app/models/books_category.rb

    100.0% lines covered

    4 relevant lines. 4 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            class BooksCategory < ApplicationRecord
          
      2. 
        
      
      
        
      
          
    2. 
            1
            

            

              belongs_to :category
          
      3. 
        
      
      
        
      
          
    3. 
            1
            

            

              belongs_to :book
          
      4. 
        
      
      
        
      
          
    4. 
=======
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
          
    5. 
>>>>>>> 49e8a6c (Rebased)
            
            

            

            
          
      6. 
        
      
      
        
      
          
    6. 
=======
          
    7. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
    8. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
    9. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
=======
=======
          
    10. 
>>>>>>> 08edf50 (Featire specs)
=======
          
    11. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
    12. 
>>>>>>> 4552227 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 5b7749a (Fix)
            1
            

            

<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              validates :title, :description, :year_of_publication, :materials, :dimensions, presence: true
=======
              validates :price, :quantity, presence: true,
>>>>>>> d0dc1f1 (Featire specs)
=======
              validates :price, :quantity, presence: true,
>>>>>>> 752f0c0 (Featire specs)
=======
              validates :price, :quantity, presence: true,
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
              validates :price, :quantity, presence: true,
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
              validates :price, :quantity, presence: true,
>>>>>>> 08edf50 (Featire specs)
=======
              validates :price, :quantity, presence: true,
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
              validates :price, :quantity, presence: true,
>>>>>>> 4552227 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
=======
              has_many_attached :images
          
      13. 
        
      
      
        
      
          
    13. 
            
            

            

            
          
      14. 
        
      
      
        
      
          
    14. 
            1
            

            

              validates :title, :description, :year_of_publication, :materials, :dimensions, presence: true
>>>>>>> 5b7749a (Fix)
          
      15. 
        
      
      
        
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
          
    15. 
            1
=======
          
    16. 
            
>>>>>>> d0dc1f1 (Featire specs)
=======
          
    17. 
            
>>>>>>> 752f0c0 (Featire specs)
=======
          
    18. 
            
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
    19. 
            
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
    20. 
            
>>>>>>> 7a02bbe (Featire specs)
=======
          
    21. 
            
>>>>>>> 4552227 (Featire specs)
=======
          
    22. 
            1
>>>>>>> 5b7749a (Fix)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
              validates :price_cents, :quantity, presence: true,
=======
                                           numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 }
>>>>>>> d0dc1f1 (Featire specs)
=======
                                           numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 }
>>>>>>> 752f0c0 (Featire specs)
=======
                                           numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 }
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
                                           numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 }
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                                           numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 }
>>>>>>> 08edf50 (Featire specs)
=======
                                           numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                                           numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 }
>>>>>>> 4552227 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
          
      23. 
        
      
      
        
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
          
    23. 
            
            

            

                                                 numericality:
          
      24. 
        
      
      
        
      
          
    24. 
            
            

            

                                             { greater_than_or_equal_to: Constants::MIN_PRICE_IN_CENTS,
=======
              validates :price_cents, :quantity, presence: true,
>>>>>>> 5b7749a (Fix)
          
      25. 
        
      
      
        
      
          
    25. 
            
            

            

                                                 numericality:
          
      26. 
        
      
      
        
      
          
    26. 
<<<<<<< HEAD
=======
          
    27. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
    28. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
    29. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
          
    30. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
    31. 
>>>>>>> 08edf50 (Featire specs)
=======
          
    32. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
    33. 
>>>>>>> 4552227 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
=======
            
            

            

                                             { greater_than_or_equal_to: Constants::MIN_PRICE_IN_CENTS,
          
      34. 
        
      
      
        
      
          
    34. 
            
            

            

                                               less_than_or_equal_to: Constants::MAX_PRICE_IN_CENTS }
          
      35. 
        
      
      
        
      
          
    35. 
>>>>>>> 5b7749a (Fix)
            
            

            

=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 6da9530 (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
            end
          
      36.

    app/models/books_category.rb

    100.0% lines covered

    4 relevant lines. 4 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            class BooksCategory < ApplicationRecord
          
      2. 
        
      
      
        
      
          
    2. 
            1
            

            

              belongs_to :category
          
      3. 
        
      
      
        
      
          
    3. 
            1
            

            

              belongs_to :book
          
      4. 
        
      
      
        
      
          
    4. 
            
            

            

            
          
      5. 
        
      
      
        
      
          
    5. 
            1
            

            

              validates :category, :book, presence: true
          
      6. 
        
      
      
        
      
          
    6. 
            
            

            

=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
            end
          
      7.

    app/models/books_category.rb

    100.0% lines covered

    4 relevant lines. 4 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            class BooksCategory < ApplicationRecord
          
      2. 
        
      
      
        
      
          
    2. 
            1
            

            

              belongs_to :category
          
      3. 
        
      
      
        
      
          
    3. 
            1
            

            

              belongs_to :book
          
      4. 
        
      
      
        
      
          
    4. 
=======
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> 1d59aaa (Fix)
          
    5. 
>>>>>>> 49e8a6c (Rebased)
            
            

            

            
          
      6. 
        
      
      
        
      
          
    6. 
            1
            

            

              has_many_attached :images
          
      7. 
        
      
      
        
      
          
    7. 
            
            

            

            
          
      8. 
        
      
      
        
      
          
    8. 
            1
            

            

              validates :title, :description, :year_of_publication, :materials, :dimensions, presence: true
          
      9. 
        
      
      
        
      
          
    9. 
            1
            

            

              validates :price_cents, :quantity, presence: true,
          
      10. 
        
      
      
        
      
          
    10. 
            
            

            

                                                 numericality:
          
      11. 
        
      
      
        
      
          
    11. 
            
            

            

                                             { greater_than_or_equal_to: Constants::MIN_PRICE_IN_CENTS,
          
      12. 
        
      
      
        
      
          
    12. 
            
            

            

                                               less_than_or_equal_to: Constants::MAX_PRICE_IN_CENTS }
          
      13. 
        
      
      
        
      
          
    13. 
            
            

            

=======
>>>>>>> 2a25e4c (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
            end
          
      14.

    app/models/books_category.rb

    100.0% lines covered

    4 relevant lines. 4 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            class BooksCategory < ApplicationRecord
          
      2. 
        
      
      
        
      
          
    2. 
            1
            

            

              belongs_to :category
          
      3. 
        
      
      
        
      
          
    3. 
            1
            

            

              belongs_to :book
          
      4. 
        
      
      
        
      
          
    4. 
            
            

            

            
          
      5. 
        
      
      
        
      
          
    5. 
            1
            

            

              validates :category, :book, presence: true
          
      6. 
        
      
      
        
      
          
    6. 
            
            

            

            end
          
      7.

    app/models/category.rb

    100.0% lines covered

    4 relevant lines. 4 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            class Category < ApplicationRecord
          
      2. 
        
      
      
        
      
          
    2. 
            1
            

            

              has_many :books_categories, dependent: :destroy
          
      3. 
        
      
      
        
      
          
    3. 
            1
            

            

              has_many :books, through: :books_categories
          
      4. 
        
      
      
        
      
          
    4. 
            
            

            

            
          
      5. 
        
      
      
        
      
          
    5. 
            1
            

            

              validates :name, presence: true
          
      6. 
        
      
      
        
      
          
    6. 
            
            

            

            end
          
      7.
    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= >>>>>>> 6066f925 (Add login registration pages) ======= >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> e59c273d (Manifest_cache true) ======= >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= >>>>>>> ed8ea634 (Add login registration pages) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 7afa007b (Manifest_cache true) ======= >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2be0d057 (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 4367ccb1 (Manifest_cache true) ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 4fac471d (Manifest_cache true) ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> d365be68 (Manifest_cache true) ======= >>>>>>> e1ecabbe (Featire specs) ======= <<<<<<< HEAD ======= ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> 78717cc (Manifest_cache true) ======= >>>>>>> 98beee2 (Manifest_cache true) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 385b8df (Manifest_cache true) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> 7bc7f9f (Manifest_cache true) ======= >>>>>>> 156ffe6 (Add login registration pages) ======= >>>>>>> adc21e0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= >>>>>>> 156ffe6 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= >>>>>>> adc21e0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= >>>>>>> 84d0df6 (Manifest_cache true) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) ======= <<<<<<< HEAD ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> 4d90e3d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 450f4e3 (Manifest_cache true) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= >>>>>>> c5efe8e (Add login registration pages) ======= >>>>>>> aa3618b (Rebased) ======= >>>>>>> 160fb15 (Fix) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> fb61c5a (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 1cce66c (Manifest_cache true) ======= >>>>>>> afa56d1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= >>>>>>> c5efe8e (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= >>>>>>> aa3618b (Rebased) ======= <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 160fb15 (Fix) ======= <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= ======= >>>>>>> f92a45b (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 715fac2 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> 852864e (Add login registration pages) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> add330c (Manifest_cache true) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> 551f3c1 (Add login registration pages) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 15bff2e (Manifest_cache true) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> ccec311 (Add login registration pages) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> 6c71f00 (Manifest_cache true) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 8c3e531 (Add login registration pages) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 0b43b18 (Manifest_cache true) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= <<<<<<< HEAD ======= ======= >>>>>>> ebcdce06 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= >>>>>>> 73dcd461 (Add login registration pages) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 03c0867 (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) =======
    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> 73dcd461 (Add login registration pages) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> f92a45b (Featire specs) ======= >>>>>>> fb61c5a (Featire specs) ======= >>>>>>> 8d4ec55 (Add login registration pages) =======
    ======= ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> f8e5c9db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= ======= >>>>>>> 0ed7f7c (Featire specs) >>>>>>> ecb02dbf (Featire specs) >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) >>>>>>> 304cd28a (Manifest_cache true) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> bd30d038 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> d4235040 (Manifest_cache true) ======= ======= >>>>>>> b3f2049 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0e864a5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> cc390719 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3be4d14 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1b8f36d8 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> a71befd (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8a3779d4 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 551c6ab (Manifest_cache true) <<<<<<< HEAD >>>>>>> 56531f25 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> fd310ed (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86229876 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD >>>>>>> 852864e (Add login registration pages) <<<<<<< HEAD >>>>>>> 1d11874 (Add login registration pages) <<<<<<< HEAD >>>>>>> ff4c2fe0 (Add login registration pages) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 42e9c2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> 16ebb0ff (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 0b43b18 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1cce66c (Manifest_cache true) <<<<<<< HEAD >>>>>>> d365be68 (Manifest_cache true) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) >>>>>>> afa56d1 (Featire specs) >>>>>>> e1ecabbe (Featire specs)
    >>>>>>> c033601 (Rebased) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)
    >>>>>>> c033601 (Rebased) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
    >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> e18eb87 (Fix) ======= <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= >>>>>>> 29e1af94 (Add login registration pages) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= ======= >>>>>>> e011b0df (Add login registration pages) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= >>>>>>> c871248 (Add login registration pages) ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a8b17c32 (Add login registration pages) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e011b0df (Add login registration pages) ======= >>>>>>> 2612be03 (Featire specs) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> e18eb87 (Fix) >>>>>>> 99dad91f (Fix)
    =======
    =======
    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 6a9fede (Add login registration pages) >>>>>>> f416f45 (Add login registration pages)
    =======
    =======
    =======
    ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= ======= ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 6a9fede (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= >>>>>>> c871248 (Add login registration pages) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs)
    =======
    =======
    <<<<<<< HEAD <<<<<<< HEAD =======
    ======= ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) ======= ======= >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> c871248 (Add login registration pages) ======= ======= ======= ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> b15044a (Manifest_cache true) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6a9fede (Add login registration pages)
    =======
    =======
    =======
    ======= >>>>>>> 715fac2 (Featire specs) ======= =======

    app/models/user.rb

    100.0% ======= <<<<<<< HEAD ======= ======= >>>>>>> 7375d4b (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs)

    app/queries/book_query.rb

    85.71% <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) lines covered

    2 relevant lines. 2 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            class User < ApplicationRecord
          
      2. 
        
      
      
        
      
          
    2. 
            
            

            

              # Include default devise modules. Others available are:
          
      3. 
        
      
      
        
      
          
    3. 
            
            

            

              # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
          
      4. 
        
      
      
        
      
          
    4. 
            1
            

            

              devise :database_authenticatable, :registerable,
          
      5. 
        
      
      
        
      
          
    5. 
            
            

            

                     :recoverable, :rememberable, :validatable,
          
      6. 
        
      
      
        
      
          
    6. 
            
            

            

                     :confirmable, :lockable, :timeoutable, :trackable,
          
      7. 
        
      
      
        
      
          
    7. 
            
            

            

                     :omniauthable
          
      8. 
        
      
      
        
      
          
    8. 
            
            

            

            end
          
      9.
    >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 03c0867 (Add login registration pages)

    app/models/user.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            class User < ApplicationRecord
          
      2. 
        
      
      
        
      
          
    2. 
            
            

            

              # Include default devise modules. Others available are:
          
      3. 
        
      
      
        
      
          
    3. 
            
            

            

              # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
          
      4. 
        
      
      
        
      
          
    4. 
            1
            

            

              devise :database_authenticatable, :registerable,
          
      5. 
        
      
      
        
      
          
    5. 
            
            

            

                     :recoverable, :rememberable, :validatable,
          
      6. 
        
      
      
        
      
          
    6. 
            
            

            

                     :confirmable, :lockable, :timeoutable, :trackable,
          
      7. 
        
      
      
        
      
          
    7. 
            
            

            

                     :omniauthable
          
      8. 
        
      
      
        
      
          
    8. 
            
            

            

            end
          
      9.
    <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 2ee03d3 (Featire specs)
    >>>>>>> 26b462d (Add login registration pages)

    app/models/user.rb

    <<<<<<< HEAD 100.0% ======= 85.71% <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 2ee03d3 (Featire specs) lines covered

    2 relevant lines. 2 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            class User < ApplicationRecord
          
      2. 
        
      
      
        
      
          
    2. 
            
            

            

              # Include default devise modules. Others available are:
          
      3. 
        
      
      
        
      
          
    3. 
            
            

            

              # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
          
      4. 
        
      
      
        
      
          
    4. 
            1
            

            

              devise :database_authenticatable, :registerable,
          
      5. 
        
      
      
        
      
          
    5. 
            
            

            

                     :recoverable, :rememberable, :validatable,
          
      6. 
        
      
      
        
      
          
    6. 
            
            

            

                     :confirmable, :lockable, :timeoutable, :trackable,
          
      7. 
        
      
      
        
      
          
    7. 
            
            

            

                     :omniauthable
          
      8. 
        
      
      
        
      
          
    8. 
            
            

            

            end
          
      9.
    >>>>>>> e1f4d17 (Add login registration pages)

    app/models/user.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            class User < ApplicationRecord
          
      2. 
        
      
      
        
      
          
    2. 
            
            

            

              # Include default devise modules. Others available are:
          
      3. 
        
      
      
        
      
          
    3. 
            
            

            

              # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
          
      4. 
        
      
      
        
      
          
    4. 
            1
            

            

              devise :database_authenticatable, :registerable,
          
      5. 
        
      
      
        
      
          
    5. 
            
            

            

                     :recoverable, :rememberable, :validatable,
          
      6. 
        
      
      
        
      
          
    6. 
            
            

            

                     :confirmable, :lockable, :timeoutable, :trackable,
          
      7. 
        
      
      
        
      
          
    7. 
            
            

            

                     :omniauthable
          
      8. 
        
      
      
        
      
          
    8. 
            
            

            

            end
          
      9.
    >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 551f3c1 (Add login registration pages) <<<<<<< HEAD >>>>>>> 06e5e41 (Add login registration pages) ======= ======= =======
    >>>>>>> 1d59aaa (Fix) >>>>>>> 9e081dc (Fix)

    app/models/coupon.rb

    100.0% <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 7375d4b (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 563720e (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= =======
    ======= lines covered

    2 relevant lines. 2 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            class Coupon < ApplicationRecord
          
      2. 
        
      
      
        
      
          
    2. 
            1
            

            

              belongs_to :order, optional: true
          
      3. 
        
      
      
        
      
          
    3. 
            
            

            

            end
          
      4.

    app/models/order.rb

    100.0% lines covered

    4 relevant lines. 4 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            class Order < ApplicationRecord
          
      2. 
        
      
      
        
      
          
    2. 
            1
            

            

              has_many :order_books, dependent: :destroy
          
      3. 
        
      
      
        
      
          
    3. 
            1
            

            

              has_many :books, through: :order_books
          
      4. 
        
      
      
        
      
          
    4. 
            
            

            

            
          
      5. 
        
      
      
        
      
          
    5. 
            1
            

            

              has_one :coupon, dependent: :nullify
          
      6. 
        
      
      
        
      
          
    6. 
            
            

            

            end
          
      7.

    app/models/order_book.rb

    100.0% lines covered

    3 relevant lines. 3 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            class OrderBook < ApplicationRecord
          
      2. 
        
      
      
        
      
          
    2. 
            1
            

            

              belongs_to :order
          
      3. 
        
      
      
        
      
          
    3. 
            1
            

            

              belongs_to :book
          
      4. 
        
      
      
        
      
          
    4. 
            
            

            

            end
          
      5.
    >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix)

    app/models/user.rb

    100.0% lines covered

    <<<<<<< HEAD 2 relevant lines. 2 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            class User < ApplicationRecord
          
      2. 
        
      
      
        
      
          
    2. 
            
            

            

              # Include default devise modules. Others available are:
          
      3. 
        
      
      
        
      
          
    3. 
            
            

            

              # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
          
      4. 
        
      
      
        
      
          
    4. 
            1
            

            

              devise :database_authenticatable, :registerable,
          
      5. 
        
      
      
        
      
          
    5. 
            
            

            

                     :recoverable, :rememberable, :validatable,
          
      6. 
        
      
      
        
      
          
    6. 
            
            

            

                     :confirmable, :lockable, :timeoutable, :trackable,
          
      7. 
        
      
      
        
      
          
    7. 
            
            

            

                     :omniauthable
          
      8. 
        
      
      
        
      
          
    8. 
            
            

            

            end
          
      9.
    >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 852864e (Add login registration pages) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs)

    app/queries/book_query.rb

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 85.71% <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= 87.5% >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= 85.71% >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= 87.5% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= 85.71% >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= 87.5% >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) lines covered

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 2 relevant lines. 2 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            class User < ApplicationRecord
          
      2. 
        
      
      
        
      
          
    2. 
            
            

            

              # Include default devise modules. Others available are:
          
      3. 
        
      
      
        
      
          
    3. 
            
            

            

              # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
          
      4. 
        
      
      
        
      
          
    4. 
            1
            

            

              devise :database_authenticatable, :registerable,
          
      5. 
        
      
      
        
      
          
    5. 
            
            

            

                     :recoverable, :rememberable, :validatable,
          
      6. 
        
      
      
        
      
          
    6. 
            
            

            

                     :confirmable, :lockable, :timeoutable, :trackable,
          
      7. 
        
      
      
        
      
          
    7. 
            
            

            

                     :omniauthable
          
      8. 
        
      
      
        
      
          
    8. 
            
            

            

            end
          
      9.
    <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7d58507 (Add login registration pages)
    >>>>>>> e1f4d17 (Add login registration pages)

    app/models/user.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            class User < ApplicationRecord
          
      2. 
        
      
      
        
      
          
    2. 
            
            

            

              # Include default devise modules. Others available are:
          
      3. 
        
      
      
        
      
          
    3. 
            
            

            

              # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
          
      4. 
        
      
      
        
      
          
    4. 
            1
            

            

              devise :database_authenticatable, :registerable,
          
      5. 
        
      
      
        
      
          
    5. 
            
            

            

                     :recoverable, :rememberable, :validatable,
          
      6. 
        
      
      
        
      
          
    6. 
            
            

            

                     :confirmable, :lockable, :timeoutable, :trackable,
          
      7. 
        
      
      
        
      
          
    7. 
            
            

            

                     :omniauthable
          
      8. 
        
      
      
        
      
          
    8. 
            
            

            

            end
          
      9.
    >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57a2e05 (Add login registration pages) =======
    >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> e18eb87 (Fix) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix)

    app/models/user.rb

    100.0% <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 0c57e4e (Fix) ======= <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 7375d4b (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======

    app/models/user.rb

    100.0% ======= >>>>>>> a5d032d (Fix) lines covered

    <<<<<<< HEAD 2 relevant lines. 2 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            class User < ApplicationRecord
          
      2. 
        
      
      
        
      
          
    2. 
            
            

            

              # Include default devise modules. Others available are:
          
      3. 
        
      
      
        
      
          
    3. 
            
            

            

              # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
          
      4. 
        
      
      
        
      
          
    4. 
            1
            

            

              devise :database_authenticatable, :registerable,
          
      5. 
        
      
      
        
      
          
    5. 
            
            

            

                     :recoverable, :rememberable, :validatable,
          
      6. 
        
      
      
        
      
          
    6. 
            
            

            

                     :confirmable, :lockable, :timeoutable, :trackable,
          
      7. 
        
      
      
        
      
          
    7. 
            
            

            

                     :omniauthable
          
      8. 
        
      
      
        
      
          
    8. 
            
            

            

            end
          
      9.
    >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> b28889f (Fix) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs)

    app/queries/book_query.rb

    <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 5506bd0 (Featire specs) 85.71% <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 0ed7f7c (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) ======= ======= ======= 87.5% >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 85.71% >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) ======= ======= ======= 87.5% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) lines covered

    <<<<<<< HEAD <<<<<<< HEAD 2 relevant lines. 2 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            class User < ApplicationRecord
          
      2. 
        
      
      
        
      
          
    2. 
            
            

            

              # Include default devise modules. Others available are:
          
      3. 
        
      
      
        
      
          
    3. 
            
            

            

              # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
          
      4. 
        
      
      
        
      
          
    4. 
            1
            

            

              devise :database_authenticatable, :registerable,
          
      5. 
        
      
      
        
      
          
    5. 
            
            

            

                     :recoverable, :rememberable, :validatable,
          
      6. 
        
      
      
        
      
          
    6. 
            
            

            

                     :confirmable, :lockable, :timeoutable, :trackable,
          
      7. 
        
      
      
        
      
          
    7. 
            
            

            

                     :omniauthable
          
      8. 
        
      
      
        
      
          
    8. 
            
            

            

            end
          
      9.
    >>>>>>> 26b462d (Add login registration pages)

    app/models/user.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            class User < ApplicationRecord
          
      2. 
        
      
      
        
      
          
    2. 
            
            

            

              # Include default devise modules. Others available are:
          
      3. 
        
      
      
        
      
          
    3. 
            
            

            

              # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
          
      4. 
        
      
      
        
      
          
    4. 
            1
            

            

              devise :database_authenticatable, :registerable,
          
      5. 
        
      
      
        
      
          
    5. 
            
            

            

                     :recoverable, :rememberable, :validatable,
          
      6. 
        
      
      
        
      
          
    6. 
            
            

            

                     :confirmable, :lockable, :timeoutable, :trackable,
          
      7. 
        
      
      
        
      
          
    7. 
            
            

            

                     :omniauthable
          
      8. 
        
      
      
        
      
          
    8. 
            
            

            

            end
          
      9.
    >>>>>>> e1f4d17 (Add login registration pages)

    app/models/user.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            class User < ApplicationRecord
          
      2. 
        
      
      
        
      
          
    2. 
            
            

            

              # Include default devise modules. Others available are:
          
      3. 
        
      
      
        
      
          
    3. 
            
            

            

              # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
          
      4. 
        
      
      
        
      
          
    4. 
            1
            

            

              devise :database_authenticatable, :registerable,
          
      5. 
        
      
      
        
      
          
    5. 
            
            

            

                     :recoverable, :rememberable, :validatable,
          
      6. 
        
      
      
        
      
          
    6. 
            
            

            

                     :confirmable, :lockable, :timeoutable, :trackable,
          
      7. 
        
      
      
        
      
          
    7. 
            
            

            

                     :omniauthable
          
      8. 
        
      
      
        
      
          
    8. 
            
            

            

            end
          
      9.
    >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> 0561be1d (Add login registration pages) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs)

    app/models/user.rb

    <<<<<<< HEAD =======

    app/models/review.rb

    >>>>>>> aca90e3 (Rebased) ======= >>>>>>> 9bfbd88 (Featire specs) ======= ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> a8b17c32 (Add login registration pages) ======= ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 31507b8 (Add login registration pages)

    app/models/user.rb

    >>>>>>> fdab719f (Fix) ======= ======= =======
    >>>>>>> 5b7749a (Fix)

    app/models/coupon.rb

    >>>>>>> ef483b6d (Fix)

    100.0% <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 49f2e24 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 5506bd0 (Featire specs) 7 relevant lines. >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 7375d4b (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 563720e (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs)

    app/queries/book_query.rb

    85.71% <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 5b7749a (Fix) lines covered

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 2 relevant lines. 2 lines covered and ======= 7 relevant lines. 7 lines covered and >>>>>>> aca90e3 (Rebased) ======= 2 relevant lines. 2 lines covered and >>>>>>> fdab719f (Fix) 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
            class Review < ApplicationRecord
          
      2. 
        
      
      
        
      
          
    2. 
            1
            

            

              belongs_to :user
          
      3. 
        
      
      
        
      
          
    3. 
            1
            

            

              belongs_to :book
          
      4. 
        
      
      
        
      
          
    4. 
            
            

            

            
          
      5. 
        
      
      
        
      
          
    5. 
            1
            

            

              validates :title, presence: true, length: { maximum: Constants::VALIDATES_TITLE_LENGTH_MAX },
          
      6. 
        
      
      
        
      
          
    6. 
            
            

            

                                format: { with: %r{\A[A-Za-z0-9!#$%&'*+-/=?^_`{|}~. ]+\z}, message: I18n.t('review.errors.title') }
          
      7. 
        
      
      
        
      
          
    7. 
            1
            

            

              validates :body, presence: true, length: { maximum: Constants::VALIDATES_TEXT_LENGTH_MAX },
          
      8. 
        
      
      
        
      
          
    8. 
            
            

            

                               format: { with: %r{\A[A-Za-z0-9!#$%&'*+-/=?^_`{|}~. ]+\z}, message: I18n.t('review.errors.body') }
          
      9. 
        
      
      
        
      
          
    9. 
            
            

            

            
          
      10. 
        
      
      
        
      
          
    10. 
            1
            

            

              validates :verified, inclusion: { in: [true, false] }, presence: true
          
      11. 
        
      
      
        
      
          
    11. 
            1
            

            

              validates :rating,
          
      12. 
        
      
      
        
      
          
    12. 
            
            

            

                        numericality: {
          
      13. 
        
      
      
        
      
          
    13. 
            
            

            

                          greater_than_or_equal_to: Constants::STAR_MIN,
          
      14. 
        
      
      
        
      
          
    14. 
            
            

            

                          less_than_or_equal_to: Constants::STAR_MAX
          
      15. 
        
      
      
        
      
          
    15. 
            
            

            

                        }, presence: true
          
      16. 
        
      
      
        
      
          
    16. 
            
            

            

            end
          
      17.

    app/models/shipping.rb

    100.0% lines covered

    1 relevant lines. 1 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            class Shipping < Address
          
      2. 
        
      
      
        
      
          
    2. 
            
            

            

            end
          
      3.

    app/models/user.rb

    50.0% lines covered

    12 relevant lines. 6 lines covered and 6 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

>>>>>>> aca90e3 (Rebased)
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> ef483b6d (Fix)
            class User < ApplicationRecord
=======
            class Coupon < ApplicationRecord
>>>>>>> 5b7749a (Fix)
          
      2. 
        
      
      
        
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> ef483b6d (Fix)
          
    2. 
            
            

            

              # Include default devise modules. Others available are:
          
      3. 
        
      
      
        
      
          
    3. 
            
            

            

              # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
          
      4. 
        
      
      
        
      
          
    4. 
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
    5. 
>>>>>>> aca90e3 (Rebased)
=======
>>>>>>> fdab719f (Fix)
=======
=======
          
    6. 
>>>>>>> 5b7749a (Fix)
>>>>>>> ef483b6d (Fix)
            1
            

            

<<<<<<< HEAD
              devise :database_authenticatable, :registerable,
=======
              belongs_to :order, optional: true
>>>>>>> 5b7749a (Fix)
          
      7. 
        
      
      
        
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ef483b6d (Fix)
          
    7. 
=======
          
    8. 
>>>>>>> aca90e3 (Rebased)
=======
          
    9. 
>>>>>>> fdab719f (Fix)
            
            

            

                     :recoverable, :rememberable, :validatable,
          
      10. 
        
      
      
        
      
<<<<<<< HEAD
<<<<<<< HEAD
          
    10. 
=======
          
    11. 
>>>>>>> aca90e3 (Rebased)
=======
          
    12. 
>>>>>>> fdab719f (Fix)
            
            

            

                     :confirmable, :lockable, :timeoutable, :trackable,
          
      13. 
        
      
      
        
      
<<<<<<< HEAD
<<<<<<< HEAD
          
    13. 
=======
          
    14. 
>>>>>>> aca90e3 (Rebased)
=======
          
    15. 
>>>>>>> fdab719f (Fix)
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
                     :omniauthable
=======
                     :omniauthable, omniauth_providers: [:facebook]
>>>>>>> aca90e3 (Rebased)
=======
                     :omniauthable
>>>>>>> fdab719f (Fix)
          
      16. 
        
      
      
        
      
<<<<<<< HEAD
<<<<<<< HEAD
          
    16. 
=======
<<<<<<< HEAD
          
    17. 
            
            

            

            
          
      18. 
        
      
      
        
      
          
    18. 
            1
            

            

              has_one :billing, dependent: :destroy
          
      19. 
        
      
      
        
      
          
    19. 
            1
            

            

              has_one :shipping, dependent: :destroy
          
      20. 
        
      
      
        
      
          
    20. 
            
            

            

            
          
      21. 
        
      
      
        
      
          
    21. 
            1
            

            

              has_many :reviews, dependent: :destroy
          
      22. 
        
      
      
        
      
          
    22. 
            
            

            

            
          
      23. 
        
      
      
        
      
          
    23. 
            1
            

            

              def self.from_omniauth(auth)
          
      24. 
        
      
      
        
      
          
    24. 
            
            

            

                where(provider: auth.provider, uid: auth.uid).first_or_create do |user|
          
      25. 
        
      
      
        
      
          
    25. 
            
            

            

                  user.provider = auth.provider
          
      26. 
        
      
      
        
      
          
    26. 
            
            

            

                  user.uid = auth.uid
          
      27. 
        
      
      
        
      
          
    27. 
            
            

            

                  user.name = auth.info.name
          
      28. 
        
      
      
        
      
          
    28. 
            
            

            

                  user.email = auth.info.email
          
      29. 
        
      
      
        
      
          
    29. 
            
            

            

                  user.password = Devise.friendly_token[0, 20]
          
      30. 
        
      
      
        
      
          
    30. 
            
            

            

                end
          
      31. 
        
      
      
        
      
          
    31. 
            
            

            

              end
          
      32. 
        
      
      
        
      
          
    32. 
>>>>>>> aca90e3 (Rebased)
=======
          
    33. 
>>>>>>> fdab719f (Fix)
=======
          
    34. 
>>>>>>> 5b7749a (Fix)
>>>>>>> ef483b6d (Fix)
            
            

            

            end
          
      35.
    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    >>>>>>> 26b462d (Add login registration pages) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 7d58507 (Add login registration pages) >>>>>>> a8b17c32 (Add login registration pages)
    >>>>>>> e1f4d17 (Add login registration pages) =======

    app/models/order.rb

    100.0% lines covered

    4 relevant lines. 4 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            class Order < ApplicationRecord
          
      2. 
        
      
      
        
      
          
    2. 
            1
            

            

              has_many :order_books, dependent: :destroy
          
      3. 
        
      
      
        
      
          
    3. 
            1
            

            

              has_many :books, through: :order_books
          
      4. 
        
      
      
        
      
          
    4. 
            
            

            

            
          
      5. 
        
      
      
        
      
          
    5. 
            1
            

            

              has_one :coupon, dependent: :nullify
          
      6. 
        
      
      
        
      
          
    6. 
            
            

            

            end
          
      7.

    app/models/order_book.rb

    100.0% lines covered

    3 relevant lines. 3 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            class OrderBook < ApplicationRecord
          
      2. 
        
      
      
        
      
          
    2. 
            1
            

            

              belongs_to :order
          
      3. 
        
      
      
        
      
          
    3. 
            1
            

            

              belongs_to :book
          
      4. 
        
      
      
        
      
          
    4. 
            
            

            

            end
          
      5.
    >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix)

    app/models/user.rb

    100.0% lines covered

    <<<<<<< HEAD 2 relevant lines. 2 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            class User < ApplicationRecord
          
      2. 
        
      
      
        
      
          
    2. 
            
            

            

              # Include default devise modules. Others available are:
          
      3. 
        
      
      
        
      
          
    3. 
            
            

            

              # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
          
      4. 
        
      
      
        
      
          
    4. 
            1
            

            

              devise :database_authenticatable, :registerable,
          
      5. 
        
      
      
        
      
          
    5. 
            
            

            

                     :recoverable, :rememberable, :validatable,
          
      6. 
        
      
      
        
      
          
    6. 
            
            

            

                     :confirmable, :lockable, :timeoutable, :trackable,
          
      7. 
        
      
      
        
      
          
    7. 
            
            

            

                     :omniauthable
          
      8. 
        
      
      
        
      
          
    8. 
            
            

            

            end
          
      9.
    <<<<<<< HEAD ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
    >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57a2e05 (Add login registration pages) =======
    >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) >>>>>>> 8288136d (Fix)

    app/models/user.rb

    <<<<<<< HEAD 100.0% ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) 85.71% >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 557c1b8 (Fix) ======= <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 7375d4b (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) ======= <<<<<<< HEAD ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs)

    app/models/user.rb

    100.0% <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) ======= 87.5% >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= 85.71% >>>>>>> 7a02bbe (Featire specs) ======= 87.5% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= 85.71% >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= 87.5% >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) lines covered

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) 2 relevant lines. 2 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            class User < ApplicationRecord
          
      2. 
        
      
      
        
      
          
    2. 
            
            

            

              # Include default devise modules. Others available are:
          
      3. 
        
      
      
        
      
          
    3. 
            
            

            

              # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
          
      4. 
        
      
      
        
      
          
    4. 
            1
            

            

              devise :database_authenticatable, :registerable,
          
      5. 
        
      
      
        
      
          
    5. 
            
            

            

                     :recoverable, :rememberable, :validatable,
          
      6. 
        
      
      
        
      
          
    6. 
            
            

            

                     :confirmable, :lockable, :timeoutable, :trackable,
          
      7. 
        
      
      
        
      
          
    7. 
            
            

            

                     :omniauthable
          
      8. 
        
      
      
        
      
          
    8. 
            
            

            

            end
          
      9.
    >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> b28889f (Fix) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)

    app/queries/book_query.rb

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) 85.71% <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD ======= 85.71% <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= 85.71% <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= 87.5% >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 85.71% >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= ======= 87.5% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) lines covered

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) 2 relevant lines. 2 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            class User < ApplicationRecord
          
      2. 
        
      
      
        
      
          
    2. 
            
            

            

              # Include default devise modules. Others available are:
          
      3. 
        
      
      
        
      
          
    3. 
            
            

            

              # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
          
      4. 
        
      
      
        
      
          
    4. 
            1
            

            

              devise :database_authenticatable, :registerable,
          
      5. 
        
      
      
        
      
          
    5. 
            
            

            

                     :recoverable, :rememberable, :validatable,
          
      6. 
        
      
      
        
      
          
    6. 
            
            

            

                     :confirmable, :lockable, :timeoutable, :trackable,
          
      7. 
        
      
      
        
      
          
    7. 
            
            

            

                     :omniauthable
          
      8. 
        
      
      
        
      
          
    8. 
            
            

            

            end
          
      9.
    >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD

    app/models/user.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            class User < ApplicationRecord
          
      2. 
        
      
      
        
      
          
    2. 
            
            

            

              # Include default devise modules. Others available are:
          
      3. 
        
      
      
        
      
          
    3. 
            
            

            

              # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
          
      4. 
        
      
      
        
      
          
    4. 
            1
            

            

              devise :database_authenticatable, :registerable,
          
      5. 
        
      
      
        
      
          
    5. 
            
            

            

                     :recoverable, :rememberable, :validatable,
          
      6. 
        
      
      
        
      
          
    6. 
            
            

            

                     :confirmable, :lockable, :timeoutable, :trackable,
          
      7. 
        
      
      
        
      
          
    7. 
            
            

            

                     :omniauthable
          
      8. 
        
      
      
        
      
          
    8. 
            
            

            

            end
          
      9.
    >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD =======
    >>>>>>> 5b7749a (Fix)

    app/models/coupon.rb

    100.0% <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 7375d4b (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 563720e (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> aca90e3 (Rebased) >>>>>>> c7a726c5 (Rebased)

    app/queries/book_query.rb

    <<<<<<< HEAD 85.71% <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 5b7749a (Fix) lines covered

    2 relevant lines. 2 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

<<<<<<< HEAD
            class User < ApplicationRecord
=======
            class Coupon < ApplicationRecord
>>>>>>> 5b7749a (Fix)
          
      2. 
        
      
      
        
      
<<<<<<< HEAD
          
    2. 
            
            

            

              # Include default devise modules. Others available are:
          
      3. 
        
      
      
        
      
          
    3. 
            
            

            

              # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
          
      4. 
        
      
      
        
      
          
    4. 
=======
          
    5. 
>>>>>>> 5b7749a (Fix)
            1
            

            

<<<<<<< HEAD
              devise :database_authenticatable, :registerable,
=======
              belongs_to :order, optional: true
>>>>>>> 5b7749a (Fix)
          
      6. 
        
      
      
        
      
<<<<<<< HEAD
          
    6. 
            
            

            

                     :recoverable, :rememberable, :validatable,
          
      7. 
        
      
      
        
      
          
    7. 
            
            

            

                     :confirmable, :lockable, :timeoutable, :trackable,
          
      8. 
        
      
      
        
      
          
    8. 
            
            

            

                     :omniauthable
          
      9. 
        
      
      
        
      
          
    9. 
=======
          
    10. 
>>>>>>> 5b7749a (Fix)
            
            

            

            end
          
      11.
    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7d58507 (Add login registration pages)
    >>>>>>> e1f4d17 (Add login registration pages) =======

    app/models/order.rb

    100.0% lines covered

    4 relevant lines. 4 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            class Order < ApplicationRecord
          
      2. 
        
      
      
        
      
          
    2. 
            1
            

            

              has_many :order_books, dependent: :destroy
          
      3. 
        
      
      
        
      
          
    3. 
            1
            

            

              has_many :books, through: :order_books
          
      4. 
        
      
      
        
      
          
    4. 
            
            

            

            
          
      5. 
        
      
      
        
      
          
    5. 
            1
            

            

              has_one :coupon, dependent: :nullify
          
      6. 
        
      
      
        
      
          
    6. 
            
            

            

            end
          
      7.

    app/models/order_book.rb

    100.0% lines covered

    3 relevant lines. 3 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            class OrderBook < ApplicationRecord
          
      2. 
        
      
      
        
      
          
    2. 
            1
            

            

              belongs_to :order
          
      3. 
        
      
      
        
      
          
    3. 
            1
            

            

              belongs_to :book
          
      4. 
        
      
      
        
      
          
    4. 
            
            

            

            end
          
      5.
    >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix)

    app/models/user.rb

    100.0% lines covered

    <<<<<<< HEAD 2 relevant lines. 2 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            class User < ApplicationRecord
          
      2. 
        
      
      
        
      
          
    2. 
            
            

            

              # Include default devise modules. Others available are:
          
      3. 
        
      
      
        
      
          
    3. 
            
            

            

              # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
          
      4. 
        
      
      
        
      
          
    4. 
            1
            

            

              devise :database_authenticatable, :registerable,
          
      5. 
        
      
      
        
      
          
    5. 
            
            

            

                     :recoverable, :rememberable, :validatable,
          
      6. 
        
      
      
        
      
          
    6. 
            
            

            

                     :confirmable, :lockable, :timeoutable, :trackable,
          
      7. 
        
      
      
        
      
          
    7. 
            
            

            

                     :omniauthable
          
      8. 
        
      
      
        
      
          
    8. 
            
            

            

            end
          
      9.
    <<<<<<< HEAD ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
    >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57a2e05 (Add login registration pages) =======
    >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix)

    app/models/user.rb

    <<<<<<< HEAD 100.0% ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) 85.71% >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 557c1b8 (Fix) ======= <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 7375d4b (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) ======= <<<<<<< HEAD ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs)

    app/models/user.rb

    100.0% <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) ======= 87.5% >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= 85.71% >>>>>>> 7a02bbe (Featire specs) ======= 87.5% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= 85.71% >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= 87.5% >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= 90.0% >>>>>>> c7a726c5 (Rebased) lines covered

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) 2 relevant lines. 2 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            class User < ApplicationRecord
          
      2. 
        
      
      
        
      
          
    2. 
            
            

            

              # Include default devise modules. Others available are:
          
      3. 
        
      
      
        
      
          
    3. 
            
            

            

              # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
          
      4. 
        
      
      
        
      
          
    4. 
            1
            

            

              devise :database_authenticatable, :registerable,
          
      5. 
        
      
      
        
      
          
    5. 
            
            

            

                     :recoverable, :rememberable, :validatable,
          
      6. 
        
      
      
        
      
          
    6. 
            
            

            

                     :confirmable, :lockable, :timeoutable, :trackable,
          
      7. 
        
      
      
        
      
          
    7. 
            
            

            

                     :omniauthable
          
      8. 
        
      
      
        
      
          
    8. 
            
            

            

            end
          
      9.
    >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> b28889f (Fix) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)

    app/queries/book_query.rb

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) 85.71% <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD ======= 85.71% <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= 85.71% <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= 87.5% >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 85.71% >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= ======= 87.5% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) lines covered

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) 2 relevant lines. 2 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            class User < ApplicationRecord
          
      2. 
        
      
      
        
      
          
    2. 
            
            

            

              # Include default devise modules. Others available are:
          
      3. 
        
      
      
        
      
          
    3. 
            
            

            

              # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
          
      4. 
        
      
      
        
      
          
    4. 
            1
            

            

              devise :database_authenticatable, :registerable,
          
      5. 
        
      
      
        
      
          
    5. 
            
            

            

                     :recoverable, :rememberable, :validatable,
          
      6. 
        
      
      
        
      
          
    6. 
            
            

            

                     :confirmable, :lockable, :timeoutable, :trackable,
          
      7. 
        
      
      
        
      
          
    7. 
            
            

            

                     :omniauthable
          
      8. 
        
      
      
        
      
          
    8. 
            
            

            

            end
          
      9.
    >>>>>>> e1f4d17 (Add login registration pages) ======= >>>>>>> 56fd9d41 (Add login registration pages)

    app/models/user.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            class User < ApplicationRecord
          
      2. 
        
      
      
        
      
          
    2. 
            
            

            

              # Include default devise modules. Others available are:
          
      3. 
        
      
      
        
      
          
    3. 
            
            

            

              # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
          
      4. 
        
      
      
        
      
          
    4. 
            1
            

            

              devise :database_authenticatable, :registerable,
          
      5. 
        
      
      
        
      
          
    5. 
            
            

            

                     :recoverable, :rememberable, :validatable,
          
      6. 
        
      
      
        
      
          
    6. 
            
            

            

                     :confirmable, :lockable, :timeoutable, :trackable,
          
      7. 
        
      
      
        
      
          
    7. 
            
            

            

                     :omniauthable
          
      8. 
        
      
      
        
      
          
    8. 
            
            

            

            end
          
      9.
    >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57a2e05 (Add login registration pages) =======
    >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) =======
    >>>>>>> c033601 (Rebased) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= =======
    >>>>>>> c033601 (Rebased) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)

    app/models/review.rb

    100.0% <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 7375d4b (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) =======
    <<<<<<< HEAD =======

    app/models/user.rb

    100.0% ======= >>>>>>> a5d032d (Fix) lines covered

    <<<<<<< HEAD 2 relevant lines. 2 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            class User < ApplicationRecord
          
      2. 
        
      
      
        
      
          
    2. 
            
            

            

              # Include default devise modules. Others available are:
          
      3. 
        
      
      
        
      
          
    3. 
            
            

            

              # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
          
      4. 
        
      
      
        
      
          
    4. 
            1
            

            

              devise :database_authenticatable, :registerable,
          
      5. 
        
      
      
        
      
          
    5. 
            
            

            

                     :recoverable, :rememberable, :validatable,
          
      6. 
        
      
      
        
      
          
    6. 
            
            

            

                     :confirmable, :lockable, :timeoutable, :trackable,
          
      7. 
        
      
      
        
      
          
    7. 
            
            

            

                     :omniauthable
          
      8. 
        
      
      
        
      
          
    8. 
            
            

            

            end
          
      9.
    >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs)
    >>>>>>> bae2b7de (Add login registration pages)

    app/models/user.rb

    <<<<<<< HEAD 100.0% ======= >>>>>>> a5d032d (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) 85.71% <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= 87.5% >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= 85.71% >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= 87.5% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= 85.71% >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= 85.71% >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) lines covered

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 2 relevant lines. 2 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            class User < ApplicationRecord
          
      2. 
        
      
      
        
      
          
    2. 
            
            

            

              # Include default devise modules. Others available are:
          
      3. 
        
      
      
        
      
          
    3. 
            
            

            

              # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
          
      4. 
        
      
      
        
      
          
    4. 
            1
            

            

              devise :database_authenticatable, :registerable,
          
      5. 
        
      
      
        
      
          
    5. 
            
            

            

                     :recoverable, :rememberable, :validatable,
          
      6. 
        
      
      
        
      
          
    6. 
            
            

            

                     :confirmable, :lockable, :timeoutable, :trackable,
          
      7. 
        
      
      
        
      
          
    7. 
            
            

            

                     :omniauthable
          
      8. 
        
      
      
        
      
          
    8. 
            
            

            

            end
          
      9.
    >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs)

    app/queries/book_query.rb

    <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) 85.71% <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= ======= 87.5% >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 85.71% >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= 87.5% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= 85.71% >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) lines covered

    <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) 7 relevant lines. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= 7 relevant lines. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 99dad91f (Fix) ======= 7 relevant lines. <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> a2206025 (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> 8887ba5b (Fix) >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 0c57e4e (Fix) ======= ======= 7 relevant lines. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> 8887ba5b (Fix) ======= >>>>>>> 53db2224 (Featire specs) >>>>>>> 557c1b8 (Fix) ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b97bb382 (Featire specs) ======= >>>>>>> 4a2f2ad8 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= ======= >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8181d13 (Featire specs) >>>>>>> 4a2f2ad8 (Featire specs) 7 relevant lines. >>>>>>> a5d032d (Fix) ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ef483b6d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 7 relevant lines. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= ======= 7 relevant lines. >>>>>>> a5d032d (Fix) >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix) ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 557c1b8 (Fix) >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> ae07231a (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c12b71de (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) >>>>>>> c12b71de (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= ======= 7 relevant lines. <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= 7 relevant lines. >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) >>>>>>> afa56d1 (Featire specs) >>>>>>> e1ecabbe (Featire specs) 7 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            class Review < ApplicationRecord
          
      2. 
        
      
      
        
      
          
    2. 
            1
            

            

              belongs_to :user
          
      3. 
        
      
      
        
      
          
    3. 
            1
            

            

              belongs_to :book
          
      4. 
        
      
      
        
      
          
    4. 
            
            

            

            
          
      5. 
        
      
      
        
      
          
    5. 
            1
            

            

              validates :title, presence: true, length: { maximum: Constants::VALIDATES_TITLE_LENGTH_MAX },
          
      6. 
        
      
      
        
      
          
    6. 
            
            

            

                                format: { with: %r{\A[A-Za-z0-9!#$%&'*+-/=?^_`{|}~. ]+\z}, message: I18n.t('review.errors.title') }
          
      7. 
        
      
      
        
      
          
    7. 
            1
            

            

              validates :body, presence: true, length: { maximum: Constants::VALIDATES_TEXT_LENGTH_MAX },
          
      8. 
        
      
      
        
      
          
    8. 
            
            

            

                               format: { with: %r{\A[A-Za-z0-9!#$%&'*+-/=?^_`{|}~. ]+\z}, message: I18n.t('review.errors.body') }
          
      9. 
        
      
      
        
      
          
    9. 
            
            

            

            
          
      10. 
        
      
      
        
      
          
    10. 
            1
            

            

              validates :verified, inclusion: { in: [true, false] }, presence: true
          
      11. 
        
      
      
        
      
          
    11. 
            1
            

            

              validates :rating,
          
      12. 
        
      
      
        
      
          
    12. 
            
            

            

                        numericality: {
          
      13. 
        
      
      
        
      
          
    13. 
            
            

            

                          greater_than_or_equal_to: Constants::STAR_MIN,
          
      14. 
        
      
      
        
      
          
    14. 
            
            

            

                          less_than_or_equal_to: Constants::STAR_MAX
          
      15. 
        
      
      
        
      
          
    15. 
            
            

            

                        }, presence: true
          
      16. 
        
      
      
        
      
          
    16. 
            
            

            

            end
          
      17.

    app/models/shipping.rb

    100.0% lines covered

    1 relevant lines. 1 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            class Shipping < Address
          
      2. 
        
      
      
        
      
          
    2. 
            
            

            

            end
          
      3.
    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 8887ba5b (Fix) ======= ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 11792758 (Rebased) ======= >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 0c57e4e (Fix) ======= <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix)

    app/models/user.rb

    53.85% lines covered

    13 relevant lines. 7 lines covered and 6 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            class User < ApplicationRecord
          
      2. 
        
      
      
        
      
          
    2. 
            1
            

            

              devise :database_authenticatable, :registerable,
          
      3. 
        
      
      
        
      
          
    3. 
            
            

            

                     :recoverable, :rememberable, :validatable,
          
      4. 
        
      
      
        
      
          
    4. 
            
            

            

                     :confirmable, :lockable, :timeoutable, :trackable,
          
      5. 
        
      
      
        
      
          
    5. 
            
            

            

                     :omniauthable, omniauth_providers: [:facebook]
          
      6. 
        
      
      
        
      
          
    6. 
            
            

            

            
          
      7. 
        
      
      
        
      
          
    7. 
            1
            

            

              has_one :billing, dependent: :destroy
          
      8. 
        
      
      
        
      
          
    8. 
            1
            

            

              has_one :shipping, dependent: :destroy
          
      9. 
        
      
      
        
      
          
    9. 
            1
            

            

              has_one :order, dependent: :destroy
          
      10. 
        
      
      
        
      
          
    10. 
<<<<<<< HEAD
            
            

            

            
          
      11. 
        
      
      
        
      
          
    11. 
            1
            

            

              has_many :reviews, dependent: :destroy
          
      12. 
        
      
      
        
      
          
    12. 
            
            

            

            
          
      13. 
        
      
      
        
      
          
    13. 
            1
            

            

              def self.from_omniauth(auth)
          
      14. 
        
      
      
        
      
          
    14. 
            
            

            

                where(provider: auth.provider, uid: auth.uid).first_or_create do |user|
          
      15. 
        
      
      
        
      
          
    15. 
            
            

            

                  user.provider = auth.provider
          
      16. 
        
      
      
        
      
          
    16. 
            
            

            

                  user.uid = auth.uid
          
      17. 
        
      
      
        
      
          
    17. 
            
            

            

                  user.name = auth.info.name
          
      18. 
        
      
      
        
      
          
    18. 
            
            

            

                  user.email = auth.info.email
          
      19. 
        
      
      
        
      
          
    19. 
            
            

            

                  user.password = Devise.friendly_token[0, 20]
          
      20. 
        
      
      
        
      
          
    20. 
            
            

            

                end
          
      21. 
        
      
      
        
      
          
    21. 
            
            

            

              end
          
      22. 
        
      
      
        
      
          
    22. 
            
            

            

            end
          
      23.
    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 557c1b8 (Fix) ======= <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 557c1b8 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
    <<<<<<< HEAD >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 490b01d6 (Manifest_cache true)

    app/models/user.rb

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) =======

    app/models/review.rb

    >>>>>>> aca90e3 (Rebased) ======= >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)

    100.0% lines covered

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ef483b6d (Fix) 2 relevant lines. 2 lines covered and ======= 7 relevant lines. 7 lines covered and >>>>>>> aca90e3 (Rebased) 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

<<<<<<< HEAD
=======
            class Review < ApplicationRecord
          
      2. 
        
      
      
        
      
          
    2. 
            1
            

            

              belongs_to :user
          
      3. 
        
      
      
        
      
          
    3. 
            1
            

            

              belongs_to :book
          
      4. 
        
      
      
        
      
          
    4. 
            
            

            

            
          
      5. 
        
      
      
        
      
          
    5. 
            1
            

            

              validates :title, presence: true, length: { maximum: Constants::VALIDATES_TITLE_LENGTH_MAX },
          
      6. 
        
      
      
        
      
          
    6. 
            
            

            

                                format: { with: %r{\A[A-Za-z0-9!#$%&'*+-/=?^_`{|}~. ]+\z}, message: I18n.t('review.errors.title') }
          
      7. 
        
      
      
        
      
          
    7. 
            1
            

            

              validates :body, presence: true, length: { maximum: Constants::VALIDATES_TEXT_LENGTH_MAX },
          
      8. 
        
      
      
        
      
          
    8. 
            
            

            

                               format: { with: %r{\A[A-Za-z0-9!#$%&'*+-/=?^_`{|}~. ]+\z}, message: I18n.t('review.errors.body') }
          
      9. 
        
      
      
        
      
          
    9. 
            
            

            

            
          
      10. 
        
      
      
        
      
          
    10. 
            1
            

            

              validates :verified, inclusion: { in: [true, false] }, presence: true
          
      11. 
        
      
      
        
      
          
    11. 
            1
            

            

              validates :rating,
          
      12. 
        
      
      
        
      
          
    12. 
            
            

            

                        numericality: {
          
      13. 
        
      
      
        
      
          
    13. 
            
            

            

                          greater_than_or_equal_to: Constants::STAR_MIN,
          
      14. 
        
      
      
        
      
          
    14. 
            
            

            

                          less_than_or_equal_to: Constants::STAR_MAX
          
      15. 
        
      
      
        
      
          
    15. 
            
            

            

                        }, presence: true
          
      16. 
        
      
      
        
      
          
    16. 
            
            

            

            end
          
      17.

    app/models/shipping.rb

    100.0% lines covered

    1 relevant lines. 1 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            class Shipping < Address
          
      2. 
        
      
      
        
      
          
    2. 
            
            

            

            end
          
      3.
    ======= >>>>>>> 6da9530 (Featire specs)

    app/models/user.rb

    50.0% lines covered

    12 relevant lines. 6 lines covered and 6 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

<<<<<<< HEAD
>>>>>>> aca90e3 (Rebased)
=======
>>>>>>> 6da9530 (Featire specs)
            class User < ApplicationRecord
          
      2. 
        
      
      
        
      
<<<<<<< HEAD
<<<<<<< HEAD
          
    2. 
            
            

            

              # Include default devise modules. Others available are:
          
      3. 
        
      
      
        
      
          
    3. 
            
            

            

              # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
          
      4. 
        
      
      
        
      
          
    4. 
=======
          
    5. 
>>>>>>> aca90e3 (Rebased)
=======
          
    6. 
>>>>>>> 6da9530 (Featire specs)
            1
            

            

              devise :database_authenticatable, :registerable,
          
      7. 
        
      
      
        
      
<<<<<<< HEAD
<<<<<<< HEAD
          
    7. 
=======
          
    8. 
>>>>>>> aca90e3 (Rebased)
=======
          
    9. 
>>>>>>> 6da9530 (Featire specs)
            
            

            

                     :recoverable, :rememberable, :validatable,
          
      10. 
        
      
      
        
      
<<<<<<< HEAD
<<<<<<< HEAD
          
    10. 
=======
          
    11. 
>>>>>>> aca90e3 (Rebased)
=======
          
    12. 
>>>>>>> 6da9530 (Featire specs)
            
            

            

                     :confirmable, :lockable, :timeoutable, :trackable,
          
      13. 
        
      
      
        
      
<<<<<<< HEAD
<<<<<<< HEAD
          
    13. 
=======
          
    14. 
>>>>>>> aca90e3 (Rebased)
=======
          
    15. 
>>>>>>> 6da9530 (Featire specs)
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
                     :omniauthable
=======
                     :omniauthable, omniauth_providers: [:facebook]
>>>>>>> aca90e3 (Rebased)
=======
                     :omniauthable, omniauth_providers: [:facebook]
>>>>>>> 6da9530 (Featire specs)
          
      16. 
        
      
      
        
      
<<<<<<< HEAD
<<<<<<< HEAD
          
    16. 
=======
=======
>>>>>>> 6da9530 (Featire specs)
          
    17. 
            
            

            

            
          
      18. 
        
      
      
        
      
          
    18. 
            1
            

            

              has_one :billing, dependent: :destroy
          
      19. 
        
      
      
        
      
          
    19. 
            1
            

            

              has_one :shipping, dependent: :destroy
          
      20. 
        
      
      
        
      
          
    20. 
=======
>>>>>>> 9e081dc (Fix)
            
            

            

            
          
      21. 
        
      
      
        
      
          
    21. 
            1
            

            

              has_many :reviews, dependent: :destroy
          
      22. 
        
      
      
        
      
          
    22. 
            
            

            

            
          
      23. 
        
      
      
        
      
          
    23. 
            1
            

            

              def self.from_omniauth(auth)
          
      24. 
        
      
      
        
      
          
    24. 
            
            

            

                where(provider: auth.provider, uid: auth.uid).first_or_create do |user|
          
      25. 
        
      
      
        
      
          
    25. 
            
            

            

                  user.provider = auth.provider
          
      26. 
        
      
      
        
      
          
    26. 
            
            

            

                  user.uid = auth.uid
          
      27. 
        
      
      
        
      
          
    27. 
            
            

            

                  user.name = auth.info.name
          
      28. 
        
      
      
        
      
          
    28. 
            
            

            

                  user.email = auth.info.email
          
      29. 
        
      
      
        
      
          
    29. 
            
            

            

                  user.password = Devise.friendly_token[0, 20]
          
      30. 
        
      
      
        
      
          
    30. 
            
            

            

                end
          
      31. 
        
      
      
        
      
          
    31. 
            
            

            

              end
          
      32. 
        
      
      
        
      
<<<<<<< HEAD
          
    32. 
<<<<<<< HEAD
>>>>>>> aca90e3 (Rebased)
=======
>>>>>>> 6da9530 (Featire specs)
=======
          
    33. 
>>>>>>> 9e081dc (Fix)
            
            

            

            end
          
      34.
    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> aca90e3 (Rebased)

    app/queries/book_query.rb

    90.0% ======= ======= ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 0c57e4e (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> e18eb87 (Fix) ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix)
    <<<<<<< HEAD >>>>>>> 730a8ca (Add login registration pages)

    app/models/user.rb

    100.0% >>>>>>> 6da9530 (Featire specs) lines covered

    <<<<<<< HEAD <<<<<<< HEAD 10 relevant lines. 9 lines covered and ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 9e081dc (Fix) >>>>>>> 1049b80c (Fix) 2 relevant lines. 2 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            class User < ApplicationRecord
          
      2. 
        
      
      
        
      
          
    2. 
            
            

            

              # Include default devise modules. Others available are:
          
      3. 
        
      
      
        
      
          
    3. 
            
            

            

              # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
          
      4. 
        
      
      
        
      
          
    4. 
            1
            

            

              devise :database_authenticatable, :registerable,
          
      5. 
        
      
      
        
      
          
    5. 
            
            

            

                     :recoverable, :rememberable, :validatable,
          
      6. 
        
      
      
        
      
          
    6. 
            
            

            

                     :confirmable, :lockable, :timeoutable, :trackable,
          
      7. 
        
      
      
        
      
          
    7. 
            
            

            

                     :omniauthable
          
      8. 
        
      
      
        
      
          
    8. 
            
            

            

            end
          
      9.
    >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs)
    <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 99dad91f (Fix) =======
    >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> 8887ba5b (Fix) ======= <<<<<<< HEAD ======= >>>>>>> ae884b47 (Fix) ======= ======= >>>>>>> 7a08014b (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= =======
    >>>>>>> a5d032d (Fix) >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> f92a45b (Featire specs) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs)
    >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> 8887ba5b (Fix) >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= =======
    >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= =======
    >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) ======= =======
    >>>>>>> a5d032d (Fix) >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> fdab719f (Fix) =======
    >>>>>>> a5d032d (Fix) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= =======
    >>>>>>> a5d032d (Fix) >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix) ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= =======
    >>>>>>> a5d032d (Fix) >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) >>>>>>> 8887ba5b (Fix)

    app/queries/book_query.rb

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> 8887ba5b (Fix) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD 87.5% >>>>>>> 84809242 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= >>>>>>> 715fac2 (Featire specs) >>>>>>> fb61c5a (Featire specs) >>>>>>> 73f364d8 (Featire specs) 87.5% ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 715fac2 (Featire specs) >>>>>>> fb61c5a (Featire specs) >>>>>>> 73f364d8 (Featire specs) 87.5% ======= 85.71% >>>>>>> 752f0c0 (Featire specs) ======= 85.71% >>>>>>> 4e81ea2 (Featire specs) ======= 85.71% >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= >>>>>>> fb61c5a (Featire specs) >>>>>>> 73f364d8 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= ======= 87.5% >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= 90.0% >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= 90.0% >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> 8887ba5b (Fix) ======= <<<<<<< HEAD ======= >>>>>>> ae884b47 (Fix) ======= ======= >>>>>>> 7a08014b (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= 90.0% >>>>>>> a5d032d (Fix) >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= 90.0% >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= 90.0% >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= ======= 90.0% >>>>>>> a5d032d (Fix) >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> fdab719f (Fix) ======= 90.0% >>>>>>> a5d032d (Fix) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= 90.0% >>>>>>> a5d032d (Fix) >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix) ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) >>>>>>> 8288136d (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= 90.0% >>>>>>> a5d032d (Fix) >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) >>>>>>> fb61c5a (Featire specs) >>>>>>> 73f364d8 (Featire specs) lines covered

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> fb61c5a (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= >>>>>>> 715fac2 (Featire specs) >>>>>>> fb61c5a (Featire specs) >>>>>>> 73f364d8 (Featire specs) 8 relevant lines. 7 lines covered and ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> df37394 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 715fac2 (Featire specs) >>>>>>> fb61c5a (Featire specs) >>>>>>> 73f364d8 (Featire specs) 8 relevant lines. 7 lines covered and ======= 7 relevant lines. 6 lines covered and >>>>>>> 752f0c0 (Featire specs) ======= 7 relevant lines. 6 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> 4a2f2ad8 (Featire specs) ======= >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) >>>>>>> afa56d1 (Featire specs) >>>>>>> e1ecabbe (Featire specs) 7 relevant lines. 6 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 74240509 (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= 8 relevant lines. 7 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= 8 relevant lines. 7 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> fd3f47ab (Featire specs) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) >>>>>>> 37e48018 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> f92a45b (Featire specs) ======= >>>>>>> 495b04d (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) 8 relevant lines. 7 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 5506bd0 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 6da9530 (Featire specs) ======= 10 relevant lines. 9 lines covered and <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5e31aeb (Featire specs) ======= ======= >>>>>>> 2a25e4c (Featire specs) >>>>>>> 216fe41 (Featire specs) >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 9a49b7b (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> c033601 (Rebased) >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= 6 lines covered and >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> aa4361fd (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= 6 lines covered and >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 3cf8dd4 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> d2e6b3c (Featire specs) >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> c12b71de (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 99dad91f (Fix) >>>>>>> ae409ca (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= ======= 6 lines covered and >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 99dad91f (Fix) >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= 6 lines covered and >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 99dad91f (Fix) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> e18eb87 (Fix) ======= ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 72b9cab (Featire specs) 7 relevant lines. 6 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= 8 relevant lines. 7 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> b904d7ae (Featire specs) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) ======= ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= 8 relevant lines. 7 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e18eb87 (Fix) ======= <<<<<<< HEAD >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) ======= 10 relevant lines. 9 lines covered and >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 5e31aeb (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 6 lines covered and >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 6 lines covered and >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 6 lines covered and >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= 6 lines covered and >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= 7 relevant lines. 6 lines covered and >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= ======= 8 relevant lines. 7 lines covered and >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= ======= 10 relevant lines. 9 lines covered and >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= 10 relevant lines. 9 lines covered and >>>>>>> c7a726c5 (Rebased) ======= 7 relevant lines. 6 lines covered and >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= 6 lines covered and >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= 7 relevant lines. 6 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= 8 relevant lines. 7 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= 10 relevant lines. 9 lines covered and >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 6 lines covered and >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 6 lines covered and >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 6 lines covered and >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= 6 lines covered and >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= 7 relevant lines. 6 lines covered and >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= ======= 8 relevant lines. 7 lines covered and >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= ======= 10 relevant lines. 9 lines covered and >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= ======= ======= 6 lines covered and >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= ======= 6 lines covered and >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= ======= ======= 6 lines covered and >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= 6 lines covered and >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= ======= ======= ======= ======= 7 relevant lines. 6 lines covered and >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= ======= ======= 8 relevant lines. 7 lines covered and >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= 10 relevant lines. 9 lines covered and >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= 7 relevant lines. 6 lines covered and >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= 7 relevant lines. 6 lines covered and >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) 1 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            class BookQuery
          
      2. 
        
      
      
        
      
          
    2. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title',
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> c51bf93 (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> bf05825 (Featire specs)
=======
>>>>>>> df37394 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> c51bf93 (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> bf05825 (Featire specs)
=======
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> f92a45b (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0c57e4e (Fix)
=======
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 973ba8c (Featire specs)
=======
>>>>>>> 8181d13 (Featire specs)
=======
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 72b9cab (Featire specs)
=======
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 15c51b7 (Featire specs)
=======
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9e081dc (Fix)
=======
>>>>>>> fb61c5a (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
=======
=======
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title',
=======
=======
>>>>>>> 9a49b7b (Rebased)
=======
>>>>>>> 70fcacc (Featire specs)
=======
>>>>>>> ae409ca (Featire specs)
=======
>>>>>>> 379a979 (Featire specs)
=======
>>>>>>> adc21e0 (Featire specs)
=======
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4d90e3d (Featire specs)
=======
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 160fb15 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4d90e3d (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 160fb15 (Fix)
>>>>>>> 67ab5299 (Fix)
=======
>>>>>>> 610b6138 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> b28889f (Fix)
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
=======
              SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title',
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> b28889f (Fix)
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
=======
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
>>>>>>> b28889f (Fix)
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1d59aaa (Fix)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ebcdce06 (Featire specs)
=======
=======
=======
=======
>>>>>>> 715fac2 (Featire specs)
>>>>>>> 73f364d8 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 73f364d8 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> e6fc67c7 (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
>>>>>>> 7a08014b (Featire specs)
=======
=======
>>>>>>> 715fac2 (Featire specs)
>>>>>>> 73f364d8 (Featire specs)
              SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 9bfbd88 (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
>>>>>>> 9bfbd88 (Featire specs)
<<<<<<< HEAD
=======
=======
=======
              SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
              SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze
>>>>>>> e3e66f3 (Featire specs)
=======
              SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
              SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> a636fda (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
              SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title',
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> 9a49b7b (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
=======
<<<<<<< HEAD
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
=======
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
              SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title',
=======
              SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
=======
=======
              SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
=======
              SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title',
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> 160fb15 (Fix)
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
=======
=======
=======
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
              SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title',
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
<<<<<<< HEAD
=======
=======
<<<<<<< HEAD
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
              SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title',
>>>>>>> c033601 (Rebased)
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
              SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title',
=======
              SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
              SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
              SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title',
>>>>>>> a5d032d (Fix)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
              SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title',
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> ae884b47 (Fix)
=======
=======
=======
              SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title',
>>>>>>> a5d032d (Fix)
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 74240509 (Fix book_spec decrease quantity and price)
=======
=======
=======
              SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title',
>>>>>>> a5d032d (Fix)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 37e48018 (Featire specs)
              SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title',
=======
              SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
=======
              SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a1a479e2 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
              SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price)
=======
=======
=======
              SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title',
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
>>>>>>> d9d85ca6 (Fix)
=======
              SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title',
>>>>>>> c7a726c5 (Rebased)
=======
              SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze
>>>>>>> 9bfbd88 (Featire specs)
>>>>>>> ebcdce06 (Featire specs)
=======
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
              SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
=======
              SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title',
>>>>>>> a5d032d (Fix)
>>>>>>> 160fb15 (Fix)
<<<<<<< HEAD
>>>>>>> 31d15e66 (Fix)
=======
=======
=======
=======
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
              SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title',
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
<<<<<<< HEAD
=======
=======
<<<<<<< HEAD
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
              SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title',
>>>>>>> c033601 (Rebased)
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
              SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title',
=======
              SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
              SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
              SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title',
>>>>>>> a5d032d (Fix)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> fdab719f (Fix)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
              SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title',
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> 8288136d (Fix)
=======
=======
=======
              SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title',
>>>>>>> a5d032d (Fix)
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
=======
=======
              SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title',
>>>>>>> a5d032d (Fix)
=======
              SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title',
=======
              SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
=======
              SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
              SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
=======
=======
=======
              SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title',
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
>>>>>>> ef483b6d (Fix)
=======
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
>>>>>>> f92a45b (Featire specs)
              SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze
=======
=======
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
              SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title',
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
<<<<<<< HEAD
=======
=======
<<<<<<< HEAD
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
              SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title',
=======
              SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
              SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
              SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title',
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
              SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title',
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 0c57e4e (Fix)
<<<<<<< HEAD
>>>>>>> 8887ba5b (Fix)
=======
=======
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
              SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title',
=======
              SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0f24a043 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
=======
              SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> b8c2784f (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
=======
              SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
              SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title',
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
>>>>>>> 9e081dc (Fix)
>>>>>>> 1049b80c (Fix)
          
      3. 
        
      
      
        
      
          
    3. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                              'title DESC'].freeze
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
=======
>>>>>>> ef483b6d (Fix)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8887ba5b (Fix)
=======
>>>>>>> 0f24a043 (Fix book_spec decrease quantity and price)
=======
>>>>>>> b8c2784f (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1049b80c (Fix)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
                              'title DESC'].freeze
=======
=======
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 557c1b8 (Fix)
                              'title DESC'].freeze
=======
=======
                              'title DESC'].freeze
=======
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0c57e4e (Fix)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
                              'title DESC'].freeze
=======
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
=======
                              'title DESC'].freeze
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
=======
>>>>>>> 9e081dc (Fix)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
                              'title DESC'].freeze
=======
>>>>>>> e3e66f3 (Featire specs)
            
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
            
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
>>>>>>> ae884b47 (Fix)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
                              'title DESC'].freeze
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
=======
                              'title DESC'].freeze
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 74240509 (Fix book_spec decrease quantity and price)
=======
                              'title DESC'].freeze
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
                              'title DESC'].freeze
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> ae884b47 (Fix)
=======
=======
=======
                              'title DESC'].freeze
>>>>>>> a5d032d (Fix)
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 74240509 (Fix book_spec decrease quantity and price)
=======
=======
=======
<<<<<<< HEAD
                              'title DESC'].freeze
>>>>>>> a5d032d (Fix)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
=======
            
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a1a479e2 (Fix book_spec decrease quantity and price)
=======
=======
=======
            
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price)
=======
=======
=======
                              'title DESC'].freeze
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
>>>>>>> d9d85ca6 (Fix)
=======
                              'title DESC'].freeze
>>>>>>> c7a726c5 (Rebased)
=======
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 31d15e66 (Fix)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
                              'title DESC'].freeze
=======
=======
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 557c1b8 (Fix)
                              'title DESC'].freeze
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                              'title DESC'].freeze
=======
>>>>>>> c8da2e3 (Fix)
=======
                              'title DESC'].freeze
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
                              'title DESC'].freeze
=======
>>>>>>> e3e66f3 (Featire specs)
            
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
            
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
                              'title DESC'].freeze
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 31d15e66 (Fix)
=======
=======
                              'title DESC'].freeze
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
                              'title DESC'].freeze
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> fdab719f (Fix)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
                              'title DESC'].freeze
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> 8288136d (Fix)
=======
=======
=======
                              'title DESC'].freeze
>>>>>>> a5d032d (Fix)
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
=======
=======
<<<<<<< HEAD
                              'title DESC'].freeze
>>>>>>> a5d032d (Fix)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
=======
            
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
=======
=======
            
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
=======
=======
=======
                              'title DESC'].freeze
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
>>>>>>> ef483b6d (Fix)
=======
=======
                              'title DESC'].freeze
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
            
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
            
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
                              'title DESC'].freeze
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
                              'title DESC'].freeze
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 0c57e4e (Fix)
<<<<<<< HEAD
>>>>>>> 8887ba5b (Fix)
=======
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0f24a043 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
=======
            
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> b8c2784f (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
            
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
                              'title DESC'].freeze
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
>>>>>>> 9e081dc (Fix)
>>>>>>> 1049b80c (Fix)
          
      4. 
        
      
      
        
      
          
    4. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
=======
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f92a45b (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0c57e4e (Fix)
=======
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9e081dc (Fix)
=======
>>>>>>> fb61c5a (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 5b7749a (Fix)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 5b7749a (Fix)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> b28889f (Fix)
>>>>>>> c8da2e3 (Fix)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
=======
=======
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> b28889f (Fix)
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 84809242 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> e6fc67c7 (Featire specs)
=======
>>>>>>> df37394 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> c12b71de (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 7a08014b (Featire specs)
=======
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 74240509 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> c51bf93 (Featire specs)
>>>>>>> 7a08014b (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
=======
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> f92a45b (Featire specs)
=======
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> fb61c5a (Featire specs)
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
>>>>>>> 0f24a043 (Fix book_spec decrease quantity and price)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
=======
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> 21873de0 (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
>>>>>>> c033601 (Rebased)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 7b22ad7e (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ae07231a (Featire specs)
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
>>>>>>> 3cf8dd4 (Featire specs)
>>>>>>> aa4361fd (Featire specs)
>>>>>>> a636fda (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> efd6af09 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> fdab719f (Fix)
<<<<<<< HEAD
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
=======
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fdab719f (Fix)
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
=======
>>>>>>> e18eb87 (Fix)
>>>>>>> 99dad91f (Fix)
>>>>>>> b832d45 (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
>>>>>>> b8c2784f (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2612be03 (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
>>>>>>> b8c2784f (Fix book_spec decrease quantity and price)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
>>>>>>> ae884b47 (Fix)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
=======
>>>>>>> 5a2009f1 (Fix)
=======
>>>>>>> f136376a (Featire specs)
=======
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
<<<<<<< HEAD
=======
=======
>>>>>>> d52f9efe (Featire specs)
>>>>>>> 932dbec (Featire specs)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> ae884b47 (Fix)
=======
=======
=======
=======
=======
>>>>>>> a5d032d (Fix)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> a5d032d (Fix)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376a (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0ea (Featire specs)
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888bf (Featire specs)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 74240509 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a1a479e2 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 393eff3b (Featire specs)
=======
=======
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
>>>>>>> d9d85ca6 (Fix)
=======
>>>>>>> c7a726c5 (Rebased)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> ebcdce06 (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 37e48018 (Featire specs)
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 31d15e66 (Fix)
=======
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> fdab719f (Fix)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> 8288136d (Fix)
=======
=======
=======
=======
=======
>>>>>>> a5d032d (Fix)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> a5d032d (Fix)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> d52f9efe (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> c12b71de (Featire specs)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b904d7ae (Featire specs)
=======
=======
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
>>>>>>> ef483b6d (Fix)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 15c51b7 (Featire specs)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 0c57e4e (Fix)
<<<<<<< HEAD
>>>>>>> 8887ba5b (Fix)
=======
=======
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5e31aeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 53db2224 (Featire specs)
=======
=======
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
=======
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
=======
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0f24a043 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> b8c2784f (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 392646b5 (Featire specs)
=======
=======
=======
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 715fac2 (Featire specs)
<<<<<<< HEAD
>>>>>>> fb61c5a (Featire specs)
<<<<<<< HEAD
>>>>>>> 73f364d8 (Featire specs)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
              def self.query(params)
          
      5. 
        
      
      
        
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> c51bf93 (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 31507b8 (Add login registration pages)
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> bf05825 (Featire specs)
=======
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> f92a45b (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
>>>>>>> c871248 (Add login registration pages)
=======
>>>>>>> 0c57e4e (Fix)
=======
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 973ba8c (Featire specs)
=======
>>>>>>> 1d11874 (Add login registration pages)
=======
>>>>>>> 8181d13 (Featire specs)
=======
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 06e5e41 (Add login registration pages)
=======
>>>>>>> 72b9cab (Featire specs)
=======
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 385136b (Add login registration pages)
=======
>>>>>>> 15c51b7 (Featire specs)
=======
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1c33e01 (Add login registration pages)
=======
>>>>>>> 9e081dc (Fix)
=======
>>>>>>> fb61c5a (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
=======
=======
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> c51bf93 (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 31507b8 (Add login registration pages)
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> bf05825 (Featire specs)
=======
>>>>>>> df37394 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6066f925 (Add login registration pages)
=======
>>>>>>> 6e923b9d (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8249ff3c (Add login registration pages)
=======
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e989024d (Add login registration pages)
=======
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> ebcdce06 (Featire specs)
=======
>>>>>>> bae2b7de (Add login registration pages)
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 56fd9d41 (Add login registration pages)
=======
>>>>>>> 31d15e66 (Fix)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> 73dcd461 (Add login registration pages)
          
    5. 
=======
          
    6. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
    7. 
>>>>>>> 4e81ea2 (Featire specs)
            24
=======
          
    8. 
            25
>>>>>>> 1214e1f (Add login registration pages)
=======
          
    9. 
            24
>>>>>>> 08edf50 (Featire specs)
=======
          
    10. 
            24
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
    11. 
            30
>>>>>>> aca90e3 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
<<<<<<< HEAD
=======
>>>>>>> 9a49b7b (Rebased)
=======
>>>>>>> 70fcacc (Featire specs)
=======
>>>>>>> ae409ca (Featire specs)
=======
>>>>>>> 379a979 (Featire specs)
=======
>>>>>>> 156ffe6 (Add login registration pages)
=======
>>>>>>> adc21e0 (Featire specs)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> 793a6ed (Add login registration pages)
=======
>>>>>>> 4d90e3d (Featire specs)
=======
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
=======
>>>>>>> c5efe8e (Add login registration pages)
=======
>>>>>>> 160fb15 (Fix)
=======
>>>>>>> c8da2e3 (Fix)
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> 8d4ec55 (Add login registration pages)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 37e48018 (Featire specs)
=======
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> cacbab9 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 56fd9d41 (Add login registration pages)
=======
=======
>>>>>>> a8b17c32 (Add login registration pages)
=======
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7d58507 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> a8b17c32 (Add login registration pages)
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> c12b71de (Featire specs)
          
    12. 
            30
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> b28889f (Fix)
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> adc21e0 (Featire specs)
=======
<<<<<<< HEAD
=======
=======
>>>>>>> 793a6ed (Add login registration pages)
=======
>>>>>>> 4d90e3d (Featire specs)
=======
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
=======
>>>>>>> c5efe8e (Add login registration pages)
=======
>>>>>>> 160fb15 (Fix)
=======
>>>>>>> c8da2e3 (Fix)
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> bae2b7de (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2612be03 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
=======
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
>>>>>>> cacbab9 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 7b22ad7e (Featire specs)
=======
>>>>>>> c871248 (Add login registration pages)
>>>>>>> e011b0df (Add login registration pages)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 7d58507 (Add login registration pages)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 973ba8c (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
          
    13. 
            30
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 8249ff3c (Add login registration pages)
=======
>>>>>>> 824bb2b (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
>>>>>>> b28889f (Fix)
>>>>>>> c8da2e3 (Fix)
=======
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> f182ac7 (Add login registration pages)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57da3ff (Add login registration pages)
<<<<<<< HEAD
          
    14. 
            30
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a624084 (Add login registration pages)
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6a9fede (Add login registration pages)
          
    15. 
            30
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7d58507 (Add login registration pages)
>>>>>>> c871248 (Add login registration pages)
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 973ba8c (Featire specs)
=======
=======
=======
>>>>>>> f182ac7 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 852864e (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 1d11874 (Add login registration pages)
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 551f3c1 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 06e5e41 (Add login registration pages)
=======
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> a624084 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> ccec311 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 385136b (Add login registration pages)
=======
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
=======
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 6a9fede (Add login registration pages)
>>>>>>> 8c3e531 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 1c33e01 (Add login registration pages)
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
          
    16. 
            30
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> b28889f (Fix)
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> f182ac7 (Add login registration pages)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57da3ff (Add login registration pages)
<<<<<<< HEAD
          
    17. 
            30
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a624084 (Add login registration pages)
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6a9fede (Add login registration pages)
          
    18. 
            30
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> f0e2e12a (Featire specs)
<<<<<<< HEAD
=======
=======
>>>>>>> 715fac2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6066f925 (Add login registration pages)
<<<<<<< HEAD
=======
=======
=======
<<<<<<< HEAD
>>>>>>> ebcdce06 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 03c0867 (Add login registration pages)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 73f364d8 (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 22ee41c (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> ebcdce06 (Featire specs)
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
>>>>>>> 7a08014b (Featire specs)
=======
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
>>>>>>> 8d4ec55 (Add login registration pages)
>>>>>>> 73dcd461 (Add login registration pages)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
>>>>>>> 715fac2 (Featire specs)
<<<<<<< HEAD
>>>>>>> fb61c5a (Featire specs)
<<<<<<< HEAD
>>>>>>> 73f364d8 (Featire specs)
=======
=======
=======
>>>>>>> 03c0867 (Add login registration pages)
>>>>>>> 8d4ec55 (Add login registration pages)
>>>>>>> 73dcd461 (Add login registration pages)
          
    19. 
            24
<<<<<<< HEAD
=======
=======
          
    20. 
            25
>>>>>>> 1214e1f (Add login registration pages)
=======
          
    21. 
            24
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
=======
=======
=======
<<<<<<< HEAD
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> f7852d17 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 7a08014b (Featire specs)
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 84003439 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
>>>>>>> 4f4ea3f9 (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
>>>>>>> 74240509 (Fix book_spec decrease quantity and price)
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 9bfbd88 (Featire specs)
<<<<<<< HEAD
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> c51bf93 (Featire specs)
=======
>>>>>>> f92a45b (Featire specs)
=======
>>>>>>> 8181d13 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> c51bf93 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 5c33a07 (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
>>>>>>> fb61c5a (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
>>>>>>> 0f24a043 (Fix book_spec decrease quantity and price)
          
    22. 
            24
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8249ff3c (Add login registration pages)
=======
>>>>>>> 84809242 (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 74240509 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2fef4a0 (Add login registration pages)
>>>>>>> f6e20266 (Add login registration pages)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
<<<<<<< HEAD
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 2fef4a0 (Add login registration pages)
>>>>>>> 0561be1d (Add login registration pages)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bb5c652 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
          
    23. 
            25
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 0561be1d (Add login registration pages)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 22ee41c (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 88d49ad (Add login registration pages)
=======
=======
=======
>>>>>>> 6da9530 (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
>>>>>>> 551f3c1 (Add login registration pages)
          
    24. 
            25
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 2612be03 (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 551f3c1 (Add login registration pages)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 22ee41c (Add login registration pages)
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 22ee41c (Add login registration pages)
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> 22ee41c (Add login registration pages)
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> 22ee41c (Add login registration pages)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 22ee41c (Add login registration pages)
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
          
    25. 
            30
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
>>>>>>> 9a49b7b (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
=======
<<<<<<< HEAD
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 9ec6862 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 9ec6862 (Add login registration pages)
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> bae2b7de (Add login registration pages)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 610b6138 (Featire specs)
=======
=======
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 9ec6862 (Add login registration pages)
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
          
    26. 
            30
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 9ec6862 (Add login registration pages)
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
          
    27. 
            30
>>>>>>> 9620751 (Featire specs)
=======
=======
          
    28. 
            30
>>>>>>> 6da9530 (Featire specs)
=======
          
    29. 
            30
>>>>>>> 9620751 (Featire specs)
=======
          
    30. 
            30
>>>>>>> 2a25e4c (Featire specs)
=======
          
    31. 
            24
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 53db2224 (Featire specs)
=======
>>>>>>> 7b22ad7e (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
=======
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> d52f9efe (Featire specs)
=======
=======
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> 77d62af (Featire specs)
>>>>>>> ae07231a (Featire specs)
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 70fcacc (Featire specs)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 009401d (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
          
    32. 
            24
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c12b71de (Featire specs)
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
=======
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> 77d62af (Featire specs)
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> c12b71de (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
>>>>>>> ae409ca (Featire specs)
=======
>>>>>>> c8da2e3 (Fix)
=======
<<<<<<< HEAD
>>>>>>> ae409ca (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
          
    33. 
            24
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c12b71de (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 379a979 (Featire specs)
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
=======
>>>>>>> f182ac7 (Add login registration pages)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
=======
>>>>>>> f182ac7 (Add login registration pages)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fdab719f (Fix)
=======
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
=======
>>>>>>> f182ac7 (Add login registration pages)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
=======
>>>>>>> f182ac7 (Add login registration pages)
>>>>>>> e3e66f3 (Featire specs)
=======
          
    34. 
            25
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9ec6862 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 156ffe6 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 6066f925 (Add login registration pages)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
<<<<<<< HEAD
>>>>>>> 9ec6862 (Add login registration pages)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
    35. 
            24
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
>>>>>>> adc21e0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 57a2e05 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 793a6ed (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 8249ff3c (Add login registration pages)
=======
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57a2e05 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
          
    36. 
            24
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4d90e3d (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
    37. 
            24
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 7d58507 (Add login registration pages)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e60833c (Add login registration pages)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> a624084 (Add login registration pages)
=======
          
    38. 
            25
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> cacbab9 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c5efe8e (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e989024d (Add login registration pages)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 31507b8 (Add login registration pages)
=======
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
    39. 
            30
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 160fb15 (Fix)
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 932dbec (Featire specs)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 7d58507 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 31507b8 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 29e1af94 (Add login registration pages)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> ae884b47 (Fix)
=======
=======
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376a (Featire specs)
=======
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0ea (Featire specs)
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888bf (Featire specs)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> f182ac7 (Add login registration pages)
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 74240509 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
>>>>>>> 2fef4a0 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> f6e20266 (Add login registration pages)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a1a479e2 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> a624084 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e60833c (Add login registration pages)
<<<<<<< HEAD
>>>>>>> ed8ea634 (Add login registration pages)
=======
=======
=======
=======
          
    40. 
            24
<<<<<<< HEAD
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 393eff3b (Featire specs)
=======
=======
=======
=======
          
    41. 
            24
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 379a979 (Featire specs)
>>>>>>> bae2b7de (Add login registration pages)
=======
=======
=======
          
    42. 
            25
<<<<<<< HEAD
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 6a9fede (Add login registration pages)
<<<<<<< HEAD
>>>>>>> f416f45 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 2be0d057 (Add login registration pages)
=======
=======
=======
          
    43. 
            30
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
>>>>>>> d9d85ca6 (Fix)
=======
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 9bfbd88 (Featire specs)
>>>>>>> ebcdce06 (Featire specs)
=======
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
>>>>>>> 9ec6862 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 156ffe6 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> bae2b7de (Add login registration pages)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
<<<<<<< HEAD
>>>>>>> 9ec6862 (Add login registration pages)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
    44. 
            24
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> adc21e0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 610b6138 (Featire specs)
=======
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 57a2e05 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 793a6ed (Add login registration pages)
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57a2e05 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
          
    45. 
            24
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4d90e3d (Featire specs)
<<<<<<< HEAD
>>>>>>> 37e48018 (Featire specs)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
    46. 
            24
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 7d58507 (Add login registration pages)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e60833c (Add login registration pages)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> a624084 (Add login registration pages)
=======
          
    47. 
            25
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> cacbab9 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c5efe8e (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 56fd9d41 (Add login registration pages)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 31507b8 (Add login registration pages)
=======
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
    48. 
            30
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 160fb15 (Fix)
<<<<<<< HEAD
>>>>>>> 31d15e66 (Fix)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 932dbec (Featire specs)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> fdab719f (Fix)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 7d58507 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 31507b8 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> a8b17c32 (Add login registration pages)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> 8288136d (Fix)
=======
=======
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> d52f9efe (Featire specs)
=======
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> c12b71de (Featire specs)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> f182ac7 (Add login registration pages)
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
>>>>>>> 2fef4a0 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 0561be1d (Add login registration pages)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> a624084 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e60833c (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 512d1d87 (Add login registration pages)
=======
=======
=======
=======
          
    49. 
            24
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b904d7ae (Featire specs)
=======
=======
=======
=======
          
    50. 
            24
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
    51. 
            25
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 6a9fede (Add login registration pages)
<<<<<<< HEAD
>>>>>>> f416f45 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 4976a174 (Add login registration pages)
=======
=======
=======
          
    52. 
            30
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
>>>>>>> ef483b6d (Fix)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
>>>>>>> 659083f (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 5507b42 (Featire specs)
>>>>>>> 5e31aeb (Featire specs)
=======
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> 51bc18c (Featire specs)
>>>>>>> a636fda (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
          
    53. 
            24
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
=======
          
    54. 
            24
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
=======
>>>>>>> f182ac7 (Add login registration pages)
=======
          
    55. 
            25
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9ec6862 (Add login registration pages)
=======
=======
          
    56. 
            24
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
=======
>>>>>>> 3b03895 (Featire specs)
=======
          
    57. 
            24
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
>>>>>>> 9c0d812 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
    58. 
            24
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 7d58507 (Add login registration pages)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> ccec311 (Add login registration pages)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> a624084 (Add login registration pages)
=======
          
    59. 
            25
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> cacbab9 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
          
    60. 
            30
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 7d58507 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> c871248 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e011b0df (Add login registration pages)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 0c57e4e (Fix)
<<<<<<< HEAD
>>>>>>> 8887ba5b (Fix)
=======
=======
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5e31aeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 53db2224 (Featire specs)
=======
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
=======
=======
>>>>>>> f182ac7 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 852864e (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 1d11874 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> ff4c2fe0 (Add login registration pages)
=======
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0f24a043 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 551f3c1 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 06e5e41 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 8f1baf1c (Add login registration pages)
=======
=======
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> b8c2784f (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> a624084 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> ccec311 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 385136b (Add login registration pages)
<<<<<<< HEAD
>>>>>>> dda81aa9 (Add login registration pages)
=======
=======
=======
=======
=======
          
    61. 
            24
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 392646b5 (Featire specs)
=======
=======
=======
=======
=======
          
    62. 
            24
<<<<<<< HEAD
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 03c0867 (Add login registration pages)
=======
=======
          
    63. 
            25
<<<<<<< HEAD
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 6a9fede (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 8c3e531 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 1c33e01 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 40a3d25f (Add login registration pages)
=======
=======
=======
=======
          
    64. 
            30
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 715fac2 (Featire specs)
<<<<<<< HEAD
>>>>>>> fb61c5a (Featire specs)
<<<<<<< HEAD
>>>>>>> 73f364d8 (Featire specs)
=======
=======
=======
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 22ee41c (Add login registration pages)
>>>>>>> 03c0867 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 8d4ec55 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 73dcd461 (Add login registration pages)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
=======
=======
          
    65. 
            24
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
=======
=======
          
    66. 
            24
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
=======
          
    67. 
            25
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 9ec6862 (Add login registration pages)
=======
=======
          
    68. 
            24
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
=======
          
    69. 
            24
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> fb61c5a (Featire specs)
=======
>>>>>>> 9e081dc (Fix)
=======
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 15c51b7 (Featire specs)
=======
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 72b9cab (Featire specs)
=======
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8181d13 (Featire specs)
=======
>>>>>>> 973ba8c (Featire specs)
=======
=======
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 5e31aeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 0c57e4e (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
>>>>>>> bf05825 (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> c51bf93 (Featire specs)
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
=======
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> f92a45b (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> bf05825 (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> c51bf93 (Featire specs)
=======
=======
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 99dad91f (Fix)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 872e675 (Fix)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4a2f2ad8 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5b7749a (Fix)
=======
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> c12b71de (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> b904d7ae (Featire specs)
=======
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
=======
>>>>>>> ef483b6d (Fix)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> d8abfed3 (Featire specs)
=======
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 5a2009f1 (Fix)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
=======
=======
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 74240509 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a1a479e2 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 393eff3b (Featire specs)
=======
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
>>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price)
=======
>>>>>>> ebcdce06 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 610b6138 (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 37e48018 (Featire specs)
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> fdab719f (Fix)
=======
=======
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b904d7ae (Featire specs)
=======
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0c57e4e (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 973ba8c (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1d59aaa (Fix)
=======
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0f24a043 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> b8c2784f (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 392646b5 (Featire specs)
=======
=======
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 715fac2 (Featire specs)
<<<<<<< HEAD
>>>>>>> fb61c5a (Featire specs)
<<<<<<< HEAD
>>>>>>> 73f364d8 (Featire specs)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
                if SORT_METHODS.include?(params[:sort].to_s)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> e6fc67c7 (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> 73f364d8 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 4f4ea3f9 (Featire specs)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> fb61c5a (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
=======
=======
>>>>>>> df37394 (Featire specs)
>>>>>>> 416166f (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> ebcdce06 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
>>>>>>> df37394 (Featire specs)
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
>>>>>>> 715fac2 (Featire specs)
<<<<<<< HEAD
>>>>>>> fb61c5a (Featire specs)
<<<<<<< HEAD
>>>>>>> 73f364d8 (Featire specs)
=======
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
>>>>>>> afa56d1 (Featire specs)
>>>>>>> e1ecabbe (Featire specs)
                if SORT_METHODS.include?(params[:sort].to_s)
=======
                if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s)
>>>>>>> 752f0c0 (Featire specs)
=======
                if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s)
>>>>>>> 4e81ea2 (Featire specs)
=======
                if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s)
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 7a08014b (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> e6fc67c7 (Featire specs)
=======
>>>>>>> 4a2f2ad8 (Featire specs)
=======
>>>>>>> 73f364d8 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 7a08014b (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
=======
>>>>>>> fb61c5a (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0f24a043 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
>>>>>>> afa56d1 (Featire specs)
>>>>>>> e1ecabbe (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
=======
                if SORT_METHODS.include?(params[:sort].to_s)
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> 21873de0 (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
                if SORT_METHODS.include?(params[:sort].to_s)
>>>>>>> c033601 (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
=======
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
=======
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> 973ba8c (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bf05825 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c12b71de (Featire specs)
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
>>>>>>> c12b71de (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
>>>>>>> 3cf8dd4 (Featire specs)
>>>>>>> aa4361fd (Featire specs)
                if SORT_METHODS.include?(params[:sort].to_s)
=======
                if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s)
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 7b22ad7e (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ae07231a (Featire specs)
=======
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
>>>>>>> 3cf8dd4 (Featire specs)
>>>>>>> aa4361fd (Featire specs)
>>>>>>> a636fda (Featire specs)
=======
=======
                if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s)
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c12b71de (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> c12b71de (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
=======
<<<<<<< HEAD
=======
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> e18eb87 (Fix)
=======
=======
                if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s)
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
=======
                if SORT_METHODS.include?(params[:sort].to_s)
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
                if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s)
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
>>>>>>> b8c2784f (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2612be03 (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
>>>>>>> b8c2784f (Fix book_spec decrease quantity and price)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
                if SORT_METHODS.include?(params[:sort].to_s)
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b904d7ae (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> 392646b5 (Featire specs)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
>>>>>>> ae884b47 (Fix)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
                if SORT_METHODS.include?(params[:sort].to_s)
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
=======
>>>>>>> 5a2009f1 (Fix)
=======
>>>>>>> f136376a (Featire specs)
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
<<<<<<< HEAD
=======
=======
>>>>>>> d52f9efe (Featire specs)
>>>>>>> 932dbec (Featire specs)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
                if SORT_METHODS.include?(params[:sort].to_s)
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> ae884b47 (Fix)
=======
=======
=======
=======
=======
                if SORT_METHODS.include?(params[:sort].to_s)
>>>>>>> a5d032d (Fix)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                if SORT_METHODS.include?(params[:sort].to_s)
>>>>>>> a5d032d (Fix)
>>>>>>> e3e66f3 (Featire specs)
=======
                if SORT_METHODS.include?(params[:sort].to_s)
=======
                if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s)
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376a (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s)
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0ea (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s)
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888bf (Featire specs)
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                if SORT_METHODS.include?(params[:sort].to_s)
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 74240509 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
                if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s)
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
=======
                if SORT_METHODS.include?(params[:sort].to_s)
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a1a479e2 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
                if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s)
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 393eff3b (Featire specs)
=======
=======
=======
=======
                if SORT_METHODS.include?(params[:sort].to_s)
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price)
=======
=======
=======
                if SORT_METHODS.include?(params[:sort].to_s)
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
>>>>>>> d9d85ca6 (Fix)
=======
                if SORT_METHODS.include?(params[:sort].to_s)
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> ebcdce06 (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
                if SORT_METHODS.include?(params[:sort].to_s)
>>>>>>> a5d032d (Fix)
>>>>>>> 31d15e66 (Fix)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> fdab719f (Fix)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
                if SORT_METHODS.include?(params[:sort].to_s)
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> 8288136d (Fix)
=======
=======
=======
=======
=======
                if SORT_METHODS.include?(params[:sort].to_s)
>>>>>>> a5d032d (Fix)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                if SORT_METHODS.include?(params[:sort].to_s)
>>>>>>> a5d032d (Fix)
>>>>>>> e3e66f3 (Featire specs)
=======
                if SORT_METHODS.include?(params[:sort].to_s)
=======
                if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s)
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> d52f9efe (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s)
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s)
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> c12b71de (Featire specs)
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                if SORT_METHODS.include?(params[:sort].to_s)
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
                if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s)
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
=======
                if SORT_METHODS.include?(params[:sort].to_s)
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
                if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s)
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b904d7ae (Featire specs)
=======
=======
=======
=======
                if SORT_METHODS.include?(params[:sort].to_s)
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
=======
=======
=======
                if SORT_METHODS.include?(params[:sort].to_s)
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
>>>>>>> ef483b6d (Fix)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 15c51b7 (Featire specs)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                if SORT_METHODS.include?(params[:sort].to_s)
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
                if SORT_METHODS.include?(params[:sort].to_s)
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 0c57e4e (Fix)
<<<<<<< HEAD
>>>>>>> 8887ba5b (Fix)
=======
=======
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
                if SORT_METHODS.include?(params[:sort].to_s)
=======
                if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s)
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5e31aeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 53db2224 (Featire specs)
=======
=======
=======
=======
=======
                if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s)
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
=======
=======
                if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s)
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
=======
=======
=======
                if SORT_METHODS.include?(params[:sort].to_s)
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0f24a043 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
=======
                if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s)
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
=======
=======
=======
                if SORT_METHODS.include?(params[:sort].to_s)
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> b8c2784f (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
=======
                if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s)
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 392646b5 (Featire specs)
=======
=======
=======
=======
=======
                if SORT_METHODS.include?(params[:sort].to_s)
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
                if SORT_METHODS.include?(params[:sort].to_s)
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 715fac2 (Featire specs)
<<<<<<< HEAD
>>>>>>> fb61c5a (Featire specs)
<<<<<<< HEAD
>>>>>>> 73f364d8 (Featire specs)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      70. 
        
      
      
        
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
    70. 
            12
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> c51bf93 (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> bf05825 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> c51bf93 (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> bf05825 (Featire specs)
=======
>>>>>>> f92a45b (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0c57e4e (Fix)
=======
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 973ba8c (Featire specs)
=======
>>>>>>> 8181d13 (Featire specs)
=======
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 72b9cab (Featire specs)
=======
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 15c51b7 (Featire specs)
=======
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9e081dc (Fix)
=======
>>>>>>> fb61c5a (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
=======
=======
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
    71. 
            12
=======
=======
>>>>>>> 9a49b7b (Rebased)
=======
>>>>>>> 70fcacc (Featire specs)
=======
>>>>>>> ae409ca (Featire specs)
=======
>>>>>>> 379a979 (Featire specs)
=======
>>>>>>> adc21e0 (Featire specs)
=======
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4d90e3d (Featire specs)
=======
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 160fb15 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4d90e3d (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 160fb15 (Fix)
>>>>>>> 67ab5299 (Fix)
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
=======
=======
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
=======
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
=======
          
    72. 
            12
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
=======
=======
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
=======
=======
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> bf05825 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
=======
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
>>>>>>> b28889f (Fix)
>>>>>>> e18eb87 (Fix)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 0c57e4e (Fix)
=======
=======
>>>>>>> 5507b42 (Featire specs)
>>>>>>> 5e31aeb (Featire specs)
=======
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> 51bc18c (Featire specs)
=======
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> 973ba8c (Featire specs)
=======
=======
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
=======
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
=======
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
=======
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
          
    73. 
>>>>>>> 84003439 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> ebcdce06 (Featire specs)
          
    74. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
    75. 
=======
          
    76. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
    77. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
    78. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
            7
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9bfbd88 (Featire specs)
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> 9bfbd88 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 9bfbd88 (Featire specs)
>>>>>>> f7852d17 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 84003439 (Featire specs)
>>>>>>> 9bfbd88 (Featire specs)
<<<<<<< HEAD
=======
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> c12b71de (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
>>>>>>> 51bc18c (Featire specs)
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
>>>>>>> 4a2f2ad8 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> 8181d13 (Featire specs)
>>>>>>> 4a2f2ad8 (Featire specs)
          
    79. 
            12
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9a49b7b (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b904d7ae (Featire specs)
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
>>>>>>> b904d7ae (Featire specs)
=======
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 6da9530 (Featire specs)
>>>>>>> 0f8241bb (Featire specs)
          
    80. 
            12
>>>>>>> c033601 (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
          
    81. 
            12
=======
          
    82. 
            12
>>>>>>> 9620751 (Featire specs)
=======
          
    83. 
            7
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
=======
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> d52f9efe (Featire specs)
=======
=======
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> 77d62af (Featire specs)
>>>>>>> ae07231a (Featire specs)
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 70fcacc (Featire specs)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 009401d (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
          
    84. 
            7
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c12b71de (Featire specs)
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
=======
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> 77d62af (Featire specs)
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> c12b71de (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> efd6af09 (Featire specs)
>>>>>>> ae409ca (Featire specs)
=======
>>>>>>> c8da2e3 (Fix)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
          
    85. 
            7
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 379a979 (Featire specs)
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
=======
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
          
    86. 
            7
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> 74240509 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> adc21e0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
=======
=======
>>>>>>> df37394 (Featire specs)
          
    87. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
    88. 
=======
          
    89. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
    90. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
    91. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
=======
=======
          
    92. 
>>>>>>> 0d6dd12 (Manifest_cache true)
            7
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
=======
          
    93. 
            7
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4d90e3d (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
    94. 
            7
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
=======
          
    95. 
            7
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
    96. 
            7
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> e3e66f3 (Featire specs)
=======
          
    97. 
            12
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 160fb15 (Fix)
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 932dbec (Featire specs)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
          
    98. 
            7
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> ae884b47 (Fix)
=======
=======
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376a (Featire specs)
=======
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0ea (Featire specs)
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888bf (Featire specs)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 74240509 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a1a479e2 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> fdab719f (Fix)
=======
=======
          
    99. 
            7
<<<<<<< HEAD
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 393eff3b (Featire specs)
=======
=======
=======
=======
          
    100. 
            7
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
    101. 
            12
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
>>>>>>> d9d85ca6 (Fix)
=======
          
    102. 
            12
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> 9bfbd88 (Featire specs)
>>>>>>> ebcdce06 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 379a979 (Featire specs)
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
=======
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
          
    103. 
            7
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> adc21e0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 610b6138 (Featire specs)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
=======
=======
>>>>>>> df37394 (Featire specs)
          
    104. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
    105. 
=======
          
    106. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
    107. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
    108. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
=======
=======
          
    109. 
>>>>>>> 0d6dd12 (Manifest_cache true)
            7
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
    110. 
            7
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4d90e3d (Featire specs)
<<<<<<< HEAD
>>>>>>> 37e48018 (Featire specs)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
    111. 
            7
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
=======
          
    112. 
            7
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
    113. 
            7
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> e3e66f3 (Featire specs)
=======
          
    114. 
            12
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 160fb15 (Fix)
<<<<<<< HEAD
>>>>>>> 31d15e66 (Fix)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 932dbec (Featire specs)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> fdab719f (Fix)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
          
    115. 
            7
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> 8288136d (Fix)
=======
=======
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> d52f9efe (Featire specs)
=======
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> c12b71de (Featire specs)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
    116. 
            7
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b904d7ae (Featire specs)
=======
=======
=======
=======
          
    117. 
            7
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> 72b9cab (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
          
    118. 
            12
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
>>>>>>> ef483b6d (Fix)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
          
    119. 
            12
=======
          
    120. 
            12
>>>>>>> 9620751 (Featire specs)
=======
          
    121. 
            12
>>>>>>> 2a25e4c (Featire specs)
=======
          
    122. 
            7
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
          
    123. 
            7
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
=======
          
    124. 
            7
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
          
    125. 
            7
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
          
    126. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
    127. 
=======
          
    128. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
    129. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
    130. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
            7
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
=======
          
    131. 
            7
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 715fac2 (Featire specs)
          
    132. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
    133. 
=======
          
    134. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
    135. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
    136. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
            7
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
    137. 
            12
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
          
    138. 
            7
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 0c57e4e (Fix)
<<<<<<< HEAD
>>>>>>> 8887ba5b (Fix)
=======
=======
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5e31aeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 53db2224 (Featire specs)
=======
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0f24a043 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> b8c2784f (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
=======
          
    139. 
            7
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 392646b5 (Featire specs)
=======
=======
=======
=======
=======
          
    140. 
            7
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
    141. 
            12
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
=======
=======
          
    142. 
            7
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
=======
=======
          
    143. 
            7
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
=======
          
    144. 
            7
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
=======
=======
          
    145. 
            7
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
          
    146. 
            7
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            

            

                  if params[:category].nil?
          
      147. 
        
      
      
        
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
    147. 
            12
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> c51bf93 (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> bf05825 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> c51bf93 (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> bf05825 (Featire specs)
=======
>>>>>>> f92a45b (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0c57e4e (Fix)
=======
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 973ba8c (Featire specs)
=======
>>>>>>> 8181d13 (Featire specs)
=======
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 72b9cab (Featire specs)
=======
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 15c51b7 (Featire specs)
=======
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9e081dc (Fix)
=======
>>>>>>> fb61c5a (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
=======
=======
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
    148. 
            12
=======
=======
>>>>>>> 9a49b7b (Rebased)
=======
>>>>>>> 70fcacc (Featire specs)
=======
>>>>>>> ae409ca (Featire specs)
=======
>>>>>>> 379a979 (Featire specs)
=======
>>>>>>> adc21e0 (Featire specs)
=======
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4d90e3d (Featire specs)
=======
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 160fb15 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4d90e3d (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 160fb15 (Fix)
>>>>>>> 67ab5299 (Fix)
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
=======
=======
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
=======
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
=======
          
    149. 
            12
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
=======
=======
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
=======
=======
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> bf05825 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
=======
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
>>>>>>> b28889f (Fix)
>>>>>>> e18eb87 (Fix)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 0c57e4e (Fix)
=======
=======
>>>>>>> 5507b42 (Featire specs)
>>>>>>> 5e31aeb (Featire specs)
=======
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> 51bc18c (Featire specs)
=======
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> 973ba8c (Featire specs)
=======
=======
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
=======
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
=======
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
=======
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
          
    150. 
>>>>>>> 84003439 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> ebcdce06 (Featire specs)
          
    151. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
    152. 
=======
          
    153. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
    154. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
    155. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
            7
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9bfbd88 (Featire specs)
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> 9bfbd88 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 9bfbd88 (Featire specs)
>>>>>>> f7852d17 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 84003439 (Featire specs)
>>>>>>> 9bfbd88 (Featire specs)
<<<<<<< HEAD
=======
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> c12b71de (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
>>>>>>> 51bc18c (Featire specs)
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
>>>>>>> 4a2f2ad8 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> 8181d13 (Featire specs)
>>>>>>> 4a2f2ad8 (Featire specs)
          
    156. 
            12
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9a49b7b (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b904d7ae (Featire specs)
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
>>>>>>> b904d7ae (Featire specs)
=======
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 6da9530 (Featire specs)
>>>>>>> 0f8241bb (Featire specs)
          
    157. 
            12
>>>>>>> c033601 (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
          
    158. 
            12
=======
          
    159. 
            12
>>>>>>> 9620751 (Featire specs)
=======
          
    160. 
            7
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
=======
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> d52f9efe (Featire specs)
=======
=======
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> 77d62af (Featire specs)
>>>>>>> ae07231a (Featire specs)
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 70fcacc (Featire specs)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 009401d (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
          
    161. 
            7
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c12b71de (Featire specs)
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
=======
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> 77d62af (Featire specs)
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> c12b71de (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> efd6af09 (Featire specs)
>>>>>>> ae409ca (Featire specs)
=======
>>>>>>> c8da2e3 (Fix)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
          
    162. 
            7
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 379a979 (Featire specs)
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
=======
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
          
    163. 
            7
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> 74240509 (Fix book_spec decrease quantity and price)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
>>>>>>> adc21e0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
=======
=======
>>>>>>> df37394 (Featire specs)
          
    164. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
    165. 
=======
          
    166. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
    167. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
    168. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
=======
=======
          
    169. 
>>>>>>> 0d6dd12 (Manifest_cache true)
            7
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
=======
          
    170. 
            7
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4d90e3d (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
    171. 
            7
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
=======
          
    172. 
            7
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
    173. 
            7
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> e3e66f3 (Featire specs)
=======
          
    174. 
            12
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 160fb15 (Fix)
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 932dbec (Featire specs)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
          
    175. 
            7
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> ae884b47 (Fix)
=======
=======
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376a (Featire specs)
=======
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0ea (Featire specs)
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888bf (Featire specs)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 74240509 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a1a479e2 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> fdab719f (Fix)
=======
=======
          
    176. 
            7
<<<<<<< HEAD
>>>>>>> 4552227 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 379a979 (Featire specs)
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
=======
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
          
    177. 
            7
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> adc21e0 (Featire specs)
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
=======
=======
>>>>>>> df37394 (Featire specs)
          
    178. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
    179. 
=======
          
    180. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
    181. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
    182. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
=======
=======
          
    183. 
>>>>>>> 0d6dd12 (Manifest_cache true)
            7
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
    184. 
            7
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4d90e3d (Featire specs)
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
    185. 
            7
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
=======
          
    186. 
            7
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
    187. 
            7
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> e3e66f3 (Featire specs)
=======
          
    188. 
            12
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 160fb15 (Fix)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
=======
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 932dbec (Featire specs)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
          
    189. 
            7
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
=======
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
=======
          
    190. 
            7
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
=======
          
    191. 
            7
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> 72b9cab (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
          
    192. 
            12
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
          
    193. 
            12
=======
          
    194. 
            12
>>>>>>> 9620751 (Featire specs)
=======
          
    195. 
            12
>>>>>>> 2a25e4c (Featire specs)
=======
          
    196. 
            7
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 6da9530 (Featire specs)
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
          
    197. 
            7
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0ed7f7c (Featire specs)
=======
=======
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
=======
          
    198. 
            7
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
          
    199. 
            7
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
          
    200. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
    201. 
=======
          
    202. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
    203. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
    204. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
            7
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
=======
          
    205. 
            7
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 715fac2 (Featire specs)
          
    206. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
    207. 
=======
          
    208. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
    209. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
    210. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
            7
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
    211. 
            12
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> e18eb87 (Fix)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 659083f (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
          
    212. 
            7
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 0c57e4e (Fix)
=======
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5e31aeb (Featire specs)
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 51bc18c (Featire specs)
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 973ba8c (Featire specs)
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
    213. 
            7
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
=======
=======
=======
=======
          
    214. 
            7
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
    215. 
            12
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
=======
=======
>>>>>>> a636fda (Featire specs)
=======
=======
          
    216. 
            7
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
=======
=======
=======
=======
          
    217. 
            7
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
=======
          
    218. 
            7
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
=======
=======
=======
=======
          
    219. 
            7
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
          
    220. 
            7
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
            

            

>>>>>>> 610b6138 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 393eff3b (Featire specs)
=======
=======
=======
=======
          
    221. 
            7
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
    222. 
            12
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
>>>>>>> d9d85ca6 (Fix)
=======
          
    223. 
            12
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> 9bfbd88 (Featire specs)
>>>>>>> ebcdce06 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                    Book.order(params[:sort])
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 9e081dc (Fix)
=======
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 15c51b7 (Featire specs)
=======
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 72b9cab (Featire specs)
=======
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8181d13 (Featire specs)
=======
>>>>>>> 973ba8c (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 0c57e4e (Fix)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> bf05825 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> bf05825 (Featire specs)
=======
<<<<<<< HEAD
=======
=======
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> f8e5c9db (Featire specs)
<<<<<<< HEAD
=======
=======
=======
>>>>>>> e18eb87 (Fix)
>>>>>>> 99dad91f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> 2274daf2 (Featire specs)
>>>>>>> c8da2e3 (Fix)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
>>>>>>> 9440753 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> 8887ba5b (Fix)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> 53db2224 (Featire specs)
>>>>>>> 557c1b8 (Fix)
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> bf05825 (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
=======
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
>>>>>>> b904d7ae (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
=======
>>>>>>> ef483b6d (Fix)
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b904d7ae (Featire specs)
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> c8da2e3 (Fix)
>>>>>>> fdab719f (Fix)
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 557c1b8 (Fix)
>>>>>>> 8288136d (Fix)
=======
=======
>>>>>>> ae07231a (Featire specs)
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> d52f9efe (Featire specs)
=======
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c12b71de (Featire specs)
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
>>>>>>> c12b71de (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
>>>>>>> b904d7ae (Featire specs)
=======
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 0c57e4e (Fix)
<<<<<<< HEAD
>>>>>>> 8887ba5b (Fix)
=======
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5e31aeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 53db2224 (Featire specs)
=======
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0f24a043 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> b8c2784f (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 392646b5 (Featire specs)
=======
=======
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
                    Book.order(params[:sort])
=======
                    Book.all.order(params[:sort])
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 53db2224 (Featire specs)
=======
>>>>>>> 7b22ad7e (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> 5507b42 (Featire specs)
>>>>>>> 932dbec (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
>>>>>>> 5507b42 (Featire specs)
>>>>>>> 5e31aeb (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 53db2224 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 7b22ad7e (Featire specs)
                    Book.all.order(params[:sort])
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
=======
=======
                    Book.all.order(params[:sort])
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                    Book.all.order(params[:sort])
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fdab719f (Fix)
=======
=======
                    Book.all.order(params[:sort])
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                    Book.all.order(params[:sort])
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
                    Book.all.order(params[:sort])
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c12b71de (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
                    Book.all.order(params[:sort])
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
<<<<<<< HEAD
=======
                    Book.all.order(params[:sort])
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
<<<<<<< HEAD
=======
                    Book.all.order(params[:sort])
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
                    Book.all.order(params[:sort])
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
                    Book.all.order(params[:sort])
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> d8abfed3 (Featire specs)
=======
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
<<<<<<< HEAD
=======
                    Book.all.order(params[:sort])
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
<<<<<<< HEAD
=======
                    Book.all.order(params[:sort])
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
                    Book.all.order(params[:sort])
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> a1a479e2 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 393eff3b (Featire specs)
=======
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
>>>>>>> b904d7ae (Featire specs)
=======
                    Book.order(params[:sort])
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
=======
>>>>>>> 5a2009f1 (Fix)
=======
>>>>>>> ae884b47 (Fix)
=======
>>>>>>> f136376a (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
                    Book.all.order(params[:sort])
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 557c1b8 (Fix)
>>>>>>> 8288136d (Fix)
=======
>>>>>>> d52f9efe (Featire specs)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
=======
                    Book.all.order(params[:sort])
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
=======
                    Book.all.order(params[:sort])
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> ae884b47 (Fix)
=======
=======
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376a (Featire specs)
=======
=======
=======
=======
=======
>>>>>>> 9620751 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 9620751 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                    Book.all.order(params[:sort])
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0ea (Featire specs)
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888bf (Featire specs)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
=======
                    Book.all.order(params[:sort])
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 74240509 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
=======
                    Book.all.order(params[:sort])
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a1a479e2 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
                    Book.all.order(params[:sort])
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 393eff3b (Featire specs)
=======
=======
=======
=======
                    Book.all.order(params[:sort])
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price)
=======
=======
=======
                    Book.order(params[:sort])
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
>>>>>>> d9d85ca6 (Fix)
=======
                    Book.order(params[:sort])
>>>>>>> c7a726c5 (Rebased)
=======
=======
                    Book.all.order(params[:sort])
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 610b6138 (Featire specs)
=======
=======
                    Book.all.order(params[:sort])
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
=======
                    Book.all.order(params[:sort])
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 37e48018 (Featire specs)
=======
=======
                    Book.all.order(params[:sort])
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
                    Book.order(params[:sort])
>>>>>>> a5d032d (Fix)
>>>>>>> 31d15e66 (Fix)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> fdab719f (Fix)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
=======
                    Book.all.order(params[:sort])
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
                    Book.all.order(params[:sort])
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> 8288136d (Fix)
=======
=======
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> d52f9efe (Featire specs)
=======
=======
=======
=======
=======
>>>>>>> 9620751 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 9620751 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                    Book.all.order(params[:sort])
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> c12b71de (Featire specs)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
=======
                    Book.all.order(params[:sort])
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
=======
                    Book.all.order(params[:sort])
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
                    Book.all.order(params[:sort])
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b904d7ae (Featire specs)
=======
=======
=======
=======
                    Book.all.order(params[:sort])
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
=======
=======
=======
                    Book.order(params[:sort])
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
>>>>>>> ef483b6d (Fix)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
                    Book.all.order(params[:sort])
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
                    Book.all.order(params[:sort])
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
                    Book.all.order(params[:sort])
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
=======
                    Book.all.order(params[:sort])
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
                    Book.all.order(params[:sort])
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                    Book.all.order(params[:sort])
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                    Book.order(params[:sort])
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
=======
                    Book.all.order(params[:sort])
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
=======
                    Book.all.order(params[:sort])
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 0c57e4e (Fix)
<<<<<<< HEAD
>>>>>>> 8887ba5b (Fix)
=======
=======
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5e31aeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 53db2224 (Featire specs)
=======
=======
=======
=======
=======
                    Book.all.order(params[:sort])
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
=======
=======
=======
                    Book.all.order(params[:sort])
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0f24a043 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
=======
                    Book.all.order(params[:sort])
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> b8c2784f (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
=======
                    Book.all.order(params[:sort])
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 392646b5 (Featire specs)
=======
=======
=======
=======
=======
                    Book.all.order(params[:sort])
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
                    Book.order(params[:sort])
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
                    Book.all.order(params[:sort])
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
=======
                    Book.all.order(params[:sort])
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
=======
                    Book.all.order(params[:sort])
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      224. 
        
      
      
        
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> fb61c5a (Featire specs)
=======
>>>>>>> 9e081dc (Fix)
=======
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 15c51b7 (Featire specs)
=======
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 72b9cab (Featire specs)
=======
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8181d13 (Featire specs)
=======
>>>>>>> 973ba8c (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> 0c57e4e (Fix)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
=======
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
=======
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> bf05825 (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> c51bf93 (Featire specs)
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
=======
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bf05825 (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> c51bf93 (Featire specs)
=======
=======
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 99dad91f (Fix)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 872e675 (Fix)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4a2f2ad8 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5b7749a (Fix)
=======
<<<<<<< HEAD
>>>>>>> 37e48018 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> c12b71de (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> b904d7ae (Featire specs)
=======
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
=======
>>>>>>> ef483b6d (Fix)
=======
=======
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
>>>>>>> e5752db (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0c57e4e (Fix)
<<<<<<< HEAD
>>>>>>> 8887ba5b (Fix)
=======
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> 5e31aeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 53db2224 (Featire specs)
=======
=======
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
>>>>>>> ee5242b (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0f24a043 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> a9e66e9 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> b8c2784f (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 6fba6be (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 392646b5 (Featire specs)
=======
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 1d59aaa (Fix)
=======
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> d8abfed3 (Featire specs)
=======
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
=======
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2612be03 (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 5a2009f1 (Fix)
=======
>>>>>>> 4a2f2ad8 (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> 8181d13 (Featire specs)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
=======
=======
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 74240509 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a1a479e2 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 393eff3b (Featire specs)
=======
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
>>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price)
=======
>>>>>>> ebcdce06 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> fdab719f (Fix)
=======
=======
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b904d7ae (Featire specs)
=======
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0f24a043 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> b8c2784f (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 392646b5 (Featire specs)
=======
=======
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 715fac2 (Featire specs)
<<<<<<< HEAD
>>>>>>> fb61c5a (Featire specs)
<<<<<<< HEAD
>>>>>>> 73f364d8 (Featire specs)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
    224. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> ebcdce06 (Featire specs)
=======
>>>>>>> df37394 (Featire specs)
>>>>>>> 7a08014b (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
>>>>>>> df37394 (Featire specs)
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
=======
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 715fac2 (Featire specs)
>>>>>>> fb61c5a (Featire specs)
>>>>>>> 73f364d8 (Featire specs)
          
    225. 
=======
          
    226. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
    227. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
    228. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 7a08014b (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> e6fc67c7 (Featire specs)
=======
>>>>>>> 4a2f2ad8 (Featire specs)
=======
>>>>>>> 73f364d8 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 7a08014b (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
=======
>>>>>>> fb61c5a (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0f24a043 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
>>>>>>> afa56d1 (Featire specs)
>>>>>>> e1ecabbe (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
=======
          
    229. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> 21873de0 (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
          
    230. 
>>>>>>> c033601 (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
=======
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
=======
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> 973ba8c (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bf05825 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c12b71de (Featire specs)
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
>>>>>>> c12b71de (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
>>>>>>> 3cf8dd4 (Featire specs)
>>>>>>> aa4361fd (Featire specs)
          
    231. 
=======
          
    232. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 7b22ad7e (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ae07231a (Featire specs)
=======
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
>>>>>>> 3cf8dd4 (Featire specs)
>>>>>>> aa4361fd (Featire specs)
>>>>>>> a636fda (Featire specs)
=======
=======
          
    233. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c12b71de (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> c12b71de (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
=======
<<<<<<< HEAD
=======
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> e18eb87 (Fix)
=======
=======
          
    234. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
=======
          
    235. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
          
    236. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
>>>>>>> b8c2784f (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2612be03 (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
>>>>>>> b8c2784f (Fix book_spec decrease quantity and price)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
          
    237. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b904d7ae (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> 392646b5 (Featire specs)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
>>>>>>> ae884b47 (Fix)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
          
    238. 
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
=======
>>>>>>> 5a2009f1 (Fix)
=======
>>>>>>> f136376a (Featire specs)
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
<<<<<<< HEAD
=======
=======
>>>>>>> d52f9efe (Featire specs)
>>>>>>> 932dbec (Featire specs)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
    239. 
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> ae884b47 (Fix)
=======
=======
=======
=======
=======
          
    240. 
>>>>>>> a5d032d (Fix)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
    241. 
>>>>>>> a5d032d (Fix)
>>>>>>> e3e66f3 (Featire specs)
=======
          
    242. 
=======
          
    243. 
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376a (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
    244. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0ea (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
    245. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888bf (Featire specs)
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
    246. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 74240509 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
    247. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
=======
          
    248. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a1a479e2 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
    249. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 393eff3b (Featire specs)
=======
=======
=======
=======
          
    250. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
    251. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
>>>>>>> d9d85ca6 (Fix)
=======
          
    252. 
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> ebcdce06 (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
          
    253. 
>>>>>>> a5d032d (Fix)
>>>>>>> 31d15e66 (Fix)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> fdab719f (Fix)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
    254. 
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> 8288136d (Fix)
=======
=======
=======
=======
=======
          
    255. 
>>>>>>> a5d032d (Fix)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
    256. 
>>>>>>> a5d032d (Fix)
>>>>>>> e3e66f3 (Featire specs)
=======
          
    257. 
=======
          
    258. 
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> d52f9efe (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
    259. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
    260. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> c12b71de (Featire specs)
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
    261. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
    262. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
=======
          
    263. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
    264. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b904d7ae (Featire specs)
=======
=======
=======
=======
          
    265. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
    266. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
>>>>>>> ef483b6d (Fix)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 15c51b7 (Featire specs)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
    267. 
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
    268. 
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 0c57e4e (Fix)
<<<<<<< HEAD
>>>>>>> 8887ba5b (Fix)
=======
=======
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
          
    269. 
=======
          
    270. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5e31aeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 53db2224 (Featire specs)
=======
=======
=======
=======
=======
          
    271. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
=======
=======
          
    272. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
=======
=======
=======
          
    273. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0f24a043 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
=======
          
    274. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
=======
=======
=======
          
    275. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> b8c2784f (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
=======
          
    276. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 392646b5 (Featire specs)
=======
=======
=======
=======
=======
          
    277. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
    278. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 715fac2 (Featire specs)
<<<<<<< HEAD
>>>>>>> fb61c5a (Featire specs)
<<<<<<< HEAD
>>>>>>> 73f364d8 (Featire specs)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            
            

            

                  else
          
      279. 
        
      
      
        
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> fb61c5a (Featire specs)
=======
>>>>>>> 9e081dc (Fix)
=======
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 15c51b7 (Featire specs)
=======
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 72b9cab (Featire specs)
=======
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8181d13 (Featire specs)
=======
>>>>>>> 973ba8c (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> 0c57e4e (Fix)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
=======
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
=======
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> bf05825 (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> c51bf93 (Featire specs)
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
=======
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bf05825 (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> c51bf93 (Featire specs)
=======
=======
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 99dad91f (Fix)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 872e675 (Fix)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4a2f2ad8 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5b7749a (Fix)
=======
<<<<<<< HEAD
>>>>>>> 37e48018 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> c12b71de (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> b904d7ae (Featire specs)
=======
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
=======
>>>>>>> ef483b6d (Fix)
=======
=======
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
>>>>>>> e5752db (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0c57e4e (Fix)
<<<<<<< HEAD
>>>>>>> 8887ba5b (Fix)
=======
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> 5e31aeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 53db2224 (Featire specs)
=======
=======
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
>>>>>>> ee5242b (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0f24a043 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> a9e66e9 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> b8c2784f (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 6fba6be (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 392646b5 (Featire specs)
=======
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 1d59aaa (Fix)
=======
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> d8abfed3 (Featire specs)
=======
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
=======
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2612be03 (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 5a2009f1 (Fix)
=======
>>>>>>> 21873de0 (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> 72b9cab (Featire specs)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
=======
=======
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a1a479e2 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 393eff3b (Featire specs)
=======
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
>>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price)
=======
>>>>>>> ebcdce06 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> fdab719f (Fix)
=======
=======
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b904d7ae (Featire specs)
=======
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> b8c2784f (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 392646b5 (Featire specs)
=======
=======
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 715fac2 (Featire specs)
<<<<<<< HEAD
>>>>>>> fb61c5a (Featire specs)
<<<<<<< HEAD
>>>>>>> 73f364d8 (Featire specs)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
    279. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> ebcdce06 (Featire specs)
=======
>>>>>>> df37394 (Featire specs)
>>>>>>> 7a08014b (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
>>>>>>> df37394 (Featire specs)
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
=======
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 715fac2 (Featire specs)
>>>>>>> fb61c5a (Featire specs)
>>>>>>> 73f364d8 (Featire specs)
          
    280. 
=======
          
    281. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
    282. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
    283. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 7a08014b (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> e6fc67c7 (Featire specs)
=======
>>>>>>> 73f364d8 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 7a08014b (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
>>>>>>> fb61c5a (Featire specs)
<<<<<<< HEAD
>>>>>>> 73f364d8 (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
>>>>>>> afa56d1 (Featire specs)
>>>>>>> e1ecabbe (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
=======
          
    284. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> 21873de0 (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
          
    285. 
>>>>>>> c033601 (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
=======
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
=======
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> 973ba8c (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bf05825 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c12b71de (Featire specs)
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
>>>>>>> c12b71de (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0f24a043 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
>>>>>>> 3cf8dd4 (Featire specs)
>>>>>>> aa4361fd (Featire specs)
          
    286. 
=======
          
    287. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 7b22ad7e (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ae07231a (Featire specs)
=======
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
>>>>>>> 3cf8dd4 (Featire specs)
>>>>>>> aa4361fd (Featire specs)
>>>>>>> a636fda (Featire specs)
=======
=======
          
    288. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c12b71de (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> c12b71de (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
=======
<<<<<<< HEAD
=======
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> e18eb87 (Fix)
=======
=======
          
    289. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> 8181d13 (Featire specs)
>>>>>>> 4a2f2ad8 (Featire specs)
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
=======
          
    290. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
          
    291. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
>>>>>>> 9c0d812 (Featire specs)
=======
=======
          
    292. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
    293. 
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
=======
=======
>>>>>>> 932dbec (Featire specs)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
    294. 
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
=======
=======
=======
=======
          
    295. 
>>>>>>> a5d032d (Fix)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
    296. 
>>>>>>> a5d032d (Fix)
>>>>>>> e3e66f3 (Featire specs)
=======
          
    297. 
=======
          
    298. 
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
    299. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
    300. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
    301. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
    302. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
    303. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
=======
          
    304. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
=======
          
    305. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
=======
          
    306. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
=======
          
    307. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
=======
=======
>>>>>>> 15c51b7 (Featire specs)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
    308. 
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> e18eb87 (Fix)
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> f92a45b (Featire specs)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 659083f (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
=======
          
    309. 
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 0c57e4e (Fix)
=======
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
          
    310. 
=======
          
    311. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5e31aeb (Featire specs)
=======
=======
=======
=======
          
    312. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 51bc18c (Featire specs)
=======
=======
=======
=======
          
    313. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 973ba8c (Featire specs)
=======
=======
=======
=======
          
    314. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
=======
=======
=======
=======
          
    315. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
    316. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
=======
=======
=======
=======
          
    317. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
    318. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
=======
=======
=======
=======
          
    319. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
    320. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 715fac2 (Featire specs)
<<<<<<< HEAD
>>>>>>> fb61c5a (Featire specs)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
            
            

            

>>>>>>> 610b6138 (Featire specs)
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
    321. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
          
    322. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
=======
          
    323. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
>>>>>>> ae884b47 (Fix)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
          
    324. 
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
=======
>>>>>>> 5a2009f1 (Fix)
=======
>>>>>>> f136376a (Featire specs)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> 932dbec (Featire specs)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
    325. 
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> ae884b47 (Fix)
=======
=======
=======
=======
=======
          
    326. 
>>>>>>> a5d032d (Fix)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
    327. 
>>>>>>> a5d032d (Fix)
>>>>>>> e3e66f3 (Featire specs)
=======
          
    328. 
=======
          
    329. 
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376a (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
    330. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0ea (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
    331. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888bf (Featire specs)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
    332. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
    333. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 74240509 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
    334. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
=======
          
    335. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a1a479e2 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
    336. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 393eff3b (Featire specs)
=======
=======
=======
=======
          
    337. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
    338. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
>>>>>>> d9d85ca6 (Fix)
=======
          
    339. 
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> ebcdce06 (Featire specs)
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                    Book.joins(:books_categories).where(books_categories: { category_id: params[:category] }).order(params[:sort])
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 9e081dc (Fix)
=======
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 15c51b7 (Featire specs)
=======
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 72b9cab (Featire specs)
=======
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8181d13 (Featire specs)
=======
>>>>>>> 973ba8c (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 0c57e4e (Fix)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> bf05825 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> bf05825 (Featire specs)
=======
<<<<<<< HEAD
=======
=======
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> f8e5c9db (Featire specs)
<<<<<<< HEAD
=======
=======
=======
>>>>>>> e18eb87 (Fix)
>>>>>>> 99dad91f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> 2274daf2 (Featire specs)
>>>>>>> c8da2e3 (Fix)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
>>>>>>> 9440753 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> 8887ba5b (Fix)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> 53db2224 (Featire specs)
>>>>>>> 557c1b8 (Fix)
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> bf05825 (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
=======
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
>>>>>>> b904d7ae (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
=======
>>>>>>> ef483b6d (Fix)
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b904d7ae (Featire specs)
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> c8da2e3 (Fix)
>>>>>>> fdab719f (Fix)
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 557c1b8 (Fix)
>>>>>>> 8288136d (Fix)
=======
=======
>>>>>>> ae07231a (Featire specs)
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> d52f9efe (Featire specs)
=======
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c12b71de (Featire specs)
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
>>>>>>> c12b71de (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
>>>>>>> b904d7ae (Featire specs)
=======
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 0c57e4e (Fix)
<<<<<<< HEAD
>>>>>>> 8887ba5b (Fix)
=======
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5e31aeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 53db2224 (Featire specs)
=======
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0f24a043 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> b8c2784f (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 392646b5 (Featire specs)
=======
=======
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
                    Book.joins(:books_categories).where(books_categories: { category_id: params[:category] }).order(params[:sort])
=======
                    Category.find(params[:category]).books.order(params[:sort])
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 53db2224 (Featire specs)
=======
>>>>>>> 7b22ad7e (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> 5507b42 (Featire specs)
>>>>>>> 932dbec (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
>>>>>>> 5507b42 (Featire specs)
>>>>>>> 5e31aeb (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 53db2224 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 7b22ad7e (Featire specs)
                    Category.find(params[:category]).books.order(params[:sort])
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
=======
=======
                    Category.find(params[:category]).books.order(params[:sort])
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                    Category.find(params[:category]).books.order(params[:sort])
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fdab719f (Fix)
=======
=======
                    Category.find(params[:category]).books.order(params[:sort])
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                    Category.find(params[:category]).books.order(params[:sort])
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
                    Category.find(params[:category]).books.order(params[:sort])
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c12b71de (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
                    Category.find(params[:category]).books.order(params[:sort])
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
<<<<<<< HEAD
=======
                    Category.find(params[:category]).books.order(params[:sort])
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
<<<<<<< HEAD
=======
                    Category.find(params[:category]).books.order(params[:sort])
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
                    Category.find(params[:category]).books.order(params[:sort])
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
                    Category.find(params[:category]).books.order(params[:sort])
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> d8abfed3 (Featire specs)
=======
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
<<<<<<< HEAD
=======
                    Category.find(params[:category]).books.order(params[:sort])
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
<<<<<<< HEAD
=======
                    Category.find(params[:category]).books.order(params[:sort])
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
                    Category.find(params[:category]).books.order(params[:sort])
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> a1a479e2 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 393eff3b (Featire specs)
=======
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
>>>>>>> b904d7ae (Featire specs)
=======
                    Book.joins(:books_categories).where(books_categories: { category_id: params[:category] }).order(params[:sort])
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
=======
>>>>>>> 5a2009f1 (Fix)
=======
>>>>>>> ae884b47 (Fix)
=======
>>>>>>> f136376a (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
                    Category.find(params[:category]).books.order(params[:sort])
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 557c1b8 (Fix)
>>>>>>> 8288136d (Fix)
=======
>>>>>>> d52f9efe (Featire specs)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
=======
                    Category.find(params[:category]).books.order(params[:sort])
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
=======
                    Category.find(params[:category]).books.order(params[:sort])
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> ae884b47 (Fix)
=======
=======
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376a (Featire specs)
=======
=======
=======
=======
=======
>>>>>>> 9620751 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 9620751 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                    Category.find(params[:category]).books.order(params[:sort])
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0ea (Featire specs)
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888bf (Featire specs)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
=======
                    Category.find(params[:category]).books.order(params[:sort])
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 74240509 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
=======
                    Category.find(params[:category]).books.order(params[:sort])
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a1a479e2 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
                    Category.find(params[:category]).books.order(params[:sort])
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 393eff3b (Featire specs)
=======
=======
=======
=======
                    Category.find(params[:category]).books.order(params[:sort])
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price)
=======
=======
=======
                    Book.joins(:books_categories).where(books_categories: { category_id: params[:category] }).order(params[:sort])
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
>>>>>>> d9d85ca6 (Fix)
=======
                    Book.joins(:books_categories).where(books_categories: { category_id: params[:category] }).order(params[:sort])
>>>>>>> c7a726c5 (Rebased)
=======
=======
                    Category.find(params[:category]).books.order(params[:sort])
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 610b6138 (Featire specs)
=======
=======
                    Category.find(params[:category]).books.order(params[:sort])
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
=======
                    Category.find(params[:category]).books.order(params[:sort])
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 37e48018 (Featire specs)
=======
=======
                    Category.find(params[:category]).books.order(params[:sort])
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
                    Book.joins(:books_categories).where(books_categories: { category_id: params[:category] }).order(params[:sort])
>>>>>>> a5d032d (Fix)
>>>>>>> 31d15e66 (Fix)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> fdab719f (Fix)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
=======
                    Category.find(params[:category]).books.order(params[:sort])
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
                    Category.find(params[:category]).books.order(params[:sort])
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> 8288136d (Fix)
=======
=======
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> d52f9efe (Featire specs)
=======
=======
=======
=======
=======
>>>>>>> 9620751 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 9620751 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                    Category.find(params[:category]).books.order(params[:sort])
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> c12b71de (Featire specs)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
=======
                    Category.find(params[:category]).books.order(params[:sort])
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
=======
                    Category.find(params[:category]).books.order(params[:sort])
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
                    Category.find(params[:category]).books.order(params[:sort])
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b904d7ae (Featire specs)
=======
=======
=======
=======
                    Category.find(params[:category]).books.order(params[:sort])
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
=======
=======
=======
                    Book.joins(:books_categories).where(books_categories: { category_id: params[:category] }).order(params[:sort])
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
>>>>>>> ef483b6d (Fix)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
                    Category.find(params[:category]).books.order(params[:sort])
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
                    Category.find(params[:category]).books.order(params[:sort])
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
                    Category.find(params[:category]).books.order(params[:sort])
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
=======
                    Category.find(params[:category]).books.order(params[:sort])
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
                    Category.find(params[:category]).books.order(params[:sort])
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                    Category.find(params[:category]).books.order(params[:sort])
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                    Book.joins(:books_categories).where(books_categories: { category_id: params[:category] }).order(params[:sort])
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
=======
                    Category.find(params[:category]).books.order(params[:sort])
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
=======
                    Category.find(params[:category]).books.order(params[:sort])
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 0c57e4e (Fix)
<<<<<<< HEAD
>>>>>>> 8887ba5b (Fix)
=======
=======
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5e31aeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 53db2224 (Featire specs)
=======
=======
=======
=======
=======
                    Category.find(params[:category]).books.order(params[:sort])
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
=======
=======
=======
                    Category.find(params[:category]).books.order(params[:sort])
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0f24a043 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
=======
                    Category.find(params[:category]).books.order(params[:sort])
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> b8c2784f (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
=======
                    Category.find(params[:category]).books.order(params[:sort])
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 392646b5 (Featire specs)
=======
=======
=======
=======
=======
                    Category.find(params[:category]).books.order(params[:sort])
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
                    Book.joins(:books_categories).where(books_categories: { category_id: params[:category] }).order(params[:sort])
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
                    Category.find(params[:category]).books.order(params[:sort])
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
=======
                    Category.find(params[:category]).books.order(params[:sort])
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
=======
                    Category.find(params[:category]).books.order(params[:sort])
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      340. 
        
      
      
        
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> fb61c5a (Featire specs)
=======
>>>>>>> 9e081dc (Fix)
=======
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 15c51b7 (Featire specs)
=======
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 72b9cab (Featire specs)
=======
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8181d13 (Featire specs)
=======
>>>>>>> 973ba8c (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> 0c57e4e (Fix)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
=======
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
=======
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> bf05825 (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> c51bf93 (Featire specs)
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
=======
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bf05825 (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> c51bf93 (Featire specs)
=======
=======
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 99dad91f (Fix)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 872e675 (Fix)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4a2f2ad8 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5b7749a (Fix)
=======
<<<<<<< HEAD
>>>>>>> 37e48018 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> c12b71de (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> b904d7ae (Featire specs)
=======
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
=======
>>>>>>> ef483b6d (Fix)
=======
=======
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
>>>>>>> e5752db (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0c57e4e (Fix)
<<<<<<< HEAD
>>>>>>> 8887ba5b (Fix)
=======
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> 5e31aeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 53db2224 (Featire specs)
=======
=======
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
>>>>>>> ee5242b (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0f24a043 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> a9e66e9 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> b8c2784f (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 6fba6be (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 392646b5 (Featire specs)
=======
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 1d59aaa (Fix)
=======
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> d8abfed3 (Featire specs)
=======
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
=======
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2612be03 (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 5a2009f1 (Fix)
=======
>>>>>>> 4a2f2ad8 (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> 8181d13 (Featire specs)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
=======
=======
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 74240509 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a1a479e2 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 393eff3b (Featire specs)
=======
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
>>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price)
=======
>>>>>>> ebcdce06 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> fdab719f (Fix)
=======
=======
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b904d7ae (Featire specs)
=======
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0f24a043 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> b8c2784f (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 392646b5 (Featire specs)
=======
=======
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 715fac2 (Featire specs)
<<<<<<< HEAD
>>>>>>> fb61c5a (Featire specs)
<<<<<<< HEAD
>>>>>>> 73f364d8 (Featire specs)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
    340. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> ebcdce06 (Featire specs)
=======
>>>>>>> df37394 (Featire specs)
>>>>>>> 7a08014b (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
>>>>>>> df37394 (Featire specs)
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
=======
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 715fac2 (Featire specs)
>>>>>>> fb61c5a (Featire specs)
>>>>>>> 73f364d8 (Featire specs)
          
    341. 
=======
          
    342. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
    343. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
    344. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 7a08014b (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> e6fc67c7 (Featire specs)
=======
>>>>>>> 4a2f2ad8 (Featire specs)
=======
>>>>>>> 73f364d8 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 7a08014b (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
=======
>>>>>>> fb61c5a (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0f24a043 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
>>>>>>> afa56d1 (Featire specs)
>>>>>>> e1ecabbe (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
=======
          
    345. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> 21873de0 (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
          
    346. 
>>>>>>> c033601 (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
=======
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
=======
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> 973ba8c (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bf05825 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c12b71de (Featire specs)
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
>>>>>>> c12b71de (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
>>>>>>> 3cf8dd4 (Featire specs)
>>>>>>> aa4361fd (Featire specs)
          
    347. 
=======
          
    348. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 7b22ad7e (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ae07231a (Featire specs)
=======
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
>>>>>>> 3cf8dd4 (Featire specs)
>>>>>>> aa4361fd (Featire specs)
>>>>>>> a636fda (Featire specs)
=======
=======
          
    349. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c12b71de (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> c12b71de (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
=======
<<<<<<< HEAD
=======
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> e18eb87 (Fix)
=======
=======
          
    350. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
=======
          
    351. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
          
    352. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
>>>>>>> b8c2784f (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2612be03 (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
>>>>>>> b8c2784f (Fix book_spec decrease quantity and price)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
          
    353. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b904d7ae (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> 392646b5 (Featire specs)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
>>>>>>> ae884b47 (Fix)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
          
    354. 
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
=======
>>>>>>> 5a2009f1 (Fix)
=======
>>>>>>> f136376a (Featire specs)
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
<<<<<<< HEAD
=======
=======
>>>>>>> d52f9efe (Featire specs)
>>>>>>> 932dbec (Featire specs)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
    355. 
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> ae884b47 (Fix)
=======
=======
=======
=======
=======
          
    356. 
>>>>>>> a5d032d (Fix)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
    357. 
>>>>>>> a5d032d (Fix)
>>>>>>> e3e66f3 (Featire specs)
=======
          
    358. 
=======
          
    359. 
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376a (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
    360. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0ea (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
    361. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888bf (Featire specs)
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
    362. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 74240509 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
    363. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
=======
          
    364. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a1a479e2 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
    365. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 393eff3b (Featire specs)
=======
=======
=======
=======
          
    366. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
    367. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
>>>>>>> d9d85ca6 (Fix)
=======
          
    368. 
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> ebcdce06 (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
          
    369. 
>>>>>>> a5d032d (Fix)
>>>>>>> 31d15e66 (Fix)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> fdab719f (Fix)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
    370. 
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> 8288136d (Fix)
=======
=======
=======
=======
=======
          
    371. 
>>>>>>> a5d032d (Fix)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
    372. 
>>>>>>> a5d032d (Fix)
>>>>>>> e3e66f3 (Featire specs)
=======
          
    373. 
=======
          
    374. 
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> d52f9efe (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
    375. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
    376. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> c12b71de (Featire specs)
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
    377. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
    378. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
=======
          
    379. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
    380. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b904d7ae (Featire specs)
=======
=======
=======
=======
          
    381. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
    382. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
>>>>>>> ef483b6d (Fix)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 15c51b7 (Featire specs)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
    383. 
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
    384. 
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 0c57e4e (Fix)
<<<<<<< HEAD
>>>>>>> 8887ba5b (Fix)
=======
=======
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
          
    385. 
=======
          
    386. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5e31aeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 53db2224 (Featire specs)
=======
=======
=======
=======
=======
          
    387. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
=======
=======
          
    388. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
=======
=======
=======
          
    389. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0f24a043 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
=======
          
    390. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
=======
=======
=======
          
    391. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> b8c2784f (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
=======
          
    392. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 392646b5 (Featire specs)
=======
=======
=======
=======
=======
          
    393. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
    394. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 715fac2 (Featire specs)
<<<<<<< HEAD
>>>>>>> fb61c5a (Featire specs)
<<<<<<< HEAD
>>>>>>> 73f364d8 (Featire specs)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            
            

            

                  end
          
      395. 
        
      
      
        
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
    395. 
            18
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> c51bf93 (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> bf05825 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> c51bf93 (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> bf05825 (Featire specs)
=======
>>>>>>> f92a45b (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0c57e4e (Fix)
=======
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 973ba8c (Featire specs)
=======
>>>>>>> 8181d13 (Featire specs)
=======
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 72b9cab (Featire specs)
=======
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 15c51b7 (Featire specs)
=======
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9e081dc (Fix)
=======
>>>>>>> fb61c5a (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
=======
=======
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
    396. 
            18
=======
=======
>>>>>>> 9a49b7b (Rebased)
=======
>>>>>>> 70fcacc (Featire specs)
=======
>>>>>>> ae409ca (Featire specs)
=======
>>>>>>> 379a979 (Featire specs)
=======
>>>>>>> adc21e0 (Featire specs)
=======
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4d90e3d (Featire specs)
=======
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 160fb15 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4d90e3d (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 160fb15 (Fix)
>>>>>>> 67ab5299 (Fix)
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
=======
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
>>>>>>> 9440753 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> 8887ba5b (Fix)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> 53db2224 (Featire specs)
>>>>>>> 557c1b8 (Fix)
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> 7b22ad7e (Featire specs)
>>>>>>> 932dbec (Featire specs)
=======
=======
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c12b71de (Featire specs)
=======
>>>>>>> b97bb382 (Featire specs)
>>>>>>> 77d62af (Featire specs)
=======
=======
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5b7749a (Fix)
=======
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> fdab719f (Fix)
=======
=======
=======
>>>>>>> df37394 (Featire specs)
>>>>>>> c51bf93 (Featire specs)
>>>>>>> 7a08014b (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 557c1b8 (Fix)
>>>>>>> 8288136d (Fix)
=======
>>>>>>> 932dbec (Featire specs)
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> c12b71de (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 36356d3 (Featire specs)
>>>>>>> b904d7ae (Featire specs)
=======
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 5b7749a (Fix)
>>>>>>> ef483b6d (Fix)
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> b28889f (Fix)
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
=======
>>>>>>> df37394 (Featire specs)
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 0c57e4e (Fix)
<<<<<<< HEAD
>>>>>>> 8887ba5b (Fix)
=======
=======
=======
>>>>>>> 5507b42 (Featire specs)
>>>>>>> 5e31aeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 53db2224 (Featire specs)
=======
=======
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
=======
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0f24a043 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> b8c2784f (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 392646b5 (Featire specs)
=======
=======
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
=======
>>>>>>> 715fac2 (Featire specs)
<<<<<<< HEAD
>>>>>>> fb61c5a (Featire specs)
<<<<<<< HEAD
>>>>>>> 73f364d8 (Featire specs)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
    397. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
>>>>>>> df37394 (Featire specs)
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
=======
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 715fac2 (Featire specs)
>>>>>>> fb61c5a (Featire specs)
>>>>>>> 73f364d8 (Featire specs)
          
    398. 
=======
          
    399. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
    400. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
    401. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> e6fc67c7 (Featire specs)
=======
>>>>>>> 73f364d8 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
>>>>>>> fb61c5a (Featire specs)
>>>>>>> 73f364d8 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
=======
=======
=======
          
    402. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> c8da2e3 (Fix)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> d8abfed3 (Featire specs)
=======
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
=======
>>>>>>> 5a2009f1 (Fix)
=======
>>>>>>> ae884b47 (Fix)
=======
>>>>>>> f136376a (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 932dbec (Featire specs)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> ae884b47 (Fix)
=======
=======
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376a (Featire specs)
=======
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0ea (Featire specs)
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888bf (Featire specs)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 74240509 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a1a479e2 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 393eff3b (Featire specs)
=======
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
>>>>>>> d9d85ca6 (Fix)
=======
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> ebcdce06 (Featire specs)
          
    403. 
            18
=======
<<<<<<< HEAD
          
    404. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
>>>>>>> 7a08014b (Featire specs)
          
    405. 
=======
          
    406. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
    407. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
    408. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
=======
=======
=======
          
    409. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c8da2e3 (Fix)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
=======
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 0c57e4e (Fix)
=======
>>>>>>> 5e31aeb (Featire specs)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 0676508 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
=======
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> bf05825 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
=======
>>>>>>> 6da9530 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
=======
>>>>>>> b28889f (Fix)
>>>>>>> e18eb87 (Fix)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 0c57e4e (Fix)
=======
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5e31aeb (Featire specs)
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 51bc18c (Featire specs)
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> 973ba8c (Featire specs)
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
=======
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
          
    410. 
            18
            

            

                elsif params[:category].nil?
          
      411. 
        
      
      
        
      
          
    411. 
            16
            

            

                  Book.all
          
      412. 
        
      
      
        
      
          
    412. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> c8da2e3 (Fix)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> 9e081dc (Fix)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 5b7749a (Fix)
=======
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 0c57e4e (Fix)
=======
=======
>>>>>>> 5507b42 (Featire specs)
>>>>>>> 5e31aeb (Featire specs)
=======
=======
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
=======
=======
>>>>>>> 2a25e4c (Featire specs)
>>>>>>> 216fe41 (Featire specs)
>>>>>>> c033601 (Rebased)
=======
=======
          
    413. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> 51bc18c (Featire specs)
=======
=======
>>>>>>> 3e9f99d (Featire specs)
>>>>>>> 3cf8dd4 (Featire specs)
>>>>>>> a636fda (Featire specs)
=======
=======
          
    414. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> e18eb87 (Fix)
=======
=======
          
    415. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> 8181d13 (Featire specs)
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
>>>>>>> afa56d1 (Featire specs)
>>>>>>> b832d45 (Featire specs)
=======
=======
          
    416. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 610b6138 (Featire specs)
=======
=======
=======
          
    417. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
    418. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 37e48018 (Featire specs)
=======
=======
=======
          
    419. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 31d15e66 (Fix)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
=======
=======
>>>>>>> 932dbec (Featire specs)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> fdab719f (Fix)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> 8288136d (Fix)
=======
=======
=======
=======
=======
>>>>>>> a5d032d (Fix)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> a5d032d (Fix)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
    420. 
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> d52f9efe (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
    421. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
    422. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
>>>>>>> c12b71de (Featire specs)
            
>>>>>>> 9bfbd88 (Featire specs)
            

            

                elsif params[:category].nil?
          
      423. 
        
      
      
        
      
<<<<<<< HEAD
          
    423. 
            16
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
          
    424. 
            17
<<<<<<< HEAD
=======
=======
          
    425. 
            18
>>>>>>> 1214e1f (Add login registration pages)
=======
          
    426. 
            17
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 9bfbd88 (Featire specs)
            

            

                  Book.all
          
      427. 
        
      
      
        
      
<<<<<<< HEAD
          
    427. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> c8da2e3 (Fix)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
=======
=======
>>>>>>> 5507b42 (Featire specs)
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 5b7749a (Fix)
>>>>>>> c033601 (Rebased)
=======
=======
          
    428. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> a636fda (Featire specs)
=======
=======
          
    429. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
    430. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> b832d45 (Featire specs)
=======
=======
          
    431. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 74240509 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
=======
          
    432. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> 72b9cab (Featire specs)
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
          
    433. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
=======
          
    434. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 15c51b7 (Featire specs)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
>>>>>>> ae884b47 (Fix)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
=======
>>>>>>> 8887ba5b (Fix)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0c57e4e (Fix)
=======
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> f136376a (Featire specs)
=======
>>>>>>> 53db2224 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
=======
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 5e31aeb (Featire specs)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 0c57e4e (Fix)
=======
=======
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> ae884b47 (Fix)
=======
=======
=======
=======
=======
>>>>>>> a5d032d (Fix)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> a5d032d (Fix)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
    435. 
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376a (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
    436. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0ea (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
    437. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888bf (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0c57e4e (Fix)
<<<<<<< HEAD
>>>>>>> 8887ba5b (Fix)
=======
=======
=======
=======
=======
          
    438. 
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5e31aeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 53db2224 (Featire specs)
=======
=======
=======
=======
=======
          
    439. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
=======
=======
          
    440. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
=======
=======
=======
          
    441. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
=======
=======
=======
          
    442. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
>>>>>>> 0f24a043 (Fix book_spec decrease quantity and price)
            
>>>>>>> 9bfbd88 (Featire specs)
            

            

                elsif params[:category].nil?
          
      443. 
        
      
      
        
      
<<<<<<< HEAD
<<<<<<< HEAD
          
    443. 
            16
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
    444. 
            16
=======
=======
>>>>>>> 9a49b7b (Rebased)
=======
>>>>>>> 70fcacc (Featire specs)
=======
>>>>>>> ae409ca (Featire specs)
=======
>>>>>>> 379a979 (Featire specs)
=======
>>>>>>> 156ffe6 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 6066f925 (Add login registration pages)
=======
>>>>>>> bae2b7de (Add login registration pages)
<<<<<<< HEAD
=======
>>>>>>> 009401d (Featire specs)
=======
=======
>>>>>>> c51bf93 (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 31507b8 (Add login registration pages)
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> bf05825 (Featire specs)
=======
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
=======
=======
>>>>>>> c51bf93 (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 31507b8 (Add login registration pages)
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> bf05825 (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
>>>>>>> c871248 (Add login registration pages)
=======
>>>>>>> 0c57e4e (Fix)
=======
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 973ba8c (Featire specs)
=======
>>>>>>> 1d11874 (Add login registration pages)
=======
>>>>>>> 8181d13 (Featire specs)
=======
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
=======
>>>>>>> df37394 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
>>>>>>> cacbab9 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c871248 (Add login registration pages)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 7d58507 (Add login registration pages)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 973ba8c (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7d58507 (Add login registration pages)
>>>>>>> c871248 (Add login registration pages)
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 973ba8c (Featire specs)
=======
=======
=======
>>>>>>> f182ac7 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 852864e (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 1d11874 (Add login registration pages)
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
          
    445. 
            2
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> b28889f (Fix)
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
>>>>>>> cacbab9 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e5752db (Featire specs)
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7d58507 (Add login registration pages)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
          
    446. 
            2
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> b28889f (Fix)
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
=======
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 22ee41c (Add login registration pages)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
>>>>>>> 7a08014b (Featire specs)
          
    447. 
            17
<<<<<<< HEAD
=======
=======
          
    448. 
            18
>>>>>>> 1214e1f (Add login registration pages)
=======
          
    449. 
            17
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 0f24a043 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 4a2f2ad8 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 7a08014b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 9bfbd88 (Featire specs)
<<<<<<< HEAD
=======
=======
=======
=======
<<<<<<< HEAD
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
          
    450. 
            17
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bb5c652 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
    451. 
            18
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
>>>>>>> 22ee41c (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 88d49ad (Add login registration pages)
=======
=======
          
    452. 
            2
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> 9a49b7b (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 9ec6862 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> 9ec6862 (Add login registration pages)
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> bae2b7de (Add login registration pages)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 9ec6862 (Add login registration pages)
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
          
    453. 
            2
=======
          
    454. 
            2
>>>>>>> 9620751 (Featire specs)
=======
          
    455. 
            17
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> d52f9efe (Featire specs)
=======
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> ae07231a (Featire specs)
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 70fcacc (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
          
    456. 
            17
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ae07231a (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c12b71de (Featire specs)
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
=======
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> 77d62af (Featire specs)
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> c12b71de (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
>>>>>>> ae409ca (Featire specs)
=======
>>>>>>> c8da2e3 (Fix)
=======
<<<<<<< HEAD
>>>>>>> ae409ca (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
=======
          
    457. 
            17
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c12b71de (Featire specs)
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 379a979 (Featire specs)
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
=======
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 379a979 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> bae2b7de (Add login registration pages)
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> fdab719f (Fix)
=======
          
    458. 
            18
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fdab719f (Fix)
>>>>>>> 9ec6862 (Add login registration pages)
>>>>>>> 156ffe6 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6066f925 (Add login registration pages)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> fdab719f (Fix)
=======
<<<<<<< HEAD
>>>>>>> 9ec6862 (Add login registration pages)
=======
=======
          
    459. 
            17
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
=======
          
    460. 
            17
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> 9c0d812 (Featire specs)
=======
=======
          
    461. 
            17
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 7d58507 (Add login registration pages)
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7d58507 (Add login registration pages)
>>>>>>> a8b17c32 (Add login registration pages)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
=======
          
    462. 
            18
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> cacbab9 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> a8b17c32 (Add login registration pages)
=======
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 8288136d (Fix)
=======
          
    463. 
            2
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> d52f9efe (Featire specs)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 7d58507 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 31507b8 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 29e1af94 (Add login registration pages)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> ae884b47 (Fix)
=======
=======
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376a (Featire specs)
=======
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0ea (Featire specs)
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
>>>>>>> 4bf888bf (Featire specs)
=======
>>>>>>> 9ec6862 (Add login registration pages)
>>>>>>> 156ffe6 (Add login registration pages)
>>>>>>> bae2b7de (Add login registration pages)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> fdab719f (Fix)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 7d58507 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 31507b8 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> a8b17c32 (Add login registration pages)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> 8288136d (Fix)
=======
=======
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> d52f9efe (Featire specs)
=======
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
>>>>>>> c12b71de (Featire specs)
            

            

<<<<<<< HEAD
                  Book.all
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                  Book.all
=======
                  Book.joins(:books_categories).where(books_categories: { category_id: params[:category] })
>>>>>>> 9a49b7b (Rebased)
=======
=======
>>>>>>> ae409ca (Featire specs)
=======
>>>>>>> 379a979 (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> bf05825 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> bf05825 (Featire specs)
=======
<<<<<<< HEAD
=======
=======
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> f8e5c9db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
>>>>>>> c8da2e3 (Fix)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
>>>>>>> 9440753 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8288136d (Fix)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d52f9efe (Featire specs)
>>>>>>> 557c1b8 (Fix)
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> c8da2e3 (Fix)
>>>>>>> fdab719f (Fix)
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 557c1b8 (Fix)
>>>>>>> 8288136d (Fix)
=======
=======
>>>>>>> ae07231a (Featire specs)
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> d52f9efe (Featire specs)
=======
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c12b71de (Featire specs)
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
>>>>>>> c12b71de (Featire specs)
                  Book.joins(:books_categories).where(books_categories: { category_id: params[:category] })
=======
                  params[:category].nil? ? Book.all : Category.find(params[:category]).books
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
>>>>>>> 70fcacc (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ae07231a (Featire specs)
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> 5507b42 (Featire specs)
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 5507b42 (Featire specs)
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
                  params[:category].nil? ? Book.all : Category.find(params[:category]).books
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ae409ca (Featire specs)
=======
>>>>>>> c8da2e3 (Fix)
=======
=======
                  params[:category].nil? ? Book.all : Category.find(params[:category]).books
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> c12b71de (Featire specs)
>>>>>>> 379a979 (Featire specs)
=======
=======
                  params[:category].nil? ? Book.all : Category.find(params[:category]).books
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> bf05825 (Featire specs)
=======
                  params[:category].nil? ? Book.all : Category.find(params[:category]).books
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
=======
=======
=======
>>>>>>> bf05825 (Featire specs)
=======
                  params[:category].nil? ? Book.all : Category.find(params[:category]).books
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> fdab719f (Fix)
=======
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
                  params[:category].nil? ? Book.all : Category.find(params[:category]).books
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  params[:category].nil? ? Book.all : Category.find(params[:category]).books
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
                  params[:category].nil? ? Book.all : Category.find(params[:category]).books
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
                  Book.joins(:books_categories).where(books_categories: { category_id: params[:category] })
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> d52f9efe (Featire specs)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
=======
                  params[:category].nil? ? Book.all : Category.find(params[:category]).books
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
=======
                  params[:category].nil? ? Book.all : Category.find(params[:category]).books
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> ae884b47 (Fix)
=======
=======
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376a (Featire specs)
=======
=======
=======
=======
=======
                  params[:category].nil? ? Book.all : Category.find(params[:category]).books
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0ea (Featire specs)
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
>>>>>>> 4bf888bf (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> fdab719f (Fix)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
=======
                  params[:category].nil? ? Book.all : Category.find(params[:category]).books
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
                  params[:category].nil? ? Book.all : Category.find(params[:category]).books
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> 8288136d (Fix)
=======
=======
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> d52f9efe (Featire specs)
=======
=======
=======
=======
=======
                  params[:category].nil? ? Book.all : Category.find(params[:category]).books
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
>>>>>>> c12b71de (Featire specs)
          
      464. 
        
      
      
        
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 009401d (Featire specs)
=======
=======
>>>>>>> c51bf93 (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> bf05825 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
=======
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
          
    464. 
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
          
    465. 
=======
          
    466. 
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
    467. 
>>>>>>> 9c0d812 (Featire specs)
=======
          
    468. 
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
=======
          
    469. 
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> c51bf93 (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> bf05825 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
=======
=======
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> fc3774fd (Featire specs)
          
    470. 
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
          
    471. 
=======
          
    472. 
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
    473. 
>>>>>>> 9c0d812 (Featire specs)
=======
          
    474. 
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
=======
          
    475. 
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ebcdce06 (Featire specs)
=======
=======
>>>>>>> df37394 (Featire specs)
>>>>>>> 7a08014b (Featire specs)
          
    476. 
=======
          
    477. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
    478. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
    479. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
>>>>>>> 7a08014b (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
=======
=======
=======
          
    480. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
          
    481. 
>>>>>>> c033601 (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
>>>>>>> 6cdb2e1 (Featire specs)
>>>>>>> efd6af09 (Featire specs)
=======
=======
>>>>>>> c12b71de (Featire specs)
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
>>>>>>> c12b71de (Featire specs)
          
    482. 
=======
          
    483. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
>>>>>>> a636fda (Featire specs)
=======
=======
          
    484. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c12b71de (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> c12b71de (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> efd6af09 (Featire specs)
=======
=======
          
    485. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
    486. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
    487. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 74240509 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
>>>>>>> 72b9cab (Featire specs)
=======
=======
=======
          
    488. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
=======
          
    489. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a1a479e2 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
    490. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 393eff3b (Featire specs)
=======
=======
=======
=======
          
    491. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
>>>>>>> d9d85ca6 (Fix)
=======
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> ebcdce06 (Featire specs)
=======
>>>>>>> 84003439 (Featire specs)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
    492. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
    493. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
    494. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
=======
          
    495. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
    496. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b904d7ae (Featire specs)
=======
=======
=======
=======
          
    497. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
>>>>>>> ef483b6d (Fix)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a5d032d (Fix)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
>>>>>>> a9e66e9 (Featire specs)
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
>>>>>>> a9e66e9 (Featire specs)
=======
=======
=======
          
    498. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> b8c2784f (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
=======
          
    499. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 392646b5 (Featire specs)
=======
=======
=======
=======
=======
          
    500. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 715fac2 (Featire specs)
<<<<<<< HEAD
>>>>>>> fb61c5a (Featire specs)
<<<<<<< HEAD
>>>>>>> 73f364d8 (Featire specs)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            
            

            

                else
          
      501. 
        
      
      
        
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> e18eb87 (Fix)
=======
=======
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2fef4a0 (Add login registration pages)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e60833c (Add login registration pages)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> f416f45 (Add login registration pages)
=======
>>>>>>> 5b7749a (Fix)
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> 8d4ec55 (Add login registration pages)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 37e48018 (Featire specs)
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
          
    501. 
            2
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 610b6138 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2fef4a0 (Add login registration pages)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e60833c (Add login registration pages)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> f416f45 (Add login registration pages)
=======
>>>>>>> 5b7749a (Fix)
=======
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
>>>>>>> cacbab9 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
=======
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> f182ac7 (Add login registration pages)
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
>>>>>>> 2fef4a0 (Add login registration pages)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> a624084 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e60833c (Add login registration pages)
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 6a9fede (Add login registration pages)
>>>>>>> f416f45 (Add login registration pages)
=======
>>>>>>> 56fd9d41 (Add login registration pages)
          
    502. 
            2
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> 8249ff3c (Add login registration pages)
=======
=======
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
>>>>>>> 2fef4a0 (Add login registration pages)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> a624084 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e60833c (Add login registration pages)
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 6a9fede (Add login registration pages)
>>>>>>> f416f45 (Add login registration pages)
          
    503. 
            2
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6da9530 (Featire specs)
=======
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 551f3c1 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 06e5e41 (Add login registration pages)
=======
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> a624084 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> ccec311 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 385136b (Add login registration pages)
=======
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
=======
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 6a9fede (Add login registration pages)
>>>>>>> 8c3e531 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 1c33e01 (Add login registration pages)
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
          
    504. 
            2
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> b28889f (Fix)
>>>>>>> e18eb87 (Fix)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 715fac2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> 03c0867 (Add login registration pages)
>>>>>>> 73dcd461 (Add login registration pages)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 22ee41c (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> e6fc67c7 (Featire specs)
=======
>>>>>>> 73dcd461 (Add login registration pages)
>>>>>>> adc21e0 (Featire specs)
=======
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> adc21e0 (Featire specs)
>>>>>>> 610b6138 (Featire specs)
          
    505. 
=======
          
    506. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
    507. 
>>>>>>> 4e81ea2 (Featire specs)
            17
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
>>>>>>> 8d4ec55 (Add login registration pages)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
=======
>>>>>>> 715fac2 (Featire specs)
<<<<<<< HEAD
>>>>>>> fb61c5a (Featire specs)
<<<<<<< HEAD
>>>>>>> 73f364d8 (Featire specs)
=======
=======
=======
>>>>>>> 03c0867 (Add login registration pages)
>>>>>>> 8d4ec55 (Add login registration pages)
>>>>>>> 73dcd461 (Add login registration pages)
          
    508. 
            17
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
          
    509. 
            18
>>>>>>> 1214e1f (Add login registration pages)
=======
          
    510. 
            17
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> e6fc67c7 (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
=======
>>>>>>> fb61c5a (Featire specs)
>>>>>>> 73f364d8 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> 84809242 (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> f92a45b (Featire specs)
>>>>>>> e6fc67c7 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 5c33a07 (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
>>>>>>> 0f8241bb (Featire specs)
          
    511. 
            17
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0561be1d (Add login registration pages)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2fef4a0 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2fef4a0 (Add login registration pages)
=======
>>>>>>> f7852d17 (Manifest_cache true)
<<<<<<< HEAD
=======
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
          
    512. 
            18
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0561be1d (Add login registration pages)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 22ee41c (Add login registration pages)
<<<<<<< HEAD
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
>>>>>>> 8249ff3c (Add login registration pages)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
=======
          
    513. 
            18
>>>>>>> 730a8ca (Add login registration pages)
=======
>>>>>>> 37e48018 (Featire specs)
>>>>>>> 22ee41c (Add login registration pages)
<<<<<<< HEAD
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
          
    514. 
            2
<<<<<<< HEAD
>>>>>>> aca90e3 (Rebased)
=======
=======
=======
          
    515. 
            2
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 22ee41c (Add login registration pages)
=======
          
    516. 
            2
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> c033601 (Rebased)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 9ec6862 (Add login registration pages)
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
=======
          
    517. 
            18
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 22ee41c (Add login registration pages)
=======
          
    518. 
            2
>>>>>>> c033601 (Rebased)
=======
>>>>>>> 824bb2b (Featire specs)
          
    519. 
            2
=======
=======
>>>>>>> e3e66f3 (Featire specs)
          
    520. 
            2
=======
          
    521. 
            2
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
    522. 
            17
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
=======
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> e3e66f3 (Featire specs)
          
    523. 
            17
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
=======
=======
=======
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
          
    524. 
            17
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
=======
>>>>>>> f182ac7 (Add login registration pages)
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
          
    525. 
            18
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 9ec6862 (Add login registration pages)
=======
=======
          
    526. 
            17
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
>>>>>>> adc21e0 (Featire specs)
<<<<<<< HEAD
=======
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 57a2e05 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 793a6ed (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 8249ff3c (Add login registration pages)
=======
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57a2e05 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
=======
=======
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> e3e66f3 (Featire specs)
          
    527. 
            17
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4d90e3d (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
    528. 
            17
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> a624084 (Add login registration pages)
=======
          
    529. 
            18
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> cacbab9 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c5efe8e (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e989024d (Add login registration pages)
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
    530. 
            2
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 160fb15 (Fix)
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> f182ac7 (Add login registration pages)
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 74240509 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
>>>>>>> 2fef4a0 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> f6e20266 (Add login registration pages)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a1a479e2 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> a624084 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e60833c (Add login registration pages)
<<<<<<< HEAD
>>>>>>> ed8ea634 (Add login registration pages)
=======
=======
=======
=======
          
    531. 
            17
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 393eff3b (Featire specs)
=======
=======
=======
=======
          
    532. 
            17
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
    533. 
            18
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 6a9fede (Add login registration pages)
<<<<<<< HEAD
>>>>>>> f416f45 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 2be0d057 (Add login registration pages)
=======
=======
=======
          
    534. 
            2
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
>>>>>>> d9d85ca6 (Fix)
=======
=======
          
    535. 
            2
<<<<<<< HEAD
>>>>>>> aca90e3 (Rebased)
<<<<<<< HEAD
>>>>>>> c7a726c5 (Rebased)
=======
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> c033601 (Rebased)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 9ec6862 (Add login registration pages)
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 6da9530 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
>>>>>>> 06e5e41 (Add login registration pages)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
>>>>>>> 551f3c1 (Add login registration pages)
          
    536. 
            18
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 551f3c1 (Add login registration pages)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 22ee41c (Add login registration pages)
=======
          
    537. 
            2
>>>>>>> c033601 (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
          
    538. 
            2
=======
=======
>>>>>>> e3e66f3 (Featire specs)
          
    539. 
            2
=======
          
    540. 
            2
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
    541. 
            17
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
=======
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> e3e66f3 (Featire specs)
          
    542. 
            17
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
=======
=======
=======
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
          
    543. 
            17
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
=======
>>>>>>> f182ac7 (Add login registration pages)
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
          
    544. 
            18
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 9ec6862 (Add login registration pages)
=======
=======
          
    545. 
            17
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> adc21e0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 610b6138 (Featire specs)
=======
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 57a2e05 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 793a6ed (Add login registration pages)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57a2e05 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
=======
=======
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> e3e66f3 (Featire specs)
          
    546. 
            17
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4d90e3d (Featire specs)
<<<<<<< HEAD
>>>>>>> 37e48018 (Featire specs)
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
    547. 
            17
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> a624084 (Add login registration pages)
=======
          
    548. 
            18
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> cacbab9 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c5efe8e (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 56fd9d41 (Add login registration pages)
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
    549. 
            2
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 160fb15 (Fix)
<<<<<<< HEAD
>>>>>>> 31d15e66 (Fix)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> f182ac7 (Add login registration pages)
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
>>>>>>> 2fef4a0 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 0561be1d (Add login registration pages)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> a624084 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e60833c (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 512d1d87 (Add login registration pages)
=======
=======
=======
=======
          
    550. 
            17
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b904d7ae (Featire specs)
=======
=======
=======
=======
          
    551. 
            17
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
    552. 
            18
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 6a9fede (Add login registration pages)
<<<<<<< HEAD
>>>>>>> f416f45 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 4976a174 (Add login registration pages)
=======
=======
=======
          
    553. 
            2
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
>>>>>>> ef483b6d (Fix)
=======
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
=======
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 659083f (Featire specs)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
=======
=======
>>>>>>> 9ec6862 (Add login registration pages)
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
>>>>>>> afa56d1 (Featire specs)
          
    554. 
            2
=======
          
    555. 
            2
>>>>>>> 9620751 (Featire specs)
=======
          
    556. 
            2
>>>>>>> 2a25e4c (Featire specs)
=======
          
    557. 
            17
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
          
    558. 
            17
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
=======
          
    559. 
            17
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
=======
>>>>>>> f182ac7 (Add login registration pages)
=======
          
    560. 
            18
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9ec6862 (Add login registration pages)
=======
=======
          
    561. 
            17
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
=======
>>>>>>> 3b03895 (Featire specs)
=======
          
    562. 
            17
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
>>>>>>> 9c0d812 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
    563. 
            17
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 7d58507 (Add login registration pages)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> ccec311 (Add login registration pages)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> a624084 (Add login registration pages)
=======
          
    564. 
            18
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> cacbab9 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
          
    565. 
            2
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 7d58507 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> c871248 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e011b0df (Add login registration pages)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 0c57e4e (Fix)
<<<<<<< HEAD
>>>>>>> 8887ba5b (Fix)
=======
=======
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5e31aeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 53db2224 (Featire specs)
=======
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
=======
=======
>>>>>>> f182ac7 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 852864e (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 1d11874 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> ff4c2fe0 (Add login registration pages)
=======
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0f24a043 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 551f3c1 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 06e5e41 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 8f1baf1c (Add login registration pages)
=======
=======
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> b8c2784f (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> a624084 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> ccec311 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 385136b (Add login registration pages)
<<<<<<< HEAD
>>>>>>> dda81aa9 (Add login registration pages)
=======
=======
=======
=======
=======
          
    566. 
            17
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 392646b5 (Featire specs)
=======
=======
=======
=======
=======
          
    567. 
            17
<<<<<<< HEAD
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 03c0867 (Add login registration pages)
=======
=======
          
    568. 
            18
<<<<<<< HEAD
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 6a9fede (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 8c3e531 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 1c33e01 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 40a3d25f (Add login registration pages)
=======
=======
=======
=======
          
    569. 
            2
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 715fac2 (Featire specs)
<<<<<<< HEAD
>>>>>>> fb61c5a (Featire specs)
<<<<<<< HEAD
>>>>>>> 73f364d8 (Featire specs)
=======
=======
=======
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 22ee41c (Add login registration pages)
>>>>>>> 03c0867 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 8d4ec55 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 73dcd461 (Add login registration pages)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
=======
=======
          
    570. 
            17
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
=======
=======
          
    571. 
            17
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
=======
          
    572. 
            18
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 9ec6862 (Add login registration pages)
=======
=======
          
    573. 
            17
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
=======
          
    574. 
            17
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8887ba5b (Fix)
=======
>>>>>>> 7b22ad7e (Featire specs)
=======
>>>>>>> b97bb382 (Featire specs)
=======
>>>>>>> 4a2f2ad8 (Featire specs)
=======
>>>>>>> 0f24a043 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 21873de0 (Featire specs)
=======
>>>>>>> b8c2784f (Fix book_spec decrease quantity and price)
=======
>>>>>>> 392646b5 (Featire specs)
=======
>>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1049b80c (Fix)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
                  Book.joins(:books_categories).where(books_categories: { category_id: params[:category] })
=======
>>>>>>> 659083f (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 0c57e4e (Fix)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 67ab5299 (Fix)
=======
>>>>>>> 84809242 (Featire specs)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 9e081dc (Fix)
=======
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 15c51b7 (Featire specs)
=======
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 72b9cab (Featire specs)
=======
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8181d13 (Featire specs)
=======
>>>>>>> 973ba8c (Featire specs)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 74240509 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a1a479e2 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 393eff3b (Featire specs)
=======
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
>>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 31d15e66 (Fix)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b904d7ae (Featire specs)
=======
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 5e31aeb (Featire specs)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 0c57e4e (Fix)
<<<<<<< HEAD
>>>>>>> 8887ba5b (Fix)
=======
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5e31aeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 53db2224 (Featire specs)
=======
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0f24a043 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> b8c2784f (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 392646b5 (Featire specs)
=======
=======
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
                  Book.joins(:books_categories).where(books_categories: { category_id: params[:category] })
=======
                  params[:category].nil? ? Book.all : Category.find(params[:category]).books
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 53db2224 (Featire specs)
=======
>>>>>>> 7b22ad7e (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> 5507b42 (Featire specs)
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
                  params[:category].nil? ? Book.all : Category.find(params[:category]).books
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
                  params[:category].nil? ? Book.all : Category.find(params[:category]).books
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
                  params[:category].nil? ? Book.all : Category.find(params[:category]).books
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> adc21e0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
=======
                  params[:category].nil? ? Book.all : Category.find(params[:category]).books
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 0f24a043 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 21873de0 (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
=======
=======
                  params[:category].nil? ? Book.all : Category.find(params[:category]).books
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4d90e3d (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> 4d90e3d (Featire specs)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
                  params[:category].nil? ? Book.all : Category.find(params[:category]).books
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
>>>>>>> 31d15e66 (Fix)
=======
=======
                  Book.joins(:books_categories).where(books_categories: { category_id: params[:category] })
>>>>>>> a5d032d (Fix)
>>>>>>> 160fb15 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
=======
>>>>>>> 84003439 (Featire specs)
=======
                  params[:category].nil? ? Book.all : Category.find(params[:category]).books
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
<<<<<<< HEAD
=======
=======
<<<<<<< HEAD
=======
=======
                  params[:category].nil? ? Book.all : Category.find(params[:category]).books
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e18eb87 (Fix)
=======
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
<<<<<<< HEAD
>>>>>>> 973ba8c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
=======
>>>>>>> 4a2f2ad8 (Featire specs)
                  params[:category].nil? ? Book.all : Category.find(params[:category]).books
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
=======
                  params[:category].nil? ? Book.all : Category.find(params[:category]).books
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 99dad91f (Fix)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 72b9cab (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
                  params[:category].nil? ? Book.all : Category.find(params[:category]).books
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                  params[:category].nil? ? Book.all : Category.find(params[:category]).books
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
>>>>>>> b904d7ae (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> b8c2784f (Fix book_spec decrease quantity and price)
=======
>>>>>>> 392646b5 (Featire specs)
=======
                  Book.joins(:books_categories).where(books_categories: { category_id: params[:category] })
>>>>>>> a5d032d (Fix)
=======
>>>>>>> 9620751 (Featire specs)
=======
=======
                  params[:category].nil? ? Book.all : Category.find(params[:category]).books
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
=======
                  params[:category].nil? ? Book.all : Category.find(params[:category]).books
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 74240509 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
=======
                  params[:category].nil? ? Book.all : Category.find(params[:category]).books
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a1a479e2 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
                  params[:category].nil? ? Book.all : Category.find(params[:category]).books
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 393eff3b (Featire specs)
=======
=======
=======
=======
                  params[:category].nil? ? Book.all : Category.find(params[:category]).books
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price)
=======
=======
=======
                  Book.joins(:books_categories).where(books_categories: { category_id: params[:category] })
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
>>>>>>> d9d85ca6 (Fix)
=======
                  Book.joins(:books_categories).where(books_categories: { category_id: params[:category] })
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4d90e3d (Featire specs)
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 31d15e66 (Fix)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
                  params[:category].nil? ? Book.all : Category.find(params[:category]).books
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b904d7ae (Featire specs)
=======
=======
=======
=======
                  params[:category].nil? ? Book.all : Category.find(params[:category]).books
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
=======
=======
=======
                  Book.joins(:books_categories).where(books_categories: { category_id: params[:category] })
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
>>>>>>> ef483b6d (Fix)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
                  params[:category].nil? ? Book.all : Category.find(params[:category]).books
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 15c51b7 (Featire specs)
=======
                  Book.joins(:books_categories).where(books_categories: { category_id: params[:category] })
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
=======
                  params[:category].nil? ? Book.all : Category.find(params[:category]).books
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
=======
                  params[:category].nil? ? Book.all : Category.find(params[:category]).books
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 0c57e4e (Fix)
<<<<<<< HEAD
>>>>>>> 8887ba5b (Fix)
=======
=======
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5e31aeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 53db2224 (Featire specs)
=======
=======
=======
=======
=======
                  params[:category].nil? ? Book.all : Category.find(params[:category]).books
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
=======
=======
=======
                  params[:category].nil? ? Book.all : Category.find(params[:category]).books
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0f24a043 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
=======
                  params[:category].nil? ? Book.all : Category.find(params[:category]).books
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> b8c2784f (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
=======
                  params[:category].nil? ? Book.all : Category.find(params[:category]).books
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 392646b5 (Featire specs)
=======
=======
=======
=======
=======
                  params[:category].nil? ? Book.all : Category.find(params[:category]).books
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
                  Book.joins(:books_categories).where(books_categories: { category_id: params[:category] })
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
                  params[:category].nil? ? Book.all : Category.find(params[:category]).books
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
=======
                  params[:category].nil? ? Book.all : Category.find(params[:category]).books
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
=======
                  params[:category].nil? ? Book.all : Category.find(params[:category]).books
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      575. 
        
      
      
        
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> e6fc67c7 (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8887ba5b (Fix)
=======
>>>>>>> 53db2224 (Featire specs)
=======
>>>>>>> 7b22ad7e (Featire specs)
=======
>>>>>>> b97bb382 (Featire specs)
=======
>>>>>>> 4a2f2ad8 (Featire specs)
=======
>>>>>>> 0f24a043 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 21873de0 (Featire specs)
=======
>>>>>>> b8c2784f (Fix book_spec decrease quantity and price)
=======
>>>>>>> 392646b5 (Featire specs)
=======
>>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1049b80c (Fix)
=======
>>>>>>> 73f364d8 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
          
    575. 
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
    576. 
=======
>>>>>>> 610b6138 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> f92a45b (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0c57e4e (Fix)
=======
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 973ba8c (Featire specs)
=======
>>>>>>> 8181d13 (Featire specs)
=======
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 72b9cab (Featire specs)
=======
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 15c51b7 (Featire specs)
=======
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9e081dc (Fix)
=======
>>>>>>> fb61c5a (Featire specs)
=======
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
          
    577. 
>>>>>>> 2a25e4c (Featire specs)
>>>>>>> 216fe41 (Featire specs)
=======
          
    578. 
=======
          
    579. 
>>>>>>> 9c0d812 (Featire specs)
=======
          
    580. 
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> 5506bd0 (Featire specs)
=======
          
    581. 
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> e18eb87 (Fix)
=======
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> f92a45b (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 659083f (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
          
    582. 
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1d59aaa (Fix)
          
    583. 
=======
          
    584. 
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
          
    585. 
>>>>>>> 94841b5 (Featire specs)
=======
          
    586. 
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
    587. 
>>>>>>> 3b03895 (Featire specs)
=======
          
    588. 
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
    589. 
>>>>>>> e54deeb (Featire specs)
=======
          
    590. 
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
    591. 
>>>>>>> 9c0d812 (Featire specs)
=======
          
    592. 
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
=======
          
    593. 
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
    594. 
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
          
    595. 
>>>>>>> 94841b5 (Featire specs)
=======
          
    596. 
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
    597. 
>>>>>>> 3b03895 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
          
    598. 
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
    599. 
>>>>>>> e54deeb (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
          
    600. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
    601. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
    602. 
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
          
    603. 
>>>>>>> 94841b5 (Featire specs)
=======
          
    604. 
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
    605. 
>>>>>>> 3b03895 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
          
    606. 
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
    607. 
>>>>>>> e54deeb (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
          
    608. 
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
    609. 
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
    610. 
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
>>>>>>> 9c0d812 (Featire specs)
=======
          
    611. 
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
          
    612. 
>>>>>>> 34509eee (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
          
    613. 
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 6da9530 (Featire specs)
>>>>>>> 0f8241bb (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> f92a45b (Featire specs)
=======
=======
          
    614. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 715fac2 (Featire specs)
>>>>>>> fb61c5a (Featire specs)
          
    615. 
=======
          
    616. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
    617. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
    618. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 74240509 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> e6fc67c7 (Featire specs)
=======
>>>>>>> 4a2f2ad8 (Featire specs)
=======
>>>>>>> 73f364d8 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
=======
>>>>>>> fb61c5a (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0f24a043 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
>>>>>>> afa56d1 (Featire specs)
>>>>>>> e1ecabbe (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
=======
          
    619. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> 21873de0 (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
          
    620. 
>>>>>>> c033601 (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
>>>>>>> 3cf8dd4 (Featire specs)
>>>>>>> aa4361fd (Featire specs)
          
    621. 
=======
          
    622. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 7b22ad7e (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
>>>>>>> 3cf8dd4 (Featire specs)
>>>>>>> aa4361fd (Featire specs)
>>>>>>> a636fda (Featire specs)
=======
=======
          
    623. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> aa4361fd (Featire specs)
=======
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
>>>>>>> 973ba8c (Featire specs)
>>>>>>> b97bb382 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> c8da2e3 (Fix)
=======
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
=======
=======
>>>>>>> e18eb87 (Fix)
=======
          
    624. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
>>>>>>> adc21e0 (Featire specs)
<<<<<<< HEAD
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
          
    625. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
          
    626. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
>>>>>>> b8c2784f (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2612be03 (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4d90e3d (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e18eb87 (Fix)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
          
    627. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
    628. 
>>>>>>> a5d032d (Fix)
>>>>>>> 160fb15 (Fix)
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 557c1b8 (Fix)
=======
          
    629. 
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
    630. 
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> ae884b47 (Fix)
=======
=======
=======
=======
=======
          
    631. 
>>>>>>> a5d032d (Fix)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
    632. 
>>>>>>> a5d032d (Fix)
>>>>>>> e3e66f3 (Featire specs)
=======
          
    633. 
=======
          
    634. 
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376a (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
    635. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0ea (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
    636. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888bf (Featire specs)
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
    637. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 74240509 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
    638. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
=======
          
    639. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a1a479e2 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
    640. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 393eff3b (Featire specs)
=======
=======
=======
=======
          
    641. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
    642. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
>>>>>>> d9d85ca6 (Fix)
=======
          
    643. 
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> adc21e0 (Featire specs)
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> 6b6d1c2d (Featire specs)
>>>>>>> adc21e0 (Featire specs)
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 9440753 (Featire specs)
=======
=======
          
    644. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
=======
          
    645. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4d90e3d (Featire specs)
<<<<<<< HEAD
>>>>>>> 37e48018 (Featire specs)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
=======
          
    646. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
=======
          
    647. 
>>>>>>> a5d032d (Fix)
>>>>>>> 160fb15 (Fix)
<<<<<<< HEAD
>>>>>>> 31d15e66 (Fix)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 557c1b8 (Fix)
=======
          
    648. 
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> fdab719f (Fix)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
    649. 
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> 8288136d (Fix)
=======
=======
=======
=======
=======
          
    650. 
>>>>>>> a5d032d (Fix)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
    651. 
>>>>>>> a5d032d (Fix)
>>>>>>> e3e66f3 (Featire specs)
=======
          
    652. 
=======
          
    653. 
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> d52f9efe (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
    654. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
    655. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> c12b71de (Featire specs)
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
    656. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
    657. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
=======
          
    658. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
    659. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b904d7ae (Featire specs)
=======
=======
=======
=======
          
    660. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
    661. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
>>>>>>> ef483b6d (Fix)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 15c51b7 (Featire specs)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
    662. 
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
    663. 
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 0c57e4e (Fix)
<<<<<<< HEAD
>>>>>>> 8887ba5b (Fix)
=======
=======
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
          
    664. 
=======
          
    665. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5e31aeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 53db2224 (Featire specs)
=======
=======
=======
=======
=======
          
    666. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
=======
=======
          
    667. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
=======
=======
=======
          
    668. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0f24a043 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
=======
          
    669. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
=======
=======
=======
          
    670. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> b8c2784f (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
=======
          
    671. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 392646b5 (Featire specs)
=======
=======
=======
=======
=======
          
    672. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
    673. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 715fac2 (Featire specs)
<<<<<<< HEAD
>>>>>>> fb61c5a (Featire specs)
<<<<<<< HEAD
>>>>>>> 73f364d8 (Featire specs)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            
            

            

                end
          
      674. 
        
      
      
        
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
    674. 
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> c51bf93 (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> bf05825 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> c51bf93 (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> bf05825 (Featire specs)
=======
>>>>>>> f92a45b (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0c57e4e (Fix)
=======
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 973ba8c (Featire specs)
=======
>>>>>>> 8181d13 (Featire specs)
=======
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 72b9cab (Featire specs)
=======
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 15c51b7 (Featire specs)
=======
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9e081dc (Fix)
=======
>>>>>>> fb61c5a (Featire specs)
=======
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
          
    675. 
>>>>>>> 2a25e4c (Featire specs)
>>>>>>> 216fe41 (Featire specs)
=======
          
    676. 
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
=======
=======
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
    677. 
=======
=======
>>>>>>> 9a49b7b (Rebased)
=======
>>>>>>> 70fcacc (Featire specs)
=======
>>>>>>> ae409ca (Featire specs)
=======
>>>>>>> 379a979 (Featire specs)
=======
>>>>>>> adc21e0 (Featire specs)
=======
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4d90e3d (Featire specs)
=======
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 160fb15 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4d90e3d (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 160fb15 (Fix)
>>>>>>> 67ab5299 (Fix)
<<<<<<< HEAD
=======
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 7a08014b (Featire specs)
=======
>>>>>>> e6fc67c7 (Featire specs)
>>>>>>> c8da2e3 (Fix)
=======
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
>>>>>>> c51bf93 (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
>>>>>>> b28889f (Fix)
>>>>>>> e18eb87 (Fix)
=======
=======
>>>>>>> df37394 (Featire specs)
>>>>>>> f92a45b (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
          
    678. 
=======
          
    679. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
=======
=======
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
          
    680. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
          
    681. 
=======
          
    682. 
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
          
    683. 
>>>>>>> 94841b5 (Featire specs)
=======
          
    684. 
=======
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
          
    685. 
=======
          
    686. 
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
          
    687. 
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
>>>>>>> 94841b5 (Featire specs)
=======
          
    688. 
>>>>>>> b904d7ae (Featire specs)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
    689. 
>>>>>>> 3b03895 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
          
    690. 
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
          
    691. 
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
          
    692. 
=======
          
    693. 
>>>>>>> 3b03895 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
          
    694. 
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
    695. 
>>>>>>> e54deeb (Featire specs)
=======
          
    696. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
    697. 
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
>>>>>>> 9c0d812 (Featire specs)
=======
          
    698. 
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
          
    699. 
>>>>>>> 34509eee (Featire specs)
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
    700. 
=======
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
          
    701. 
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
          
    702. 
=======
          
    703. 
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
    704. 
>>>>>>> 9c0d812 (Featire specs)
=======
          
    705. 
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
=======
          
    706. 
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
=======
          
    707. 
=======
=======
>>>>>>> 610b6138 (Featire specs)
<<<<<<< HEAD
=======
=======
>>>>>>> 009401d (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> c8da2e3 (Fix)
>>>>>>> fdab719f (Fix)
=======
>>>>>>> c51bf93 (Featire specs)
>>>>>>> 7a08014b (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
>>>>>>> efd6af09 (Featire specs)
          
    708. 
=======
          
    709. 
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
    710. 
>>>>>>> 9c0d812 (Featire specs)
=======
          
    711. 
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
          
    712. 
=======
          
    713. 
>>>>>>> 9c0d812 (Featire specs)
=======
          
    714. 
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> 5506bd0 (Featire specs)
=======
          
    715. 
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
    716. 
=======
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
          
    717. 
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1d59aaa (Fix)
          
    718. 
=======
          
    719. 
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
          
    720. 
>>>>>>> 94841b5 (Featire specs)
=======
          
    721. 
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
    722. 
>>>>>>> 3b03895 (Featire specs)
=======
          
    723. 
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
    724. 
>>>>>>> e54deeb (Featire specs)
=======
          
    725. 
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
    726. 
>>>>>>> 9c0d812 (Featire specs)
=======
          
    727. 
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
=======
          
    728. 
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
          
    729. 
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 904663c (Featire specs)
          
    730. 
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
          
    731. 
=======
          
    732. 
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
    733. 
>>>>>>> 9c0d812 (Featire specs)
=======
          
    734. 
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
=======
          
    735. 
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ebcdce06 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
          
    736. 
>>>>>>> fb61c5a (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
>>>>>>> df37394 (Featire specs)
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
>>>>>>> 715fac2 (Featire specs)
>>>>>>> fb61c5a (Featire specs)
>>>>>>> 73f364d8 (Featire specs)
          
    737. 
=======
          
    738. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
    739. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
    740. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 84003439 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
=======
>>>>>>> fb61c5a (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0f24a043 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
>>>>>>> afa56d1 (Featire specs)
>>>>>>> e1ecabbe (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9bfbd88 (Featire specs)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 610b6138 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
<<<<<<< HEAD
=======
>>>>>>> c51bf93 (Featire specs)
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> c51bf93 (Featire specs)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
>>>>>>> 74240509 (Fix book_spec decrease quantity and price)
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 9bfbd88 (Featire specs)
<<<<<<< HEAD
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 6da9530 (Featire specs)
=======
=======
          
    741. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> 21873de0 (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bb5c652 (Fix book_spec decrease quantity and price)
=======
=======
          
    742. 
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> 9a49b7b (Rebased)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
          
    743. 
>>>>>>> c033601 (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 7b22ad7e (Featire specs)
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 7b22ad7e (Featire specs)
=======
>>>>>>> b97bb382 (Featire specs)
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
=======
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> 973ba8c (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bf05825 (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
>>>>>>> c12b71de (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
>>>>>>> 3cf8dd4 (Featire specs)
>>>>>>> aa4361fd (Featire specs)
          
    744. 
=======
          
    745. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 7b22ad7e (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ae07231a (Featire specs)
=======
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
=======
=======
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
>>>>>>> 3cf8dd4 (Featire specs)
>>>>>>> aa4361fd (Featire specs)
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 70fcacc (Featire specs)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 009401d (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
          
    746. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c12b71de (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> c12b71de (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
>>>>>>> ae409ca (Featire specs)
=======
>>>>>>> c8da2e3 (Fix)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
=======
=======
          
    747. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
>>>>>>> 379a979 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
>>>>>>> adc21e0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 9440753 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
=======
          
    748. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
=======
=======
          
    749. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4d90e3d (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e18eb87 (Fix)
=======
=======
          
    750. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
    751. 
>>>>>>> a5d032d (Fix)
>>>>>>> 160fb15 (Fix)
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 557c1b8 (Fix)
=======
          
    752. 
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
    753. 
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> ae884b47 (Fix)
=======
=======
=======
=======
=======
          
    754. 
>>>>>>> a5d032d (Fix)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
    755. 
>>>>>>> a5d032d (Fix)
>>>>>>> e3e66f3 (Featire specs)
=======
          
    756. 
=======
          
    757. 
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376a (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
    758. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0ea (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
    759. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888bf (Featire specs)
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
    760. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 74240509 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
    761. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
=======
          
    762. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a1a479e2 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
    763. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 393eff3b (Featire specs)
=======
=======
=======
=======
          
    764. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
    765. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
>>>>>>> d9d85ca6 (Fix)
=======
          
    766. 
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 9bfbd88 (Featire specs)
>>>>>>> ebcdce06 (Featire specs)
=======
>>>>>>> adc21e0 (Featire specs)
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> 6b6d1c2d (Featire specs)
>>>>>>> adc21e0 (Featire specs)
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 9440753 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
    767. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
    768. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4d90e3d (Featire specs)
<<<<<<< HEAD
>>>>>>> 37e48018 (Featire specs)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
    769. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
=======
          
    770. 
>>>>>>> a5d032d (Fix)
>>>>>>> 160fb15 (Fix)
<<<<<<< HEAD
>>>>>>> 31d15e66 (Fix)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 557c1b8 (Fix)
=======
          
    771. 
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> fdab719f (Fix)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
    772. 
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> 8288136d (Fix)
=======
=======
=======
=======
=======
          
    773. 
>>>>>>> a5d032d (Fix)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
    774. 
>>>>>>> a5d032d (Fix)
>>>>>>> e3e66f3 (Featire specs)
=======
          
    775. 
=======
          
    776. 
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> d52f9efe (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
    777. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
    778. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> c12b71de (Featire specs)
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
    779. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
    780. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
=======
          
    781. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
    782. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b904d7ae (Featire specs)
=======
=======
=======
=======
          
    783. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
    784. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
>>>>>>> ef483b6d (Fix)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 15c51b7 (Featire specs)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
    785. 
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
    786. 
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 0c57e4e (Fix)
<<<<<<< HEAD
>>>>>>> 8887ba5b (Fix)
=======
=======
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
          
    787. 
=======
          
    788. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5e31aeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 53db2224 (Featire specs)
=======
=======
=======
=======
=======
          
    789. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
=======
=======
          
    790. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
=======
=======
=======
          
    791. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0f24a043 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
=======
          
    792. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
=======
=======
=======
          
    793. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> b8c2784f (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
=======
          
    794. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 392646b5 (Featire specs)
=======
=======
=======
=======
=======
          
    795. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
    796. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 715fac2 (Featire specs)
<<<<<<< HEAD
>>>>>>> fb61c5a (Featire specs)
<<<<<<< HEAD
>>>>>>> 73f364d8 (Featire specs)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            
            

            

              end
          
      797. 
        
      
      
        
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
    797. 
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> c51bf93 (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> bf05825 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> c51bf93 (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> bf05825 (Featire specs)
=======
>>>>>>> f92a45b (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0c57e4e (Fix)
=======
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 973ba8c (Featire specs)
=======
>>>>>>> 8181d13 (Featire specs)
=======
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 72b9cab (Featire specs)
=======
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 15c51b7 (Featire specs)
=======
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9e081dc (Fix)
=======
>>>>>>> fb61c5a (Featire specs)
=======
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
          
    798. 
>>>>>>> 2a25e4c (Featire specs)
>>>>>>> 216fe41 (Featire specs)
=======
          
    799. 
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
=======
=======
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
    800. 
=======
=======
>>>>>>> 9a49b7b (Rebased)
=======
>>>>>>> 70fcacc (Featire specs)
=======
>>>>>>> ae409ca (Featire specs)
=======
>>>>>>> 379a979 (Featire specs)
=======
>>>>>>> adc21e0 (Featire specs)
=======
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4d90e3d (Featire specs)
=======
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 160fb15 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4d90e3d (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 160fb15 (Fix)
>>>>>>> 67ab5299 (Fix)
<<<<<<< HEAD
=======
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 7a08014b (Featire specs)
=======
>>>>>>> e6fc67c7 (Featire specs)
>>>>>>> c8da2e3 (Fix)
=======
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
>>>>>>> c51bf93 (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
>>>>>>> b28889f (Fix)
>>>>>>> e18eb87 (Fix)
=======
=======
>>>>>>> df37394 (Featire specs)
>>>>>>> f92a45b (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
          
    801. 
=======
          
    802. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
=======
=======
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
          
    803. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
          
    804. 
=======
          
    805. 
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
          
    806. 
>>>>>>> 94841b5 (Featire specs)
=======
          
    807. 
=======
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
          
    808. 
=======
          
    809. 
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
          
    810. 
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
>>>>>>> 94841b5 (Featire specs)
=======
          
    811. 
>>>>>>> b904d7ae (Featire specs)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
    812. 
>>>>>>> 3b03895 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
          
    813. 
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
          
    814. 
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
          
    815. 
=======
          
    816. 
>>>>>>> 3b03895 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
          
    817. 
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
    818. 
>>>>>>> e54deeb (Featire specs)
=======
          
    819. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
    820. 
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
>>>>>>> 9c0d812 (Featire specs)
=======
          
    821. 
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
          
    822. 
>>>>>>> 34509eee (Featire specs)
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
    823. 
=======
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
          
    824. 
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
          
    825. 
=======
          
    826. 
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
    827. 
>>>>>>> 9c0d812 (Featire specs)
=======
          
    828. 
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
=======
          
    829. 
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
=======
          
    830. 
=======
=======
>>>>>>> 610b6138 (Featire specs)
<<<<<<< HEAD
=======
=======
>>>>>>> 009401d (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> c8da2e3 (Fix)
>>>>>>> fdab719f (Fix)
=======
>>>>>>> c51bf93 (Featire specs)
>>>>>>> 7a08014b (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
>>>>>>> efd6af09 (Featire specs)
          
    831. 
=======
          
    832. 
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
    833. 
>>>>>>> 9c0d812 (Featire specs)
=======
          
    834. 
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
          
    835. 
=======
          
    836. 
>>>>>>> 9c0d812 (Featire specs)
=======
          
    837. 
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> 5506bd0 (Featire specs)
=======
          
    838. 
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
    839. 
=======
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
          
    840. 
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1d59aaa (Fix)
          
    841. 
=======
          
    842. 
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
          
    843. 
>>>>>>> 94841b5 (Featire specs)
=======
          
    844. 
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
    845. 
>>>>>>> 3b03895 (Featire specs)
=======
          
    846. 
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
    847. 
>>>>>>> e54deeb (Featire specs)
=======
          
    848. 
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
    849. 
>>>>>>> 9c0d812 (Featire specs)
=======
          
    850. 
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
=======
          
    851. 
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
          
    852. 
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 904663c (Featire specs)
          
    853. 
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
          
    854. 
=======
          
    855. 
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
    856. 
>>>>>>> 9c0d812 (Featire specs)
=======
          
    857. 
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
=======
          
    858. 
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ebcdce06 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
          
    859. 
>>>>>>> fb61c5a (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
>>>>>>> df37394 (Featire specs)
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
>>>>>>> 715fac2 (Featire specs)
>>>>>>> fb61c5a (Featire specs)
>>>>>>> 73f364d8 (Featire specs)
          
    860. 
=======
          
    861. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
    862. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
    863. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 84003439 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
=======
>>>>>>> fb61c5a (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0f24a043 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
>>>>>>> afa56d1 (Featire specs)
>>>>>>> e1ecabbe (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9bfbd88 (Featire specs)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 610b6138 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
<<<<<<< HEAD
=======
>>>>>>> c51bf93 (Featire specs)
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> c51bf93 (Featire specs)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
>>>>>>> 74240509 (Fix book_spec decrease quantity and price)
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 9bfbd88 (Featire specs)
<<<<<<< HEAD
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 6da9530 (Featire specs)
=======
=======
          
    864. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> 21873de0 (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bb5c652 (Fix book_spec decrease quantity and price)
=======
=======
          
    865. 
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> 9a49b7b (Rebased)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
          
    866. 
>>>>>>> c033601 (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 7b22ad7e (Featire specs)
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 7b22ad7e (Featire specs)
=======
>>>>>>> b97bb382 (Featire specs)
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
=======
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> 973ba8c (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bf05825 (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
>>>>>>> c12b71de (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
>>>>>>> 3cf8dd4 (Featire specs)
>>>>>>> aa4361fd (Featire specs)
          
    867. 
=======
          
    868. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 7b22ad7e (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ae07231a (Featire specs)
=======
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
=======
=======
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
>>>>>>> 3cf8dd4 (Featire specs)
>>>>>>> aa4361fd (Featire specs)
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 70fcacc (Featire specs)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 009401d (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
          
    869. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c12b71de (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> c12b71de (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
>>>>>>> ae409ca (Featire specs)
=======
>>>>>>> c8da2e3 (Fix)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
=======
=======
          
    870. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
>>>>>>> 379a979 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
>>>>>>> adc21e0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 9440753 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
=======
          
    871. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
=======
=======
          
    872. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4d90e3d (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e18eb87 (Fix)
=======
=======
          
    873. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
    874. 
>>>>>>> a5d032d (Fix)
>>>>>>> 160fb15 (Fix)
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 557c1b8 (Fix)
=======
          
    875. 
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
    876. 
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> ae884b47 (Fix)
=======
=======
=======
=======
=======
          
    877. 
>>>>>>> a5d032d (Fix)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
    878. 
>>>>>>> a5d032d (Fix)
>>>>>>> e3e66f3 (Featire specs)
=======
          
    879. 
=======
          
    880. 
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376a (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
    881. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0ea (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
    882. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888bf (Featire specs)
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
    883. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 74240509 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
    884. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
=======
          
    885. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a1a479e2 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
    886. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 393eff3b (Featire specs)
=======
=======
=======
=======
          
    887. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
    888. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
>>>>>>> d9d85ca6 (Fix)
=======
          
    889. 
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 9bfbd88 (Featire specs)
>>>>>>> ebcdce06 (Featire specs)
=======
>>>>>>> adc21e0 (Featire specs)
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> 6b6d1c2d (Featire specs)
>>>>>>> adc21e0 (Featire specs)
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 9440753 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
    890. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
    891. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4d90e3d (Featire specs)
<<<<<<< HEAD
>>>>>>> 37e48018 (Featire specs)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
    892. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
=======
          
    893. 
>>>>>>> a5d032d (Fix)
>>>>>>> 160fb15 (Fix)
<<<<<<< HEAD
>>>>>>> 31d15e66 (Fix)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 557c1b8 (Fix)
=======
          
    894. 
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> fdab719f (Fix)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
    895. 
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> 8288136d (Fix)
=======
=======
=======
=======
=======
          
    896. 
>>>>>>> a5d032d (Fix)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
    897. 
>>>>>>> a5d032d (Fix)
>>>>>>> e3e66f3 (Featire specs)
=======
          
    898. 
=======
          
    899. 
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> d52f9efe (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
    900. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
    901. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> c12b71de (Featire specs)
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
    902. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
    903. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
=======
          
    904. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
    905. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b904d7ae (Featire specs)
=======
=======
=======
=======
          
    906. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
    907. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
>>>>>>> ef483b6d (Fix)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 15c51b7 (Featire specs)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
    908. 
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
    909. 
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 0c57e4e (Fix)
<<<<<<< HEAD
>>>>>>> 8887ba5b (Fix)
=======
=======
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
          
    910. 
=======
          
    911. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5e31aeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 53db2224 (Featire specs)
=======
=======
=======
=======
=======
          
    912. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
=======
=======
          
    913. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
=======
=======
=======
          
    914. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0f24a043 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
=======
          
    915. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
=======
=======
=======
          
    916. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> b8c2784f (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
=======
          
    917. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 392646b5 (Featire specs)
=======
=======
=======
=======
=======
          
    918. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
    919. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 715fac2 (Featire specs)
<<<<<<< HEAD
>>>>>>> fb61c5a (Featire specs)
<<<<<<< HEAD
>>>>>>> 73f364d8 (Featire specs)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            
            

            

            end
          
      920.
    <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2ee03d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 5506bd0 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= ======= >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= <<<<<<< HEAD ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= ======= >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= <<<<<<< HEAD ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> fb61c5a (Featire specs) ======= <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> f92a45b (Featire specs) ======= <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> 715fac2 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fb61c5a (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bd30d038 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) >>>>>>> a304bcf (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> bd30d038 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> d4235040 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> 9440753 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 255dd8d (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> e5890c2 (Manifest_cache true) >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 255dd8d (Manifest_cache true) ======= >>>>>>> d4235040 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) >>>>>>> 551c6ab (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0b43b18 (Manifest_cache true) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 6da9530 (Featire specs) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 78717cc (Manifest_cache true) ======= ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 98beee2 (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 385b8df (Manifest_cache true) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7bc7f9f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 7bc7f9f (Manifest_cache true) >>>>>>> 610b6138 (Featire specs) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 84d0df6 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 450f4e3 (Manifest_cache true) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= ======= ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> da3a9a3 (Featire specs) ======= ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> c033601 (Rebased) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> c033601 (Rebased) >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= ======= >>>>>>> 0ed7f7c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> b3f2049 (Featire specs) ======= ======= >>>>>>> e18eb87 (Fix) >>>>>>> c8cdb08 (Manifest_cache true) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1cce66c (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 0e864a5 (Manifest_cache true) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) >>>>>>> afa56d1 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e18eb87 (Fix) ======= >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) >>>>>>> 00f8b58 (Manifest_cache true) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 15c51b7 (Featire specs) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> e18eb87 (Fix) ======= >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0c57e4e (Fix) ======= >>>>>>> 3be4d14 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> e055dd0 (Rebased) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 304cd28a (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= ======= >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= =======

    app/services/book_service.rb

    88.89% lines covered

    9 relevant lines. 8 lines covered and 1 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            class BookService
          
      2. 
        
      
      
        
      
          
    2. 
            1
            

            

              def self.quantity_update(params, product, order, book, coupon)
          
      3. 
        
      
      
        
      
          
    3. 
            2
            

            

                discount = 0
          
      4. 
        
      
      
        
      
          
    4. 
            2
            

            

                product.update(quantity: params[:quantity]) if params[:quantity].to_i <= book.quantity
          
      5. 
        
      
      
        
      
          
    5. 
            2
            

            

                discount = coupon.discount unless coupon.nil?
          
      6. 
        
      
      
        
      
          
    6. 
            
            

            

            
          
      7. 
        
      
      
        
      
          
    7. 
            2
            

            

                if product.save
          
      8. 
        
      
      
        
      
          
    8. 
            
            

            

                  {
          
      9. 
        
      
      
        
      
          
    9. 
            2
            

            

                    total_price: order.decorate.order_price(discount).to_s,
          
      10. 
        
      
      
        
      
          
    10. 
            
            

            

                    sub_price: order.decorate.order_price.to_s,
          
      11. 
        
      
      
        
      
          
    11. 
            
            

            

                    price: product.decorate.total_price.to_s,
          
      12. 
        
      
      
        
      
          
    12. 
            2
            

            

                    discount: (order.decorate.order_price * discount).to_s,
          
      13. 
        
      
      
        
      
          
    13. 
            
            

            

                    book_quantity: book.quantity
          
      14. 
        
      
      
        
      
          
    14. 
            
            

            

                  }
          
      15. 
        
      
      
        
      
          
    15. 
            
            

            

                else
          
      16. 
        
      
      
        
      
          
    16. 
            
            

            

                  { notice: 'Error!' }
          
      17. 
        
      
      
        
      
          
    17. 
            
            

            

                end
          
      18. 
        
      
      
        
      
          
    18. 
            
            

            

              end
          
      19. 
        
      
      
        
      
          
    19. 
            
            

            

            end
          
      20.

    app/services/coupon_service.rb

    100.0% lines covered

    8 relevant lines. 8 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            class CouponService
          
      2. 
        
      
      
        
      
          
    2. 
            1
            

            

              def self.find_coupon(params, order, coupon)
          
      3. 
        
      
      
        
      
          
    3. 
            4
            

            

                error_message = I18n.t('order.coupon.error')
          
      4. 
        
      
      
        
      
          
    4. 
            
            

            

            
          
      5. 
        
      
      
        
      
          
    5. 
            4
            

            

                if coupon.nil?
          
      6. 
        
      
      
        
      
          
    6. 
            1
            

            

                  error_message = ' ' if params[:code].eql?('')
          
      7. 
        
      
      
        
      
          
    7. 
            
            

            

            
          
      8. 
        
      
      
        
      
          
    8. 
            
            

            

                  {
          
      9. 
        
      
      
        
      
          
    9. 
            1
            

            

                    error: error_message,
          
      10. 
        
      
      
        
      
          
    10. 
            
            

            

                    total_price: order.decorate.order_price.to_s
          
      11. 
        
      
      
        
      
          
    11. 
            
            

            

                  }
          
      12. 
        
      
      
        
      
          
    12. 
            
            

            

                else
          
      13. 
        
      
      
        
      
          
    13. 
            
            

            

                  {
          
      14. 
        
      
      
        
      
          
    14. 
            3
            

            

                    total_price: order.decorate.order_price(coupon.discount).to_s,
          
      15. 
        
      
      
        
      
          
    15. 
            3
            

            

                    discount: (order.decorate.order_price * coupon.discount).to_s
          
      16. 
        
      
      
        
      
          
    16. 
            
            

            

                  }
          
      17. 
        
      
      
        
      
          
    17. 
            
            

            

                end
          
      18. 
        
      
      
        
      
          
    18. 
            
            

            

              end
          
      19. 
        
      
      
        
      
          
    19. 
            
            

            

            end
          
      20.
    >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 7bc7f9f (Manifest_cache true) >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> c033601 (Rebased) >>>>>>> e3e66f3 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> bd30d038 (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> d4235040 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= ======= >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4fac471d (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= =======

    app/services/book_service.rb

    88.89% lines covered

    9 relevant lines. 8 lines covered and 1 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            class BookService
          
      2. 
        
      
      
        
      
          
    2. 
            1
            

            

              def self.quantity_update(params, product, order, book, coupon)
          
      3. 
        
      
      
        
      
          
    3. 
            2
            

            

                discount = 0
          
      4. 
        
      
      
        
      
          
    4. 
            2
            

            

                product.update(quantity: params[:quantity]) if params[:quantity].to_i <= book.quantity
          
      5. 
        
      
      
        
      
          
    5. 
            2
            

            

                discount = coupon.discount unless coupon.nil?
          
      6. 
        
      
      
        
      
          
    6. 
            
            

            

            
          
      7. 
        
      
      
        
      
          
    7. 
            2
            

            

                if product.save
          
      8. 
        
      
      
        
      
          
    8. 
            
            

            

                  {
          
      9. 
        
      
      
        
      
          
    9. 
            2
            

            

                    total_price: order.decorate.order_price(discount).to_s,
          
      10. 
        
      
      
        
      
          
    10. 
            
            

            

                    sub_price: order.decorate.order_price.to_s,
          
      11. 
        
      
      
        
      
          
    11. 
            
            

            

                    price: product.decorate.total_price.to_s,
          
      12. 
        
      
      
        
      
          
    12. 
            2
            

            

                    discount: (order.decorate.order_price * discount).to_s,
          
      13. 
        
      
      
        
      
          
    13. 
            
            

            

                    book_quantity: book.quantity
          
      14. 
        
      
      
        
      
          
    14. 
            
            

            

                  }
          
      15. 
        
      
      
        
      
          
    15. 
            
            

            

                else
          
      16. 
        
      
      
        
      
          
    16. 
            
            

            

                  { notice: 'Error!' }
          
      17. 
        
      
      
        
      
          
    17. 
            
            

            

                end
          
      18. 
        
      
      
        
      
          
    18. 
            
            

            

              end
          
      19. 
        
      
      
        
      
          
    19. 
            
            

            

            end
          
      20.

    app/services/coupon_service.rb

    100.0% lines covered

    8 relevant lines. 8 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            class CouponService
          
      2. 
        
      
      
        
      
          
    2. 
            1
            

            

              def self.find_coupon(params, order, coupon)
          
      3. 
        
      
      
        
      
          
    3. 
            4
            

            

                error_message = I18n.t('order.coupon.error')
          
      4. 
        
      
      
        
      
          
    4. 
            
            

            

            
          
      5. 
        
      
      
        
      
          
    5. 
            4
            

            

                if coupon.nil?
          
      6. 
        
      
      
        
      
          
    6. 
            1
            

            

                  error_message = ' ' if params[:code].eql?('')
          
      7. 
        
      
      
        
      
          
    7. 
            
            

            

            
          
      8. 
        
      
      
        
      
          
    8. 
            
            

            

                  {
          
      9. 
        
      
      
        
      
          
    9. 
            1
            

            

                    error: error_message,
          
      10. 
        
      
      
        
      
          
    10. 
            
            

            

                    total_price: order.decorate.order_price.to_s
          
      11. 
        
      
      
        
      
          
    11. 
            
            

            

                  }
          
      12. 
        
      
      
        
      
          
    12. 
            
            

            

                else
          
      13. 
        
      
      
        
      
          
    13. 
            
            

            

                  {
          
      14. 
        
      
      
        
      
          
    14. 
            3
            

            

                    total_price: order.decorate.order_price(coupon.discount).to_s,
          
      15. 
        
      
      
        
      
          
    15. 
            3
            

            

                    discount: (order.decorate.order_price * coupon.discount).to_s
          
      16. 
        
      
      
        
      
          
    16. 
            
            

            

                  }
          
      17. 
        
      
      
        
      
          
    17. 
            
            

            

                end
          
      18. 
        
      
      
        
      
          
    18. 
            
            

            

              end
          
      19. 
        
      
      
        
      
          
    19. 
            
            

            

            end
          
      20.
    >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> b3f2049 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= >>>>>>> b28889f (Fix) >>>>>>> e18eb87 (Fix) <<<<<<< HEAD >>>>>>> 99dad91f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> 0e864a5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> cc390719 (Manifest_cache true) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ce402d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fe36fb9e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 0c57e4e (Fix) <<<<<<< HEAD >>>>>>> 8887ba5b (Fix) ======= ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3be4d14 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1b8f36d8 (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> a71befd (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8a3779d4 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 551c6ab (Manifest_cache true) <<<<<<< HEAD >>>>>>> 56531f25 (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> fd310ed (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86229876 (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 42e9c2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> 16ebb0ff (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 495b04d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0f24a043 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) <<<<<<< HEAD >>>>>>> c0159bf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d0f5cbf (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 572a8e3 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b8c2784f (Fix book_spec decrease quantity and price) ======= ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) <<<<<<< HEAD >>>>>>> ca274ec (Manifest_cache true) <<<<<<< HEAD >>>>>>> a56ba36d (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f85cfd9 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price) ======= ======= ======= =======

    app/services/book_service.rb

    88.89% lines covered

    9 relevant lines. 8 lines covered and 1 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            class BookService
          
      2. 
        
      
      
        
      
          
    2. 
            1
            

            

              def self.quantity_update(params, product, order, book, coupon)
          
      3. 
        
      
      
        
      
          
    3. 
            2
            

            

                discount = 0
          
      4. 
        
      
      
        
      
          
    4. 
            2
            

            

                product.update(quantity: params[:quantity]) if params[:quantity].to_i <= book.quantity
          
      5. 
        
      
      
        
      
          
    5. 
            2
            

            

                discount = coupon.discount unless coupon.nil?
          
      6. 
        
      
      
        
      
          
    6. 
            
            

            

            
          
      7. 
        
      
      
        
      
          
    7. 
            2
            

            

                if product.save
          
      8. 
        
      
      
        
      
          
    8. 
            
            

            

                  {
          
      9. 
        
      
      
        
      
          
    9. 
            2
            

            

                    total_price: order.decorate.order_price(discount).to_s,
          
      10. 
        
      
      
        
      
          
    10. 
            
            

            

                    sub_price: order.decorate.order_price.to_s,
          
      11. 
        
      
      
        
      
          
    11. 
            
            

            

                    price: product.decorate.total_price.to_s,
          
      12. 
        
      
      
        
      
          
    12. 
            2
            

            

                    discount: (order.decorate.order_price * discount).to_s,
          
      13. 
        
      
      
        
      
          
    13. 
            
            

            

                    book_quantity: book.quantity
          
      14. 
        
      
      
        
      
          
    14. 
            
            

            

                  }
          
      15. 
        
      
      
        
      
          
    15. 
            
            

            

                else
          
      16. 
        
      
      
        
      
          
    16. 
            
            

            

                  { notice: 'Error!' }
          
      17. 
        
      
      
        
      
          
    17. 
            
            

            

                end
          
      18. 
        
      
      
        
      
          
    18. 
            
            

            

              end
          
      19. 
        
      
      
        
      
          
    19. 
            
            

            

            end
          
      20.

    app/services/coupon_service.rb

    100.0% lines covered

    8 relevant lines. 8 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            class CouponService
          
      2. 
        
      
      
        
      
          
    2. 
            1
            

            

              def self.find_coupon(params, order, coupon)
          
      3. 
        
      
      
        
      
          
    3. 
            4
            

            

                error_message = I18n.t('order.coupon.error')
          
      4. 
        
      
      
        
      
          
    4. 
            
            

            

            
          
      5. 
        
      
      
        
      
          
    5. 
            4
            

            

                if coupon.nil?
          
      6. 
        
      
      
        
      
          
    6. 
            1
            

            

                  error_message = ' ' if params[:code].eql?('')
          
      7. 
        
      
      
        
      
          
    7. 
            
            

            

            
          
      8. 
        
      
      
        
      
          
    8. 
            
            

            

                  {
          
      9. 
        
      
      
        
      
          
    9. 
            1
            

            

                    error: error_message,
          
      10. 
        
      
      
        
      
          
    10. 
            
            

            

                    total_price: order.decorate.order_price.to_s
          
      11. 
        
      
      
        
      
          
    11. 
            
            

            

                  }
          
      12. 
        
      
      
        
      
          
    12. 
            
            

            

                else
          
      13. 
        
      
      
        
      
          
    13. 
            
            

            

                  {
          
      14. 
        
      
      
        
      
          
    14. 
            3
            

            

                    total_price: order.decorate.order_price(coupon.discount).to_s,
          
      15. 
        
      
      
        
      
          
    15. 
            3
            

            

                    discount: (order.decorate.order_price * coupon.discount).to_s
          
      16. 
        
      
      
        
      
          
    16. 
            
            

            

                  }
          
      17. 
        
      
      
        
      
          
    17. 
            
            

            

                end
          
      18. 
        
      
      
        
      
          
    18. 
            
            

            

              end
          
      19. 
        
      
      
        
      
          
    19. 
            
            

            

            end
          
      20.
    >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 0b43b18 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1cce66c (Manifest_cache true) <<<<<<< HEAD >>>>>>> d365be68 (Manifest_cache true) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)

    config/application.rb

    100.0% lines covered

    6 relevant lines. 6 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            require_relative 'boot'
          
      2. 
        
      
      
        
      
          
    2. 
            
            

            

            
          
      3. 
        
      
      
        
      
          
    3. 
            1
            

            

            require 'rails/all'
          
      4. 
        
      
      
        
      
          
    4. 
            
            

            

            
          
      5. 
        
      
      
        
      
          
    5. 
            
            

            

            # Require the gems listed in Gemfile, including any gems
          
      6. 
        
      
      
        
      
          
    6. 
            
            

            

            # you've limited to :test, :development, or :production.
          
      7. 
        
      
      
        
      
          
    7. 
            1
            

            

            Bundler.require(*Rails.groups)
          
      8. 
        
      
      
        
      
          
    8. 
            
            

            

            
          
      9. 
        
      
      
        
      
          
    9. 
            1
            

            

            module BookStore
          
      10. 
        
      
      
        
      
          
    10. 
            1
            

            

              class Application < Rails::Application
          
      11. 
        
      
      
        
      
          
    11. 
            
            

            

                # Initialize configuration defaults for originally generated Rails version.
          
      12. 
        
      
      
        
      
          
    12. 
            1
            

            

                config.load_defaults 6.1
          
      13. 
        
      
      
        
      
          
    13. 
            
            

            

            
          
      14. 
        
      
      
        
      
          
    14. 
            
            

            

                # Configuration for the application, engines, and railties goes here.
          
      15. 
        
      
      
        
      
          
    15. 
            
            

            

                #
          
      16. 
        
      
      
        
      
          
    16. 
            
            

            

                # These settings can be overridden in specific environments using the files
          
      17. 
        
      
      
        
      
          
    17. 
            
            

            

                # in config/environments, which are processed later.
          
      18. 
        
      
      
        
      
          
    18. 
            
            

            

                #
          
      19. 
        
      
      
        
      
          
    19. 
            
            

            

                # config.time_zone = "Central Time (US & Canada)"
          
      20. 
        
      
      
        
      
          
    20. 
            
            

            

                # config.eager_load_paths << Rails.root.join("extras")
          
      21. 
        
      
      
        
      
          
    21. 
            
            

            

              end
          
      22. 
        
      
      
        
      
          
    22. 
            
            

            

            end
          
      23.

    config/boot.rb

    100.0% lines covered

    3 relevant lines. 3 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
          
      2. 
        
      
      
        
      
          
    2. 
            
            

            

            
          
      3. 
        
      
      
        
      
          
    3. 
            1
            

            

            require 'bundler/setup' # Set up gems listed in the Gemfile.
          
      4. 
        
      
      
        
      
          
    4. 
            1
            

            

            require 'bootsnap/setup' # Speed up boot time by caching expensive operations.
          
      5.

    config/environment.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            
            

            

            # Load the Rails application.
          
      2. 
        
      
      
        
      
          
    2. 
            1
            

            

            require_relative 'application'
          
      3. 
        
      
      
        
      
          
    3. 
            
            

            

            
          
      4. 
        
      
      
        
      
          
    4. 
            
            

            

            # Initialize the Rails application.
          
      5. 
        
      
      
        
      
          
    5. 
            1
            

            

            Rails.application.initialize!
          
      6.

    config/environments/test.rb

    100.0% lines covered

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> b97bb382 (Featire specs) ======= >>>>>>> 4a2f2ad8 (Featire specs) ======= >>>>>>> 21873de0 (Featire specs) ======= >>>>>>> 392646b5 (Featire specs) ======= >>>>>>> 1049b80c (Fix) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> 0676508 (Featire specs) >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> 15c51b7 (Featire specs) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> b97bb382 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> d52f9efe (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 2612be03 (Featire specs) 19 relevant lines. 19 lines covered and ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 973ba8c (Featire specs) >>>>>>> b97bb382 (Featire specs) 19 relevant lines. 19 lines covered and ======= 18 relevant lines. 18 lines covered and >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= 18 relevant lines. 18 lines covered and >>>>>>> 752f0c0 (Featire specs) ======= 18 relevant lines. 18 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= 18 relevant lines. 18 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 37e48018 (Featire specs) ======= 18 relevant lines. 18 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= 19 relevant lines. 19 lines covered and >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> 659083f (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= 18 relevant lines. 18 lines covered and >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= 18 relevant lines. 18 lines covered and >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= 18 relevant lines. 18 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= 18 relevant lines. 18 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= 19 relevant lines. 19 lines covered and >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= 18 relevant lines. 18 lines covered and >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= >>>>>>> ef483b6d (Fix) ======= 19 relevant lines. 19 lines covered and >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= 19 relevant lines. 19 lines covered and >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= 19 relevant lines. 19 lines covered and >>>>>>> 11792758 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= 18 relevant lines. 18 lines covered and >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= 18 relevant lines. 18 lines covered and >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= 18 relevant lines. 18 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= 18 relevant lines. 18 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= 19 relevant lines. 19 lines covered and >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= 18 relevant lines. 18 lines covered and >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) ======= 18 relevant lines. 18 lines covered and >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= 18 relevant lines. 18 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= 18 relevant lines. 18 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= 19 relevant lines. 19 lines covered and >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= 18 relevant lines. 18 lines covered and >>>>>>> 4552227 (Featire specs) >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= 19 relevant lines. 19 lines covered and >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            require 'active_support/core_ext/integer/time'
          
      2. 
        
      
      
        
      
          
    2. 
            
            

            

            
          
      3. 
        
      
      
        
      
          
    3. 
            
            

            

            # The test environment is used exclusively to run your application's
          
      4. 
        
      
      
        
      
          
    4. 
            
            

            

            # test suite. You never need to work with it otherwise. Remember that
          
      5. 
        
      
      
        
      
          
    5. 
            
            

            

            # your test database is "scratch space" for the test suite and is wiped
          
      6. 
        
      
      
        
      
          
    6. 
            
            

            

            # and recreated between test runs. Don't rely on the data there!
          
      7. 
        
      
      
        
      
          
    7. 
            
            

            

            
          
      8. 
        
      
      
        
      
          
    8. 
            1
            

            

            Rails.application.configure do
          
      9. 
        
      
      
        
      
          
    9. 
            
            

            

              # Settings specified here will take precedence over those in config/application.rb.
          
      10. 
        
      
      
        
      
          
    10. 
            
            

            

            
          
      11. 
        
      
      
        
      
          
    11. 
            1
            

            

              config.cache_classes = false
          
      12. 
        
      
      
        
      
          
    12. 
            1
            

            

              config.action_view.cache_template_loading = true
          
      13. 
        
      
      
        
      
          
    13. 
            
            

            

            
          
      14. 
        
      
      
        
      
          
    14. 
            
            

            

              # Do not eager load code on boot. This avoids loading your whole application
          
      15. 
        
      
      
        
      
          
    15. 
            
            

            

              # just for the purpose of running a single test. If you are using a tool that
          
      16. 
        
      
      
        
      
          
    16. 
            
            

            

              # preloads Rails for running tests, you may have to set it to true.
          
      17. 
        
      
      
        
      
          
    17. 
            1
            

            

              config.eager_load = false
          
      18. 
        
      
      
        
      
          
    18. 
            
            

            

            
          
      19. 
        
      
      
        
      
          
    19. 
            
            

            

              # Configure public file server for tests with Cache-Control for performance.
          
      20. 
        
      
      
        
      
          
    20. 
            1
            

            

              config.public_file_server.enabled = true
          
      21. 
        
      
      
        
      
          
    21. 
            1
            

            

              config.public_file_server.headers = {
          
      22. 
        
      
      
        
      
          
    22. 
            
            

            

                'Cache-Control' => "public, max-age=#{1.hour.to_i}"
          
      23. 
        
      
      
        
      
          
    23. 
            
            

            

              }
          
      24. 
        
      
      
        
      
          
    24. 
            
            

            

            
          
      25. 
        
      
      
        
      
          
    25. 
            
            

            

              # Show full error reports and disable caching.
          
      26. 
        
      
      
        
      
          
    26. 
            1
            

            

              config.consider_all_requests_local       = true
          
      27. 
        
      
      
        
      
          
    27. 
            1
            

            

              config.action_controller.perform_caching = false
          
      28. 
        
      
      
        
      
          
    28. 
            1
            

            

              config.cache_store = :null_store
          
      29. 
        
      
      
        
      
          
    29. 
            
            

            

            
          
      30. 
        
      
      
        
      
          
    30. 
            
            

            

              # Raise exceptions instead of rendering exception templates.
          
      31. 
        
      
      
        
      
          
    31. 
            1
            

            

              config.action_dispatch.show_exceptions = false
          
      32. 
        
      
      
        
      
          
    32. 
            
            

            

            
          
      33. 
        
      
      
        
      
          
    33. 
            
            

            

              # Disable request forgery protection in test environment.
          
      34. 
        
      
      
        
      
          
    34. 
            1
            

            

              config.action_controller.allow_forgery_protection = false
          
      35. 
        
      
      
        
      
          
    35. 
            
            

            

            
          
      36. 
        
      
      
        
      
          
    36. 
            
            

            

              # Store uploaded files on the local file system in a temporary directory.
          
      37. 
        
      
      
        
      
          
    37. 
            1
            

            

              config.active_storage.service = :test
          
      38. 
        
      
      
        
      
          
    38. 
            
            

            

            
          
      39. 
        
      
      
        
      
          
    39. 
            1
            

            

              config.action_mailer.perform_caching = false
          
      40. 
        
      
      
        
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84809242 (Featire specs)
=======
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 365d41ed (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
>>>>>>> 13fca83d (Rebased)
=======
>>>>>>> f136376a (Featire specs)
=======
>>>>>>> 1ca9c0ea (Featire specs)
=======
>>>>>>> 4bf888bf (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 393eff3b (Featire specs)
=======
>>>>>>> d9d85ca6 (Fix)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> c12b71de (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> b904d7ae (Featire specs)
=======
>>>>>>> ef483b6d (Fix)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> bdc24a1a (Rebased)
=======
>>>>>>> 53db2224 (Featire specs)
=======
>>>>>>> 7b22ad7e (Featire specs)
=======
>>>>>>> b97bb382 (Featire specs)
=======
>>>>>>> 4a2f2ad8 (Featire specs)
=======
>>>>>>> 21873de0 (Featire specs)
=======
>>>>>>> 392646b5 (Featire specs)
=======
>>>>>>> 1049b80c (Fix)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> e055dd0 (Rebased)
=======
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 973ba8c (Featire specs)
=======
>>>>>>> 8181d13 (Featire specs)
=======
>>>>>>> 72b9cab (Featire specs)
=======
>>>>>>> 15c51b7 (Featire specs)
=======
>>>>>>> 9e081dc (Fix)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> 53db2224 (Featire specs)
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f136376a (Featire specs)
=======
=======
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1ca9c0ea (Featire specs)
=======
=======
>>>>>>> 7b22ad7e (Featire specs)
=======
>>>>>>> b97bb382 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888bf (Featire specs)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> efd6af09 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 5507b42 (Featire specs)
>>>>>>> d52f9efe (Featire specs)
=======
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> ae07231a (Featire specs)
=======
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> c12b71de (Featire specs)
=======
=======
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 392646b5 (Featire specs)
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
    40. 
            1
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 393eff3b (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 36356d3 (Featire specs)
>>>>>>> b904d7ae (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
>>>>>>> 5507b42 (Featire specs)
>>>>>>> 5e31aeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 53db2224 (Featire specs)
=======
=======
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> 973ba8c (Featire specs)
>>>>>>> b97bb382 (Featire specs)
          
    41. 
            1
=======
          
    42. 
            
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
    43. 
            
>>>>>>> 752f0c0 (Featire specs)
=======
          
    44. 
            
>>>>>>> 4e81ea2 (Featire specs)
=======
          
    45. 
            
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> 37e48018 (Featire specs)
=======
          
    46. 
            
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
          
    47. 
            1
>>>>>>> 75fa7e1b (Rebased)
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 365d41ed (Featire specs)
=======
>>>>>>> c05ee511 (Featire specs)
=======
>>>>>>> f136376a (Featire specs)
=======
>>>>>>> 1ca9c0ea (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 53db2224 (Featire specs)
=======
>>>>>>> 7b22ad7e (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
          
    48. 
            
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> bf05825 (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 973ba8c (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
    49. 
            
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
    50. 
            
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
    51. 
            
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
          
    52. 
            1
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> 13fca83d (Rebased)
=======
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376a (Featire specs)
=======
=======
=======
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0ea (Featire specs)
=======
=======
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888bf (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
          
    53. 
            
>>>>>>> 4552227 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 393eff3b (Featire specs)
=======
=======
          
    54. 
            1
>>>>>>> 5b7749a (Fix)
=======
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ef483b6d (Fix)
=======
=======
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
          
    55. 
            1
>>>>>>> 5b7749a (Fix)
>>>>>>> d9d85ca6 (Fix)
=======
          
    56. 
            1
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> 37e48018 (Featire specs)
=======
          
    57. 
            1
>>>>>>> 11792758 (Rebased)
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
>>>>>>> 0676508 (Featire specs)
=======
=======
>>>>>>> 96394f1 (Featire specs)
=======
          
    58. 
            
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
          
    59. 
            
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
=======
=======
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
          
    60. 
            
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
=======
=======
          
    61. 
            1
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> e055dd0 (Rebased)
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5e31aeb (Featire specs)
=======
=======
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 51bc18c (Featire specs)
=======
=======
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 973ba8c (Featire specs)
=======
=======
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
=======
=======
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
=======
=======
=======
          
    62. 
            
>>>>>>> 4552227 (Featire specs)
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
=======
=======
          
    63. 
            1
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> e055dd0 (Rebased)
=======
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 973ba8c (Featire specs)
=======
>>>>>>> 8181d13 (Featire specs)
=======
>>>>>>> 72b9cab (Featire specs)
=======
>>>>>>> 15c51b7 (Featire specs)
=======
>>>>>>> 9e081dc (Fix)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
              config.action_mailer.default_url_options = { host: 'localhost', port: 3000 }
=======
<<<<<<< HEAD
=======
>>>>>>> 4a2f2ad8 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
    64. 
            
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> bf05825 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
    65. 
            
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
    66. 
            
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
    67. 
            
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
          
    68. 
            1
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> bc6bc8d2 (Rebased)
=======
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> d52f9efe (Featire specs)
=======
=======
=======
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> c12b71de (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
          
    69. 
            
>>>>>>> 4552227 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b904d7ae (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 365d41ed (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
>>>>>>> 13fca83d (Rebased)
=======
>>>>>>> f136376a (Featire specs)
=======
>>>>>>> 1ca9c0ea (Featire specs)
=======
>>>>>>> 4bf888bf (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 393eff3b (Featire specs)
=======
>>>>>>> d9d85ca6 (Fix)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> c12b71de (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> b904d7ae (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f136376a (Featire specs)
=======
=======
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1ca9c0ea (Featire specs)
=======
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> 4bf888bf (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> efd6af09 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 5507b42 (Featire specs)
>>>>>>> d52f9efe (Featire specs)
=======
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> ae07231a (Featire specs)
=======
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> c12b71de (Featire specs)
              config.action_mailer.default_url_options = { host: 'localhost', port: 3000 }
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
              config.action_mailer.default_url_options = { host: 'localhost', port: 3000 }
=======
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
>>>>>>> 36356d3 (Featire specs)
>>>>>>> 393eff3b (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> 37e48018 (Featire specs)
=======
              config.action_mailer.default_url_options = { host: 'localhost', port: 3000 }
=======
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 36356d3 (Featire specs)
>>>>>>> b904d7ae (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
>>>>>>> 5507b42 (Featire specs)
>>>>>>> 5e31aeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 53db2224 (Featire specs)
=======
=======
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> 973ba8c (Featire specs)
>>>>>>> b97bb382 (Featire specs)
              config.action_mailer.default_url_options = { host: 'localhost', port: 3000 }
=======
            
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
            
>>>>>>> 752f0c0 (Featire specs)
=======
            
>>>>>>> 4e81ea2 (Featire specs)
=======
            
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
            
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 34509eee (Featire specs)
=======
              config.action_mailer.default_url_options = { host: 'localhost', port: 3000 }
>>>>>>> 75fa7e1b (Rebased)
=======
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 53db2224 (Featire specs)
=======
>>>>>>> 7b22ad7e (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 365d41ed (Featire specs)
=======
>>>>>>> c05ee511 (Featire specs)
=======
>>>>>>> f136376a (Featire specs)
=======
>>>>>>> 1ca9c0ea (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
            
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
            
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 973ba8c (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
=======
            
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
=======
            
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
            
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 4e81ea2 (Featire specs)
=======
            
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
            
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
              config.action_mailer.default_url_options = { host: 'localhost', port: 3000 }
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> 13fca83d (Rebased)
=======
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376a (Featire specs)
=======
=======
=======
=======
            
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0ea (Featire specs)
=======
=======
=======
            
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888bf (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
=======
            
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
>>>>>>> b904d7ae (Featire specs)
=======
=======
            
>>>>>>> 4552227 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 393eff3b (Featire specs)
=======
=======
              config.action_mailer.default_url_options = { host: 'localhost', port: 3000 }
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
>>>>>>> d9d85ca6 (Fix)
=======
              config.action_mailer.default_url_options = { host: 'localhost', port: 3000 }
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
            
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 37e48018 (Featire specs)
=======
              config.action_mailer.default_url_options = { host: 'localhost', port: 3000 }
>>>>>>> 11792758 (Rebased)
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
            
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
=======
            
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
=======
            
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
            
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 4e81ea2 (Featire specs)
=======
            
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
            
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
              config.action_mailer.default_url_options = { host: 'localhost', port: 3000 }
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> bc6bc8d2 (Rebased)
=======
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> d52f9efe (Featire specs)
=======
=======
=======
=======
            
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
=======
            
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> c12b71de (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
=======
            
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> b904d7ae (Featire specs)
=======
=======
              config.action_mailer.default_url_options = { host: 'localhost', port: 3000 }
>>>>>>> 5b7749a (Fix)
>>>>>>> ef483b6d (Fix)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
            
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 0676508 (Featire specs)
=======
            
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
=======
            
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
            
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
=======
            
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
              config.action_mailer.default_url_options = { host: 'localhost', port: 3000 }
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5e31aeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 53db2224 (Featire specs)
=======
=======
=======
=======
            
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
            
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
=======
=======
            
>>>>>>> 08edf50 (Featire specs)
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
=======
=======
            
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
=======
=======
            
>>>>>>> 4552227 (Featire specs)
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 392646b5 (Featire specs)
=======
=======
=======
              config.action_mailer.default_url_options = { host: 'localhost', port: 3000 }
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
            
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
=======
            
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
=======
            
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      70. 
        
      
      
        
      
          
    70. 
            
            

            

              # Tell Action Mailer not to deliver emails to the real world.
          
      71. 
        
      
      
        
      
          
    71. 
            
            

            

              # The :test delivery method accumulates sent emails in the
          
      72. 
        
      
      
        
      
          
    72. 
            
            

            

              # ActionMailer::Base.deliveries array.
          
      73. 
        
      
      
        
      
          
    73. 
            1
            

            

              config.action_mailer.delivery_method = :test
          
      74. 
        
      
      
        
      
          
    74. 
            
            

            

            
          
      75. 
        
      
      
        
      
          
    75. 
            
            

            

              # Print deprecation notices to the stderr.
          
      76. 
        
      
      
        
      
          
    76. 
            1
            

            

              config.active_support.deprecation = :stderr
          
      77. 
        
      
      
        
      
          
    77. 
            
            

            

            
          
      78. 
        
      
      
        
      
          
    78. 
            
            

            

              # Raise exceptions for disallowed deprecations.
          
      79. 
        
      
      
        
      
          
    79. 
            1
            

            

              config.active_support.disallowed_deprecation = :raise
          
      80. 
        
      
      
        
      
          
    80. 
            
            

            

            
          
      81. 
        
      
      
        
      
          
    81. 
            
            

            

              # Tell Active Support which deprecation messages to disallow.
          
      82. 
        
      
      
        
      
          
    82. 
            1
            

            

              config.active_support.disallowed_deprecation_warnings = []
          
      83. 
        
      
      
        
      
          
    83. 
            
            

            

            
          
      84. 
        
      
      
        
      
          
    84. 
            
            

            

              # Raises error for missing translations.
          
      85. 
        
      
      
        
      
          
    85. 
            
            

            

              # config.i18n.raise_on_missing_translations = true
          
      86. 
        
      
      
        
      
          
    86. 
            
            

            

            
          
      87. 
        
      
      
        
      
          
    87. 
            
            

            

              # Annotate rendered view with file names.
          
      88. 
        
      
      
        
      
          
    88. 
            
            

            

              # config.action_view.annotate_rendered_view_with_filenames = true
          
      89. 
        
      
      
        
      
          
    89. 
            
            

            

            end
          
      90.
    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 75fa7e1b (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> b97bb382 (Featire specs) ======= >>>>>>> 4a2f2ad8 (Featire specs) ======= >>>>>>> 21873de0 (Featire specs) ======= >>>>>>> 392646b5 (Featire specs) ======= >>>>>>> 1049b80c (Fix) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> 15c51b7 (Featire specs) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)

    config/initializers/active_admin.rb

    100.0% lines covered

    11 relevant lines. 11 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            ActiveAdmin.setup do |config|
          
      2. 
        
      
      
        
      
          
    2. 
            1
            

            

              config.site_title = 'Book Store'
          
      3. 
        
      
      
        
      
          
    3. 
            1
            

            

              config.authentication_method = :authenticate_admin_user!
          
      4. 
        
      
      
        
      
          
    4. 
            1
            

            

              config.current_user_method = :current_admin_user
          
      5. 
        
      
      
        
      
          
    5. 
            1
            

            

              config.logout_link_path = :destroy_admin_user_session_path
          
      6. 
        
      
      
        
      
          
    6. 
            1
            

            

              config.batch_actions = true
          
      7. 
        
      
      
        
      
          
    7. 
            1
            

            

              config.filter_attributes = %i[encrypted_password password password_confirmation]
          
      8. 
        
      
      
        
      
          
    8. 
            1
            

            

              config.localize_format = :long
          
      9. 
        
      
      
        
      
          
    9. 
            1
            

            

              config.default_per_page = 30
          
      10. 
        
      
      
        
      
          
    10. 
            1
            

            

              config.max_per_page = 10_000
          
      11. 
        
      
      
        
      
          
    11. 
            1
            

            

              config.use_webpacker = true
          
      12. 
        
      
      
        
      
          
    12. 
            
            

            

            end
          
      13.
    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 1049b80c (Fix) ======= >>>>>>> f3d746cb (Featire specs) ======= ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) ======= ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)

    config/initializers/application_controller_renderer.rb

    100.0% lines covered

    0 relevant lines. 0 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            
            

            

            # Be sure to restart your server when you modify this file.
          
      2. 
        
      
      
        
      
          
    2. 
            
            

            

            
          
      3. 
        
      
      
        
      
          
    3. 
            
            

            

            # ActiveSupport::Reloader.to_prepare do
          
      4. 
        
      
      
        
      
          
    4. 
            
            

            

            #   ApplicationController.renderer.defaults.merge!(
          
      5. 
        
      
      
        
      
          
    5. 
            
            

            

            #     http_host: 'example.org',
          
      6. 
        
      
      
        
      
          
    6. 
            
            

            

            #     https: false
          
      7. 
        
      
      
        
      
          
    7. 
            
            

            

            #   )
          
      8. 
        
      
      
        
      
          
    8. 
            
            

            

            # end
          
      9.

    config/initializers/assets.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            
            

            

            # Be sure to restart your server when you modify this file.
          
      2. 
        
      
      
        
      
          
    2. 
            
            

            

            
          
      3. 
        
      
      
        
      
          
    3. 
            
            

            

            # Version of your assets, change this if you want to expire all your assets.
          
      4. 
        
      
      
        
      
          
    4. 
            1
            

            

            Rails.application.config.assets.version = '1.0'
          
      5. 
        
      
      
        
      
          
    5. 
            
            

            

            
          
      6. 
        
      
      
        
      
          
    6. 
            
            

            

            # Add additional assets to the asset load path.
          
      7. 
        
      
      
        
      
          
    7. 
            
            

            

            # Rails.application.config.assets.paths << Emoji.images_path
          
      8. 
        
      
      
        
      
          
    8. 
            
            

            

            # Add Yarn node_modules folder to the asset load path.
          
      9. 
        
      
      
        
      
          
    9. 
            1
            

            

            Rails.application.config.assets.paths << Rails.root.join('node_modules')
          
      10. 
        
      
      
        
      
          
    10. 
            
            

            

            
          
      11. 
        
      
      
        
      
          
    11. 
            
            

            

            # Precompile additional assets.
          
      12. 
        
      
      
        
      
          
    12. 
            
            

            

            # application.js, application.css, and all non-JS/CSS in the app/assets
          
      13. 
        
      
      
        
      
          
    13. 
            
            

            

            # folder are already added.
          
      14. 
        
      
      
        
      
          
    14. 
            
            

            

            # Rails.application.config.assets.precompile += %w( admin.js admin.css )
          
      15.

    config/initializers/backtrace_silencers.rb

    100.0% lines covered

    1 relevant lines. 1 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            
            

            

            # Be sure to restart your server when you modify this file.
          
      2. 
        
      
      
        
      
          
    2. 
            
            

            

            
          
      3. 
        
      
      
        
      
          
    3. 
            
            

            

            # You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces.
          
      4. 
        
      
      
        
      
          
    4. 
            
            

            

            # Rails.backtrace_cleaner.add_silencer { |line| /my_noisy_library/.match?(line) }
          
      5. 
        
      
      
        
      
          
    5. 
            
            

            

            
          
      6. 
        
      
      
        
      
          
    6. 
            
            

            

            # You can also remove all the silencers if you're trying to debug a problem that might stem from framework code
          
      7. 
        
      
      
        
      
          
    7. 
            
            

            

            # by setting BACKTRACE=1 before calling your invocation, like "BACKTRACE=1 ./bin/rails runner 'MyClass.perform'".
          
      8. 
        
      
      
        
      
          
    8. 
            1
            

            

            Rails.backtrace_cleaner.remove_silencers! if ENV['BACKTRACE']
          
      9.

    config/initializers/content_security_policy.rb

    100.0% lines covered

    0 relevant lines. 0 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            
            

            

            # Be sure to restart your server when you modify this file.
          
      2. 
        
      
      
        
      
          
    2. 
            
            

            

            
          
      3. 
        
      
      
        
      
          
    3. 
            
            

            

            # Define an application-wide content security policy
          
      4. 
        
      
      
        
      
          
    4. 
            
            

            

            # For further information see the following documentation
          
      5. 
        
      
      
        
      
          
    5. 
            
            

            

            # https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy
          
      6. 
        
      
      
        
      
          
    6. 
            
            

            

            
          
      7. 
        
      
      
        
      
          
    7. 
            
            

            

            # Rails.application.config.content_security_policy do |policy|
          
      8. 
        
      
      
        
      
          
    8. 
            
            

            

            #   policy.default_src :self, :https
          
      9. 
        
      
      
        
      
          
    9. 
            
            

            

            #   policy.font_src    :self, :https, :data
          
      10. 
        
      
      
        
      
          
    10. 
            
            

            

            #   policy.img_src     :self, :https, :data
          
      11. 
        
      
      
        
      
          
    11. 
            
            

            

            #   policy.object_src  :none
          
      12. 
        
      
      
        
      
          
    12. 
            
            

            

            #   policy.script_src  :self, :https
          
      13. 
        
      
      
        
      
          
    13. 
            
            

            

            #   policy.style_src   :self, :https
          
      14. 
        
      
      
        
      
          
    14. 
            
            

            

            #   # If you are using webpack-dev-server then specify webpack-dev-server host
          
      15. 
        
      
      
        
      
          
    15. 
            
            

            

            #   policy.connect_src :self, :https, "http://localhost:3035", "ws://localhost:3035" if Rails.env.development?
          
      16. 
        
      
      
        
      
          
    16. 
            
            

            

            
          
      17. 
        
      
      
        
      
          
    17. 
            
            

            

            #   # Specify URI for violation reports
          
      18. 
        
      
      
        
      
          
    18. 
            
            

            

            #   # policy.report_uri "/csp-violation-report-endpoint"
          
      19. 
        
      
      
        
      
          
    19. 
            
            

            

            # end
          
      20. 
        
      
      
        
      
          
    20. 
            
            

            

            
          
      21. 
        
      
      
        
      
          
    21. 
            
            

            

            # If you are using UJS then enable automatic nonce generation
          
      22. 
        
      
      
        
      
          
    22. 
            
            

            

            # Rails.application.config.content_security_policy_nonce_generator = -> request { SecureRandom.base64(16) }
          
      23. 
        
      
      
        
      
          
    23. 
            
            

            

            
          
      24. 
        
      
      
        
      
          
    24. 
            
            

            

            # Set the nonce only to specific directives
          
      25. 
        
      
      
        
      
          
    25. 
            
            

            

            # Rails.application.config.content_security_policy_nonce_directives = %w(script-src)
          
      26. 
        
      
      
        
      
          
    26. 
            
            

            

            
          
      27. 
        
      
      
        
      
          
    27. 
            
            

            

            # Report CSP violations to a specified URI
          
      28. 
        
      
      
        
      
          
    28. 
            
            

            

            # For further information see the following documentation:
          
      29. 
        
      
      
        
      
          
    29. 
            
            

            

            # https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy-Report-Only
          
      30. 
        
      
      
        
      
          
    30. 
            
            

            

            # Rails.application.config.content_security_policy_report_only = true
          
      31.

    config/initializers/cookies_serializer.rb

    100.0% lines covered

    1 relevant lines. 1 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            
            

            

            # Be sure to restart your server when you modify this file.
          
      2. 
        
      
      
        
      
          
    2. 
            
            

            

            
          
      3. 
        
      
      
        
      
          
    3. 
            
            

            

            # Specify a serializer for the signed and encrypted cookie jars.
          
      4. 
        
      
      
        
      
          
    4. 
            
            

            

            # Valid options are :json, :marshal, and :hybrid.
          
      5. 
        
      
      
        
      
          
    5. 
            1
            

            

            Rails.application.config.action_dispatch.cookies_serializer = :json
          
      6.
    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= >>>>>>> 6e923b9d (Featire specs) ======= >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> 34509eee (Featire specs) ======= >>>>>>> e989024d (Add login registration pages) ======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 29e1af94 (Add login registration pages) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f6e20266 (Add login registration pages) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ed8ea634 (Add login registration pages) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 2be0d057 (Add login registration pages) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> e011b0df (Add login registration pages) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> b97bb382 (Featire specs) ======= >>>>>>> ff4c2fe0 (Add login registration pages) ======= >>>>>>> 4a2f2ad8 (Featire specs) ======= >>>>>>> 8f1baf1c (Add login registration pages) ======= >>>>>>> 21873de0 (Featire specs) ======= >>>>>>> dda81aa9 (Add login registration pages) ======= >>>>>>> 392646b5 (Featire specs) ======= >>>>>>> 40a3d25f (Add login registration pages) ======= >>>>>>> 1049b80c (Fix) ======= >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> 73dcd461 (Add login registration pages) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) ======= >>>>>>> aca90e3 (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> 156ffe6 (Add login registration pages) ======= >>>>>>> adc21e0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) ======= >>>>>>> 793a6ed (Add login registration pages) ======= >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> c5efe8e (Add login registration pages) ======= >>>>>>> aa3618b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> c871248 (Add login registration pages) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 1d11874 (Add login registration pages) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 06e5e41 (Add login registration pages) ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> 385136b (Add login registration pages) ======= >>>>>>> 15c51b7 (Featire specs) ======= >>>>>>> 1c33e01 (Add login registration pages) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> fb61c5a (Featire specs) ======= >>>>>>> 8d4ec55 (Add login registration pages) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> f92a45b (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 03c0867 (Add login registration pages) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) ======= >>>>>>> aa3618b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 37e48018 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 73dcd461 (Add login registration pages) >>>>>>> 88d49ad (Add login registration pages) ======= ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 8d4ec55 (Add login registration pages) ======= >>>>>>> 73dcd461 (Add login registration pages) >>>>>>> c033601 (Rebased) ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 659083f (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> cacbab9 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= ======= >>>>>>> c033601 (Rebased) ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 6a9fede (Add login registration pages) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> ed8ea634 (Add login registration pages) ======= ======= ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD >>>>>>> 2be0d057 (Add login registration pages) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= ======= >>>>>>> aca90e3 (Rebased) >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 9ec6862 (Add login registration pages) >>>>>>> 156ffe6 (Add login registration pages) >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= ======= ======= >>>>>>> c033601 (Rebased) ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 6a9fede (Add login registration pages) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> 0561be1d (Add login registration pages) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> 512d1d87 (Add login registration pages) ======= ======= ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD >>>>>>> 4976a174 (Add login registration pages) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> df37394 (Featire specs) >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 6a9fede (Add login registration pages) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> c871248 (Add login registration pages) <<<<<<< HEAD >>>>>>> e011b0df (Add login registration pages) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD >>>>>>> 852864e (Add login registration pages) <<<<<<< HEAD >>>>>>> 1d11874 (Add login registration pages) <<<<<<< HEAD >>>>>>> ff4c2fe0 (Add login registration pages) ======= ======= ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 551f3c1 (Add login registration pages) <<<<<<< HEAD >>>>>>> 06e5e41 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8f1baf1c (Add login registration pages) ======= ======= ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> ccec311 (Add login registration pages) <<<<<<< HEAD >>>>>>> 385136b (Add login registration pages) <<<<<<< HEAD >>>>>>> dda81aa9 (Add login registration pages) ======= ======= ======= ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> 8c3e531 (Add login registration pages) <<<<<<< HEAD >>>>>>> 1c33e01 (Add login registration pages) <<<<<<< HEAD >>>>>>> 40a3d25f (Add login registration pages) ======= ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= ======= ======= >>>>>>> 03c0867 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8d4ec55 (Add login registration pages) <<<<<<< HEAD >>>>>>> 73dcd461 (Add login registration pages) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> aa4361fd (Featire specs)

    config/initializers/devise.rb

    100.0% lines covered

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> e011b0df (Add login registration pages) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> ff4c2fe0 (Add login registration pages) ======= >>>>>>> 8f1baf1c (Add login registration pages) ======= >>>>>>> dda81aa9 (Add login registration pages) ======= >>>>>>> 40a3d25f (Add login registration pages) ======= >>>>>>> 1049b80c (Fix) ======= >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> 311e9fa (Rebased) ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> c871248 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> e011b0df (Add login registration pages) ======= >>>>>>> e055dd0 (Rebased) ======= <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 1d11874 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> ff4c2fe0 (Add login registration pages) ======= >>>>>>> 06e5e41 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 8f1baf1c (Add login registration pages) ======= >>>>>>> 385136b (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> dda81aa9 (Add login registration pages) ======= >>>>>>> 1c33e01 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 40a3d25f (Add login registration pages) ======= >>>>>>> 9e081dc (Fix) ======= <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= >>>>>>> fb61c5a (Featire specs) ======= >>>>>>> 73f364d8 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ed8ea634 (Add login registration pages) ======= ======= >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD >>>>>>> 2be0d057 (Add login registration pages) ======= >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 156ffe6 (Add login registration pages) >>>>>>> bae2b7de (Add login registration pages) ======= ======= >>>>>>> c5efe8e (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> a8b17c32 (Add login registration pages) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> 2fef4a0 (Add login registration pages) >>>>>>> 0561be1d (Add login registration pages) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> e60833c (Add login registration pages) >>>>>>> 512d1d87 (Add login registration pages) ======= ======= >>>>>>> f416f45 (Add login registration pages) >>>>>>> 4976a174 (Add login registration pages) ======= ======= >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= >>>>>>> c871248 (Add login registration pages) <<<<<<< HEAD >>>>>>> e011b0df (Add login registration pages) ======= ======= ======= >>>>>>> 852864e (Add login registration pages) <<<<<<< HEAD >>>>>>> 1d11874 (Add login registration pages) <<<<<<< HEAD >>>>>>> ff4c2fe0 (Add login registration pages) ======= ======= ======= >>>>>>> 551f3c1 (Add login registration pages) <<<<<<< HEAD >>>>>>> 06e5e41 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8f1baf1c (Add login registration pages) ======= ======= ======= >>>>>>> ccec311 (Add login registration pages) <<<<<<< HEAD >>>>>>> 385136b (Add login registration pages) <<<<<<< HEAD >>>>>>> dda81aa9 (Add login registration pages) ======= ======= ======= >>>>>>> 8c3e531 (Add login registration pages) >>>>>>> 1c33e01 (Add login registration pages) >>>>>>> 40a3d25f (Add login registration pages) 14 relevant lines. 14 lines covered and ======= 13 relevant lines. 13 lines covered and <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> e011b0df (Add login registration pages) ======= >>>>>>> ff4c2fe0 (Add login registration pages) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= 14 relevant lines. 14 lines covered and >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0561be1d (Add login registration pages) >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> 0561be1d (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) ======= 13 relevant lines. 13 lines covered and >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0561be1d (Add login registration pages) >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 793a6ed (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= 13 relevant lines. 13 lines covered and >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= >>>>>>> 11792758 (Rebased) ======= 14 relevant lines. 14 lines covered and >>>>>>> aa3618b (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 84003439 (Featire specs) ======= 14 relevant lines. 14 lines covered and >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 1d11874 (Add login registration pages) >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> c871248 (Add login registration pages) >>>>>>> e011b0df (Add login registration pages) >>>>>>> 1214e1f (Add login registration pages) ======= 13 relevant lines. 13 lines covered and >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> e60833c (Add login registration pages) >>>>>>> 512d1d87 (Add login registration pages) ======= ======= >>>>>>> 8f1baf1c (Add login registration pages) ======= >>>>>>> dda81aa9 (Add login registration pages) ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> c871248 (Add login registration pages) >>>>>>> e011b0df (Add login registration pages) ======= >>>>>>> 06e5e41 (Add login registration pages) ======= ======= >>>>>>> ccec311 (Add login registration pages) >>>>>>> 385136b (Add login registration pages) ======= 13 relevant lines. 13 lines covered and >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> e011b0df (Add login registration pages) ======= ======= >>>>>>> 385136b (Add login registration pages) >>>>>>> dda81aa9 (Add login registration pages) ======= ======= >>>>>>> 385136b (Add login registration pages) ======= >>>>>>> 1c33e01 (Add login registration pages) >>>>>>> 40a3d25f (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= ======= >>>>>>> e055dd0 (Rebased) ======= 14 relevant lines. 14 lines covered and >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ed8ea634 (Add login registration pages) ======= ======= >>>>>>> 4976a174 (Add login registration pages) ======= ======= 13 relevant lines. 13 lines covered and >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2be0d057 (Add login registration pages) ======= ======= >>>>>>> ef483b6d (Fix) ======= 14 relevant lines. 14 lines covered and >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= 14 relevant lines. 14 lines covered and >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 156ffe6 (Add login registration pages) >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= ======= 14 relevant lines. 14 lines covered and >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) >>>>>>> bc6bc8d2 (Rebased) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> 2fef4a0 (Add login registration pages) >>>>>>> 0561be1d (Add login registration pages) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> e60833c (Add login registration pages) >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> ef483b6d (Fix) ======= ======= 14 relevant lines. 14 lines covered and >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= >>>>>>> 7d58507 (Add login registration pages) >>>>>>> c871248 (Add login registration pages) <<<<<<< HEAD >>>>>>> e011b0df (Add login registration pages) ======= ======= >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 852864e (Add login registration pages) <<<<<<< HEAD >>>>>>> 1d11874 (Add login registration pages) <<<<<<< HEAD >>>>>>> ff4c2fe0 (Add login registration pages) ======= ======= ======= >>>>>>> 551f3c1 (Add login registration pages) <<<<<<< HEAD >>>>>>> 06e5e41 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8f1baf1c (Add login registration pages) ======= ======= ======= >>>>>>> ccec311 (Add login registration pages) <<<<<<< HEAD >>>>>>> 385136b (Add login registration pages) <<<<<<< HEAD >>>>>>> dda81aa9 (Add login registration pages) ======= ======= ======= ======= 13 relevant lines. 13 lines covered and >>>>>>> 26b462d (Add login registration pages) >>>>>>> 8c3e531 (Add login registration pages) <<<<<<< HEAD >>>>>>> 1c33e01 (Add login registration pages) <<<<<<< HEAD >>>>>>> 40a3d25f (Add login registration pages) ======= ======= ======= 14 relevant lines. 14 lines covered and >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= 13 relevant lines. 13 lines covered and >>>>>>> 715fac2 (Featire specs) >>>>>>> fb61c5a (Featire specs) >>>>>>> 73f364d8 (Featire specs) 0 lines missed. 
        
      
      
        
      
          
    1. 
            
            

            

            # frozen_string_literal: true
          
      2. 
        
      
      
        
      
          
    2. 
            
            

            

            
          
      3. 
        
      
      
        
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 56fd9d41 (Add login registration pages)
=======
>>>>>>> 11792758 (Rebased)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 7a08014b (Featire specs)
=======
>>>>>>> a8b17c32 (Add login registration pages)
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> 0561be1d (Add login registration pages)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 512d1d87 (Add login registration pages)
=======
>>>>>>> 4976a174 (Add login registration pages)
=======
>>>>>>> ef483b6d (Fix)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> e6fc67c7 (Featire specs)
=======
>>>>>>> e011b0df (Add login registration pages)
=======
>>>>>>> bdc24a1a (Rebased)
=======
>>>>>>> ff4c2fe0 (Add login registration pages)
=======
>>>>>>> 8f1baf1c (Add login registration pages)
=======
>>>>>>> dda81aa9 (Add login registration pages)
=======
>>>>>>> 40a3d25f (Add login registration pages)
=======
>>>>>>> 1049b80c (Fix)
=======
>>>>>>> 73f364d8 (Featire specs)
=======
>>>>>>> 156ffe6 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 6066f925 (Add login registration pages)
=======
=======
>>>>>>> 793a6ed (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8249ff3c (Add login registration pages)
=======
=======
>>>>>>> c5efe8e (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e989024d (Add login registration pages)
=======
=======
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> 311e9fa (Rebased)
=======
<<<<<<< HEAD
=======
=======
=======
>>>>>>> a8b17c32 (Add login registration pages)
=======
>>>>>>> 311e9fa (Rebased)
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> c871248 (Add login registration pages)
=======
<<<<<<< HEAD
>>>>>>> e011b0df (Add login registration pages)
=======
>>>>>>> e055dd0 (Rebased)
=======
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
>>>>>>> 1d11874 (Add login registration pages)
=======
<<<<<<< HEAD
>>>>>>> ff4c2fe0 (Add login registration pages)
=======
>>>>>>> 06e5e41 (Add login registration pages)
=======
<<<<<<< HEAD
>>>>>>> 8f1baf1c (Add login registration pages)
=======
>>>>>>> 385136b (Add login registration pages)
=======
<<<<<<< HEAD
>>>>>>> dda81aa9 (Add login registration pages)
=======
>>>>>>> 1c33e01 (Add login registration pages)
=======
<<<<<<< HEAD
>>>>>>> 40a3d25f (Add login registration pages)
=======
>>>>>>> 9e081dc (Fix)
=======
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
>>>>>>> fb61c5a (Featire specs)
=======
>>>>>>> 73f364d8 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 7d58507 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 31507b8 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 29e1af94 (Add login registration pages)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> 2fef4a0 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f6e20266 (Add login registration pages)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
>>>>>>> e60833c (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ed8ea634 (Add login registration pages)
=======
=======
>>>>>>> f416f45 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 2be0d057 (Add login registration pages)
=======
>>>>>>> ebcdce06 (Featire specs)
=======
=======
>>>>>>> 156ffe6 (Add login registration pages)
>>>>>>> bae2b7de (Add login registration pages)
=======
=======
>>>>>>> c5efe8e (Add login registration pages)
>>>>>>> 56fd9d41 (Add login registration pages)
=======
=======
>>>>>>> c51bf93 (Featire specs)
>>>>>>> 7a08014b (Featire specs)
=======
>>>>>>> a8b17c32 (Add login registration pages)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> 2fef4a0 (Add login registration pages)
>>>>>>> 0561be1d (Add login registration pages)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> e60833c (Add login registration pages)
>>>>>>> 512d1d87 (Add login registration pages)
=======
=======
>>>>>>> f416f45 (Add login registration pages)
>>>>>>> 4976a174 (Add login registration pages)
=======
=======
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
>>>>>>> c871248 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e011b0df (Add login registration pages)
=======
=======
=======
>>>>>>> 852864e (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 1d11874 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> ff4c2fe0 (Add login registration pages)
=======
=======
=======
>>>>>>> 551f3c1 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 06e5e41 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 8f1baf1c (Add login registration pages)
=======
=======
=======
>>>>>>> ccec311 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 385136b (Add login registration pages)
<<<<<<< HEAD
>>>>>>> dda81aa9 (Add login registration pages)
=======
=======
=======
>>>>>>> 8c3e531 (Add login registration pages)
>>>>>>> 1c33e01 (Add login registration pages)
>>>>>>> 40a3d25f (Add login registration pages)
          
    3. 
            1
=======
          
    4. 
            
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> bae2b7de (Add login registration pages)
=======
>>>>>>> 7a08014b (Featire specs)
=======
>>>>>>> a8b17c32 (Add login registration pages)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> e6fc67c7 (Featire specs)
=======
>>>>>>> e011b0df (Add login registration pages)
=======
>>>>>>> ff4c2fe0 (Add login registration pages)
>>>>>>> 9bfbd88 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 1214e1f (Add login registration pages)
=======
          
    5. 
            
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0561be1d (Add login registration pages)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 512d1d87 (Add login registration pages)
>>>>>>> 793a6ed (Add login registration pages)
=======
=======
>>>>>>> e60833c (Add login registration pages)
=======
          
    6. 
            
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> c5efe8e (Add login registration pages)
=======
          
    7. 
            1
>>>>>>> aa3618b (Rebased)
=======
          
    8. 
            1
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> 1d11874 (Add login registration pages)
>>>>>>> df37394 (Featire specs)
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a8b17c32 (Add login registration pages)
=======
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> df37394 (Featire specs)
>>>>>>> c871248 (Add login registration pages)
=======
>>>>>>> 1214e1f (Add login registration pages)
=======
          
    9. 
            
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 793a6ed (Add login registration pages)
=======
>>>>>>> 56fd9d41 (Add login registration pages)
=======
>>>>>>> a8b17c32 (Add login registration pages)
=======
>>>>>>> 8f1baf1c (Add login registration pages)
=======
=======
>>>>>>> ccec311 (Add login registration pages)
>>>>>>> dda81aa9 (Add login registration pages)
=======
          
    10. 
            
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4976a174 (Add login registration pages)
=======
>>>>>>> e011b0df (Add login registration pages)
=======
=======
>>>>>>> 385136b (Add login registration pages)
>>>>>>> dda81aa9 (Add login registration pages)
=======
=======
>>>>>>> 385136b (Add login registration pages)
=======
>>>>>>> 1c33e01 (Add login registration pages)
>>>>>>> 40a3d25f (Add login registration pages)
>>>>>>> 7d58507 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 31507b8 (Add login registration pages)
=======
=======
>>>>>>> e055dd0 (Rebased)
=======
          
    11. 
            1
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
=======
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 2fef4a0 (Add login registration pages)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e60833c (Add login registration pages)
=======
=======
          
    12. 
            
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> f416f45 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ef483b6d (Fix)
=======
          
    13. 
            1
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c5efe8e (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 56fd9d41 (Add login registration pages)
=======
=======
          
    14. 
            1
>>>>>>> aa3618b (Rebased)
<<<<<<< HEAD
>>>>>>> 11792758 (Rebased)
=======
=======
          
    15. 
            1
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 7a08014b (Featire specs)
=======
>>>>>>> 7d58507 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 31507b8 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> a8b17c32 (Add login registration pages)
=======
=======
=======
          
    16. 
            1
>>>>>>> 49e8a6c (Rebased)
>>>>>>> 311e9fa (Rebased)
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> 2fef4a0 (Add login registration pages)
>>>>>>> 0561be1d (Add login registration pages)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> e60833c (Add login registration pages)
>>>>>>> 512d1d87 (Add login registration pages)
=======
>>>>>>> 4976a174 (Add login registration pages)
=======
>>>>>>> ef483b6d (Fix)
=======
=======
          
    17. 
            1
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> df37394 (Featire specs)
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
>>>>>>> 7d58507 (Add login registration pages)
>>>>>>> c871248 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e011b0df (Add login registration pages)
=======
=======
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
=======
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> 852864e (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 1d11874 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> ff4c2fe0 (Add login registration pages)
=======
=======
=======
>>>>>>> 551f3c1 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 06e5e41 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 8f1baf1c (Add login registration pages)
=======
=======
=======
>>>>>>> ccec311 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 385136b (Add login registration pages)
<<<<<<< HEAD
>>>>>>> dda81aa9 (Add login registration pages)
=======
=======
=======
=======
          
    18. 
            
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 8c3e531 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 1c33e01 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 40a3d25f (Add login registration pages)
=======
=======
=======
          
    19. 
            1
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
=======
          
    20. 
            
>>>>>>> 715fac2 (Featire specs)
>>>>>>> fb61c5a (Featire specs)
>>>>>>> 73f364d8 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4976a174 (Add login registration pages)
=======
>>>>>>> ef483b6d (Fix)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> e6fc67c7 (Featire specs)
=======
>>>>>>> e011b0df (Add login registration pages)
=======
>>>>>>> bdc24a1a (Rebased)
=======
>>>>>>> ff4c2fe0 (Add login registration pages)
=======
>>>>>>> 8f1baf1c (Add login registration pages)
=======
>>>>>>> dda81aa9 (Add login registration pages)
=======
>>>>>>> 40a3d25f (Add login registration pages)
=======
>>>>>>> 1049b80c (Fix)
=======
>>>>>>> 73f364d8 (Featire specs)
=======
>>>>>>> e60833c (Add login registration pages)
=======
>>>>>>> 56fd9d41 (Add login registration pages)
=======
>>>>>>> a8b17c32 (Add login registration pages)
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> 0561be1d (Add login registration pages)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> e60833c (Add login registration pages)
>>>>>>> 512d1d87 (Add login registration pages)
            Devise.setup do |config|
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
            # Assuming you have not yet modified this file, each configuration option below
<<<<<<< HEAD
>>>>>>> 9bfbd88 (Featire specs)
=======
>>>>>>> 1214e1f (Add login registration pages)
=======
            # Assuming you have not yet modified this file, each configuration option below
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 56fd9d41 (Add login registration pages)
=======
>>>>>>> 512d1d87 (Add login registration pages)
>>>>>>> 793a6ed (Add login registration pages)
=======
=======
            # Assuming you have not yet modified this file, each configuration option below
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> c5efe8e (Add login registration pages)
<<<<<<< HEAD
=======
>>>>>>> aa3618b (Rebased)
=======
>>>>>>> 824bb2b (Featire specs)
=======
=======
            # Assuming you have not yet modified this file, each configuration option below
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 2fef4a0 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> f416f45 (Add login registration pages)
<<<<<<< HEAD
=======
>>>>>>> 11792758 (Rebased)
=======
>>>>>>> 7a08014b (Featire specs)
=======
>>>>>>> 4976a174 (Add login registration pages)
            Devise.setup do |config|
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
            # Assuming you have not yet modified this file, each configuration option below
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> 0561be1d (Add login registration pages)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
            Devise.setup do |config|
=======
            # Assuming you have not yet modified this file, each configuration option below
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a8b17c32 (Add login registration pages)
=======
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 0561be1d (Add login registration pages)
=======
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
            # Assuming you have not yet modified this file, each configuration option below
>>>>>>> 730a8ca (Add login registration pages)
=======
            # Assuming you have not yet modified this file, each configuration option below
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4976a174 (Add login registration pages)
>>>>>>> 7d58507 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 31507b8 (Add login registration pages)
=======
=======
            Devise.setup do |config|
>>>>>>> 49e8a6c (Rebased)
>>>>>>> 311e9fa (Rebased)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0561be1d (Add login registration pages)
=======
=======
            # Assuming you have not yet modified this file, each configuration option below
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 2fef4a0 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
            # Assuming you have not yet modified this file, each configuration option below
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 512d1d87 (Add login registration pages)
=======
=======
            # Assuming you have not yet modified this file, each configuration option below
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e60833c (Add login registration pages)
=======
=======
            # Assuming you have not yet modified this file, each configuration option below
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> f416f45 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
=======
            Devise.setup do |config|
>>>>>>> 5b7749a (Fix)
=======
<<<<<<< HEAD
>>>>>>> 56fd9d41 (Add login registration pages)
=======
>>>>>>> c5efe8e (Add login registration pages)
=======
>>>>>>> aa3618b (Rebased)
<<<<<<< HEAD
>>>>>>> 11792758 (Rebased)
=======
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
=======
            # Assuming you have not yet modified this file, each configuration option below
>>>>>>> df37394 (Featire specs)
>>>>>>> c51bf93 (Featire specs)
>>>>>>> 7a08014b (Featire specs)
=======
>>>>>>> 7d58507 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 31507b8 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> a8b17c32 (Add login registration pages)
=======
=======
=======
            Devise.setup do |config|
>>>>>>> 49e8a6c (Rebased)
>>>>>>> 311e9fa (Rebased)
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> 0561be1d (Add login registration pages)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> e60833c (Add login registration pages)
>>>>>>> 512d1d87 (Add login registration pages)
=======
>>>>>>> 4976a174 (Add login registration pages)
=======
=======
            Devise.setup do |config|
>>>>>>> 5b7749a (Fix)
>>>>>>> ef483b6d (Fix)
=======
            Devise.setup do |config|
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
>>>>>>> c871248 (Add login registration pages)
=======
>>>>>>> e055dd0 (Rebased)
=======
>>>>>>> 1d11874 (Add login registration pages)
=======
>>>>>>> 06e5e41 (Add login registration pages)
=======
>>>>>>> 385136b (Add login registration pages)
=======
>>>>>>> 1c33e01 (Add login registration pages)
=======
>>>>>>> 9e081dc (Fix)
=======
>>>>>>> fb61c5a (Featire specs)
            Devise.setup do |config|
=======
            # Assuming you have not yet modified this file, each configuration option below
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 551f3c1 (Add login registration pages)
=======
>>>>>>> ccec311 (Add login registration pages)
=======
>>>>>>> 8c3e531 (Add login registration pages)
            Devise.setup do |config|
=======
            # Assuming you have not yet modified this file, each configuration option below
>>>>>>> 1214e1f (Add login registration pages)
=======
            # Assuming you have not yet modified this file, each configuration option below
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
=======
            # Assuming you have not yet modified this file, each configuration option below
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 7d58507 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> c871248 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e011b0df (Add login registration pages)
=======
=======
=======
            Devise.setup do |config|
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> e055dd0 (Rebased)
>>>>>>> bdc24a1a (Rebased)
          
      21. 
        
      
      
        
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a8b17c32 (Add login registration pages)
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> 0561be1d (Add login registration pages)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 512d1d87 (Add login registration pages)
=======
>>>>>>> 4976a174 (Add login registration pages)
=======
>>>>>>> ef483b6d (Fix)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
>>>>>>> bdc24a1a (Rebased)
=======
>>>>>>> c871248 (Add login registration pages)
>>>>>>> e011b0df (Add login registration pages)
=======
>>>>>>> e055dd0 (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 7d58507 (Add login registration pages)
<<<<<<< HEAD
          
    21. 
            1
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
    22. 
            
>>>>>>> 9bfbd88 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 2fef4a0 (Add login registration pages)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e60833c (Add login registration pages)
=======
>>>>>>> f416f45 (Add login registration pages)
<<<<<<< HEAD
=======
>>>>>>> 56fd9d41 (Add login registration pages)
=======
>>>>>>> 11792758 (Rebased)
=======
>>>>>>> 7a08014b (Featire specs)
          
    23. 
            1
=======
=======
=======
>>>>>>> 2fef4a0 (Add login registration pages)
>>>>>>> 0561be1d (Add login registration pages)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> e60833c (Add login registration pages)
>>>>>>> 512d1d87 (Add login registration pages)
=======
>>>>>>> 4976a174 (Add login registration pages)
          
    24. 
            1
=======
          
    25. 
            
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
    26. 
            
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 2fef4a0 (Add login registration pages)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
    27. 
            
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e60833c (Add login registration pages)
=======
=======
          
    28. 
            
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> f416f45 (Add login registration pages)
=======
          
    29. 
            1
>>>>>>> 5b7749a (Fix)
=======
          
    30. 
            1
>>>>>>> 6da9530 (Featire specs)
=======
=======
>>>>>>> c871248 (Add login registration pages)
          
    31. 
            1
=======
          
    32. 
            
<<<<<<< HEAD
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> f92a45b (Featire specs)
=======
=======
>>>>>>> 1214e1f (Add login registration pages)
=======
          
    33. 
            
>>>>>>> 730a8ca (Add login registration pages)
=======
          
    34. 
            
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 7d58507 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> c871248 (Add login registration pages)
=======
=======
          
    35. 
            1
>>>>>>> 49e8a6c (Rebased)
>>>>>>> e055dd0 (Rebased)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
    36. 
            
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
    37. 
            
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 2fef4a0 (Add login registration pages)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
    38. 
            
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e60833c (Add login registration pages)
=======
=======
          
    39. 
            
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> f416f45 (Add login registration pages)
=======
          
    40. 
            1
>>>>>>> 5b7749a (Fix)
            

            

=======
>>>>>>> 0561be1d (Add login registration pages)
=======
>>>>>>> 512d1d87 (Add login registration pages)
=======
>>>>>>> 4976a174 (Add login registration pages)
=======
>>>>>>> ef483b6d (Fix)
=======
>>>>>>> e6fc67c7 (Featire specs)
=======
>>>>>>> e011b0df (Add login registration pages)
=======
>>>>>>> bdc24a1a (Rebased)
              config.mailer_sender = 'please-change-me-at-config-initializers-devise@example.com'
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
            # is set to its default value. Note that some are commented out while others
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 9bfbd88 (Featire specs)
=======
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
            # is set to its default value. Note that some are commented out while others
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 2fef4a0 (Add login registration pages)
=======
>>>>>>> 1214e1f (Add login registration pages)
=======
            # is set to its default value. Note that some are commented out while others
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 512d1d87 (Add login registration pages)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
            # is set to its default value. Note that some are commented out while others
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4976a174 (Add login registration pages)
>>>>>>> e60833c (Add login registration pages)
=======
=======
            # is set to its default value. Note that some are commented out while others
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> f416f45 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5b7749a (Fix)
=======
<<<<<<< HEAD
>>>>>>> 9bfbd88 (Featire specs)
=======
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
=======
            # is set to its default value. Note that some are commented out while others
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 2fef4a0 (Add login registration pages)
>>>>>>> 0561be1d (Add login registration pages)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> e60833c (Add login registration pages)
>>>>>>> 512d1d87 (Add login registration pages)
=======
>>>>>>> 4976a174 (Add login registration pages)
=======
=======
>>>>>>> 5b7749a (Fix)
>>>>>>> ef483b6d (Fix)
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
            # is set to its default value. Note that some are commented out while others
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
              config.mailer_sender = 'please-change-me-at-config-initializers-devise@example.com'
=======
            # is set to its default value. Note that some are commented out while others
>>>>>>> 1214e1f (Add login registration pages)
=======
            # is set to its default value. Note that some are commented out while others
>>>>>>> 730a8ca (Add login registration pages)
=======
            # is set to its default value. Note that some are commented out while others
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 7d58507 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> c871248 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e011b0df (Add login registration pages)
=======
=======
=======
              config.mailer_sender = 'please-change-me-at-config-initializers-devise@example.com'
>>>>>>> 49e8a6c (Rebased)
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
=======
            Devise.setup do |config|
=======
            # Assuming you have not yet modified this file, each configuration option below
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> 852864e (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 1d11874 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> ff4c2fe0 (Add login registration pages)
=======
=======
=======
>>>>>>> 551f3c1 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 06e5e41 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 8f1baf1c (Add login registration pages)
=======
=======
=======
=======
            # Assuming you have not yet modified this file, each configuration option below
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> ccec311 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 385136b (Add login registration pages)
<<<<<<< HEAD
>>>>>>> dda81aa9 (Add login registration pages)
=======
=======
=======
=======
            # Assuming you have not yet modified this file, each configuration option below
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 8c3e531 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 1c33e01 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 40a3d25f (Add login registration pages)
=======
=======
=======
            Devise.setup do |config|
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
=======
            # Assuming you have not yet modified this file, each configuration option below
>>>>>>> 715fac2 (Featire specs)
>>>>>>> fb61c5a (Featire specs)
>>>>>>> 73f364d8 (Featire specs)
          
      41. 
        
      
      
        
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0561be1d (Add login registration pages)
=======
>>>>>>> 512d1d87 (Add login registration pages)
=======
>>>>>>> 4976a174 (Add login registration pages)
=======
>>>>>>> ef483b6d (Fix)
=======
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
>>>>>>> bdc24a1a (Rebased)
=======
>>>>>>> ff4c2fe0 (Add login registration pages)
=======
>>>>>>> 8f1baf1c (Add login registration pages)
=======
>>>>>>> dda81aa9 (Add login registration pages)
=======
>>>>>>> 40a3d25f (Add login registration pages)
=======
>>>>>>> 1049b80c (Fix)
=======
>>>>>>> 73f364d8 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 7d58507 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e011b0df (Add login registration pages)
=======
<<<<<<< HEAD
>>>>>>> ff4c2fe0 (Add login registration pages)
          
    41. 
=======
=======
>>>>>>> 852864e (Add login registration pages)
=======
>>>>>>> 551f3c1 (Add login registration pages)
=======
>>>>>>> ccec311 (Add login registration pages)
=======
>>>>>>> 8c3e531 (Add login registration pages)
          
    42. 
>>>>>>> 1d11874 (Add login registration pages)
            1
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
    43. 
            
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> fd3f47ab (Featire specs)
<<<<<<< HEAD
>>>>>>> 9bfbd88 (Featire specs)
=======
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> e3e66f3 (Featire specs)
=======
          
    44. 
            
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 2fef4a0 (Add login registration pages)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
    45. 
            
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e60833c (Add login registration pages)
=======
=======
          
    46. 
            
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> f416f45 (Add login registration pages)
=======
>>>>>>> 5b7749a (Fix)
=======
>>>>>>> 6da9530 (Featire specs)
=======
=======
          
    47. 
            
<<<<<<< HEAD
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> f92a45b (Featire specs)
=======
=======
>>>>>>> 1214e1f (Add login registration pages)
=======
          
    48. 
            
>>>>>>> 730a8ca (Add login registration pages)
=======
          
    49. 
            
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 7d58507 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> c871248 (Add login registration pages)
=======
=======
          
    50. 
            1
>>>>>>> 49e8a6c (Rebased)
>>>>>>> e055dd0 (Rebased)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9bfbd88 (Featire specs)
=======
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> e3e66f3 (Featire specs)
=======
          
    51. 
            
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 2fef4a0 (Add login registration pages)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
    52. 
            
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e60833c (Add login registration pages)
=======
=======
          
    53. 
            
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> f416f45 (Add login registration pages)
=======
>>>>>>> 5b7749a (Fix)
            

            

=======
>>>>>>> 0561be1d (Add login registration pages)
=======
>>>>>>> 512d1d87 (Add login registration pages)
=======
>>>>>>> 4976a174 (Add login registration pages)
=======
>>>>>>> ef483b6d (Fix)
=======
>>>>>>> e6fc67c7 (Featire specs)
=======
>>>>>>> e011b0df (Add login registration pages)
=======
>>>>>>> bdc24a1a (Rebased)
              require 'devise/orm/active_record'
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
            # are not: uncommented lines are intended to protect your configuration from
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 9bfbd88 (Featire specs)
=======
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
            # are not: uncommented lines are intended to protect your configuration from
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 2fef4a0 (Add login registration pages)
=======
>>>>>>> 1214e1f (Add login registration pages)
=======
            # are not: uncommented lines are intended to protect your configuration from
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 512d1d87 (Add login registration pages)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
            # are not: uncommented lines are intended to protect your configuration from
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4976a174 (Add login registration pages)
>>>>>>> e60833c (Add login registration pages)
=======
=======
            # are not: uncommented lines are intended to protect your configuration from
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> f416f45 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5b7749a (Fix)
=======
<<<<<<< HEAD
>>>>>>> 9bfbd88 (Featire specs)
=======
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
=======
            # are not: uncommented lines are intended to protect your configuration from
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 2fef4a0 (Add login registration pages)
>>>>>>> 0561be1d (Add login registration pages)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> e60833c (Add login registration pages)
>>>>>>> 512d1d87 (Add login registration pages)
=======
>>>>>>> 4976a174 (Add login registration pages)
=======
=======
>>>>>>> 5b7749a (Fix)
>>>>>>> ef483b6d (Fix)
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
            # are not: uncommented lines are intended to protect your configuration from
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
              require 'devise/orm/active_record'
=======
            # are not: uncommented lines are intended to protect your configuration from
>>>>>>> 1214e1f (Add login registration pages)
=======
            # are not: uncommented lines are intended to protect your configuration from
>>>>>>> 730a8ca (Add login registration pages)
=======
            # are not: uncommented lines are intended to protect your configuration from
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 7d58507 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> c871248 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e011b0df (Add login registration pages)
=======
=======
=======
              require 'devise/orm/active_record'
>>>>>>> 49e8a6c (Rebased)
>>>>>>> e055dd0 (Rebased)
>>>>>>> bdc24a1a (Rebased)
          
      54. 
        
      
      
        
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0561be1d (Add login registration pages)
=======
>>>>>>> 512d1d87 (Add login registration pages)
=======
>>>>>>> 4976a174 (Add login registration pages)
=======
>>>>>>> ef483b6d (Fix)
=======
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
>>>>>>> bdc24a1a (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 7d58507 (Add login registration pages)
>>>>>>> e011b0df (Add login registration pages)
          
    54. 
            1
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
    55. 
            
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> fd3f47ab (Featire specs)
<<<<<<< HEAD
>>>>>>> 9bfbd88 (Featire specs)
=======
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> e3e66f3 (Featire specs)
=======
          
    56. 
            
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 2fef4a0 (Add login registration pages)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
    57. 
            
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e60833c (Add login registration pages)
=======
=======
          
    58. 
            
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> f416f45 (Add login registration pages)
=======
>>>>>>> 5b7749a (Fix)
=======
>>>>>>> 6da9530 (Featire specs)
=======
=======
          
    59. 
            
<<<<<<< HEAD
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> f92a45b (Featire specs)
=======
=======
>>>>>>> 1214e1f (Add login registration pages)
=======
          
    60. 
            
>>>>>>> 730a8ca (Add login registration pages)
=======
          
    61. 
            
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 7d58507 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> c871248 (Add login registration pages)
=======
=======
          
    62. 
            1
>>>>>>> 49e8a6c (Rebased)
>>>>>>> e055dd0 (Rebased)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9bfbd88 (Featire specs)
=======
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> e3e66f3 (Featire specs)
=======
          
    63. 
            
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 2fef4a0 (Add login registration pages)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
    64. 
            
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e60833c (Add login registration pages)
=======
=======
          
    65. 
            
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> f416f45 (Add login registration pages)
=======
>>>>>>> 5b7749a (Fix)
            

            

=======
>>>>>>> 0561be1d (Add login registration pages)
=======
>>>>>>> 512d1d87 (Add login registration pages)
=======
>>>>>>> 4976a174 (Add login registration pages)
=======
>>>>>>> ef483b6d (Fix)
=======
>>>>>>> e6fc67c7 (Featire specs)
=======
>>>>>>> e011b0df (Add login registration pages)
=======
>>>>>>> bdc24a1a (Rebased)
              config.case_insensitive_keys = [:email]
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
            # breaking changes in upgrades (i.e., in the event that future versions of
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 9bfbd88 (Featire specs)
=======
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
            # breaking changes in upgrades (i.e., in the event that future versions of
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 2fef4a0 (Add login registration pages)
=======
>>>>>>> 1214e1f (Add login registration pages)
=======
            # breaking changes in upgrades (i.e., in the event that future versions of
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 512d1d87 (Add login registration pages)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
            # breaking changes in upgrades (i.e., in the event that future versions of
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4976a174 (Add login registration pages)
>>>>>>> e60833c (Add login registration pages)
=======
=======
            # breaking changes in upgrades (i.e., in the event that future versions of
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> f416f45 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5b7749a (Fix)
=======
<<<<<<< HEAD
>>>>>>> 9bfbd88 (Featire specs)
=======
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
=======
            # breaking changes in upgrades (i.e., in the event that future versions of
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 2fef4a0 (Add login registration pages)
>>>>>>> 0561be1d (Add login registration pages)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> e60833c (Add login registration pages)
>>>>>>> 512d1d87 (Add login registration pages)
=======
>>>>>>> 4976a174 (Add login registration pages)
=======
=======
>>>>>>> 5b7749a (Fix)
>>>>>>> ef483b6d (Fix)
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
            # breaking changes in upgrades (i.e., in the event that future versions of
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
              config.case_insensitive_keys = [:email]
=======
            # breaking changes in upgrades (i.e., in the event that future versions of
>>>>>>> 1214e1f (Add login registration pages)
=======
            # breaking changes in upgrades (i.e., in the event that future versions of
>>>>>>> 730a8ca (Add login registration pages)
=======
            # breaking changes in upgrades (i.e., in the event that future versions of
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 7d58507 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> c871248 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e011b0df (Add login registration pages)
=======
=======
=======
              config.case_insensitive_keys = [:email]
>>>>>>> 49e8a6c (Rebased)
>>>>>>> e055dd0 (Rebased)
>>>>>>> bdc24a1a (Rebased)
          
      66. 
        
      
      
        
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0561be1d (Add login registration pages)
=======
>>>>>>> 512d1d87 (Add login registration pages)
=======
>>>>>>> 4976a174 (Add login registration pages)
=======
>>>>>>> ef483b6d (Fix)
=======
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
>>>>>>> bdc24a1a (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 7d58507 (Add login registration pages)
>>>>>>> e011b0df (Add login registration pages)
          
    66. 
            1
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
    67. 
            
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> fd3f47ab (Featire specs)
<<<<<<< HEAD
>>>>>>> 9bfbd88 (Featire specs)
=======
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> e3e66f3 (Featire specs)
=======
          
    68. 
            
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 2fef4a0 (Add login registration pages)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
    69. 
            
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e60833c (Add login registration pages)
=======
=======
          
    70. 
            
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> f416f45 (Add login registration pages)
=======
>>>>>>> 5b7749a (Fix)
=======
>>>>>>> 6da9530 (Featire specs)
=======
=======
          
    71. 
            
<<<<<<< HEAD
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> f92a45b (Featire specs)
=======
=======
>>>>>>> 1214e1f (Add login registration pages)
=======
          
    72. 
            
>>>>>>> 730a8ca (Add login registration pages)
=======
          
    73. 
            
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 7d58507 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> c871248 (Add login registration pages)
=======
=======
          
    74. 
            1
>>>>>>> 49e8a6c (Rebased)
>>>>>>> e055dd0 (Rebased)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9bfbd88 (Featire specs)
=======
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> e3e66f3 (Featire specs)
=======
          
    75. 
            
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 2fef4a0 (Add login registration pages)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
    76. 
            
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e60833c (Add login registration pages)
=======
=======
          
    77. 
            
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> f416f45 (Add login registration pages)
=======
>>>>>>> 5b7749a (Fix)
            

            

=======
>>>>>>> 0561be1d (Add login registration pages)
=======
>>>>>>> 512d1d87 (Add login registration pages)
=======
>>>>>>> 4976a174 (Add login registration pages)
=======
>>>>>>> ef483b6d (Fix)
=======
>>>>>>> e6fc67c7 (Featire specs)
=======
>>>>>>> e011b0df (Add login registration pages)
=======
>>>>>>> bdc24a1a (Rebased)
              config.strip_whitespace_keys = [:email]
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
            # Devise change the default values for those options).
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 9bfbd88 (Featire specs)
=======
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
            # Devise change the default values for those options).
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 2fef4a0 (Add login registration pages)
=======
>>>>>>> 1214e1f (Add login registration pages)
=======
            # Devise change the default values for those options).
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 512d1d87 (Add login registration pages)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
            # Devise change the default values for those options).
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4976a174 (Add login registration pages)
>>>>>>> e60833c (Add login registration pages)
=======
=======
            # Devise change the default values for those options).
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> f416f45 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5b7749a (Fix)
=======
<<<<<<< HEAD
>>>>>>> 9bfbd88 (Featire specs)
=======
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
=======
            # Devise change the default values for those options).
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 2fef4a0 (Add login registration pages)
>>>>>>> 0561be1d (Add login registration pages)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> e60833c (Add login registration pages)
>>>>>>> 512d1d87 (Add login registration pages)
=======
>>>>>>> 4976a174 (Add login registration pages)
=======
=======
>>>>>>> 5b7749a (Fix)
>>>>>>> ef483b6d (Fix)
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
            # Devise change the default values for those options).
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
              config.strip_whitespace_keys = [:email]
=======
            # Devise change the default values for those options).
>>>>>>> 1214e1f (Add login registration pages)
=======
            # Devise change the default values for those options).
>>>>>>> 730a8ca (Add login registration pages)
=======
            # Devise change the default values for those options).
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 7d58507 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> c871248 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e011b0df (Add login registration pages)
=======
=======
=======
              config.strip_whitespace_keys = [:email]
>>>>>>> 49e8a6c (Rebased)
>>>>>>> e055dd0 (Rebased)
>>>>>>> bdc24a1a (Rebased)
          
      78. 
        
      
      
        
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0561be1d (Add login registration pages)
=======
>>>>>>> 512d1d87 (Add login registration pages)
=======
>>>>>>> 4976a174 (Add login registration pages)
=======
>>>>>>> ef483b6d (Fix)
=======
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
>>>>>>> bdc24a1a (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 7d58507 (Add login registration pages)
>>>>>>> e011b0df (Add login registration pages)
          
    78. 
            1
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
    79. 
            
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> fd3f47ab (Featire specs)
<<<<<<< HEAD
>>>>>>> 9bfbd88 (Featire specs)
=======
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> e3e66f3 (Featire specs)
=======
          
    80. 
            
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 2fef4a0 (Add login registration pages)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
    81. 
            
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e60833c (Add login registration pages)
=======
=======
          
    82. 
            
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> f416f45 (Add login registration pages)
=======
>>>>>>> 5b7749a (Fix)
=======
>>>>>>> 6da9530 (Featire specs)
=======
=======
          
    83. 
            
<<<<<<< HEAD
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> f92a45b (Featire specs)
=======
=======
>>>>>>> 1214e1f (Add login registration pages)
=======
          
    84. 
            
>>>>>>> 730a8ca (Add login registration pages)
=======
          
    85. 
            
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 7d58507 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> c871248 (Add login registration pages)
=======
=======
          
    86. 
            1
>>>>>>> 49e8a6c (Rebased)
>>>>>>> e055dd0 (Rebased)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9bfbd88 (Featire specs)
=======
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> e3e66f3 (Featire specs)
=======
          
    87. 
            
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 2fef4a0 (Add login registration pages)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
    88. 
            
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e60833c (Add login registration pages)
=======
=======
          
    89. 
            
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> f416f45 (Add login registration pages)
=======
>>>>>>> 5b7749a (Fix)
            

            

=======
>>>>>>> 0561be1d (Add login registration pages)
=======
>>>>>>> 512d1d87 (Add login registration pages)
=======
>>>>>>> 4976a174 (Add login registration pages)
=======
>>>>>>> ef483b6d (Fix)
=======
>>>>>>> e6fc67c7 (Featire specs)
=======
>>>>>>> e011b0df (Add login registration pages)
=======
>>>>>>> bdc24a1a (Rebased)
              config.skip_session_storage = [:http_auth]
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
            #
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 9bfbd88 (Featire specs)
=======
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
            #
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 2fef4a0 (Add login registration pages)
=======
>>>>>>> 1214e1f (Add login registration pages)
=======
            #
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 512d1d87 (Add login registration pages)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
            #
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4976a174 (Add login registration pages)
>>>>>>> e60833c (Add login registration pages)
=======
=======
            #
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> f416f45 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5b7749a (Fix)
=======
<<<<<<< HEAD
>>>>>>> 9bfbd88 (Featire specs)
=======
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
=======
            #
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 2fef4a0 (Add login registration pages)
>>>>>>> 0561be1d (Add login registration pages)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> e60833c (Add login registration pages)
>>>>>>> 512d1d87 (Add login registration pages)
=======
>>>>>>> 4976a174 (Add login registration pages)
=======
=======
>>>>>>> 5b7749a (Fix)
>>>>>>> ef483b6d (Fix)
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
            #
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
              config.skip_session_storage = [:http_auth]
=======
            #
>>>>>>> 1214e1f (Add login registration pages)
=======
            #
>>>>>>> 730a8ca (Add login registration pages)
=======
            #
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 7d58507 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> c871248 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e011b0df (Add login registration pages)
=======
=======
=======
              config.skip_session_storage = [:http_auth]
>>>>>>> 49e8a6c (Rebased)
>>>>>>> e055dd0 (Rebased)
>>>>>>> bdc24a1a (Rebased)
          
      90. 
        
      
      
        
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0561be1d (Add login registration pages)
=======
>>>>>>> 512d1d87 (Add login registration pages)
=======
>>>>>>> 4976a174 (Add login registration pages)
=======
>>>>>>> ef483b6d (Fix)
=======
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
>>>>>>> bdc24a1a (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 7d58507 (Add login registration pages)
>>>>>>> e011b0df (Add login registration pages)
          
    90. 
            1
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
    91. 
            
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> fd3f47ab (Featire specs)
<<<<<<< HEAD
>>>>>>> 9bfbd88 (Featire specs)
=======
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> e3e66f3 (Featire specs)
=======
          
    92. 
            
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 2fef4a0 (Add login registration pages)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
    93. 
            
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e60833c (Add login registration pages)
=======
=======
          
    94. 
            
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> f416f45 (Add login registration pages)
=======
>>>>>>> 5b7749a (Fix)
=======
>>>>>>> 6da9530 (Featire specs)
=======
=======
          
    95. 
            
<<<<<<< HEAD
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> f92a45b (Featire specs)
=======
=======
>>>>>>> 1214e1f (Add login registration pages)
=======
          
    96. 
            
>>>>>>> 730a8ca (Add login registration pages)
=======
          
    97. 
            
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 7d58507 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> c871248 (Add login registration pages)
=======
=======
          
    98. 
            1
>>>>>>> 49e8a6c (Rebased)
>>>>>>> e055dd0 (Rebased)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9bfbd88 (Featire specs)
=======
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> e3e66f3 (Featire specs)
=======
          
    99. 
            
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 2fef4a0 (Add login registration pages)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
    100. 
            
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e60833c (Add login registration pages)
=======
=======
          
    101. 
            
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> f416f45 (Add login registration pages)
=======
>>>>>>> 5b7749a (Fix)
            

            

=======
>>>>>>> 0561be1d (Add login registration pages)
=======
>>>>>>> 512d1d87 (Add login registration pages)
=======
>>>>>>> 4976a174 (Add login registration pages)
=======
>>>>>>> ef483b6d (Fix)
=======
>>>>>>> e6fc67c7 (Featire specs)
=======
>>>>>>> e011b0df (Add login registration pages)
=======
>>>>>>> bdc24a1a (Rebased)
              config.stretches = Rails.env.test? ? 1 : 12
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
            # Use this hook to configure devise mailer, warden hooks and so forth.
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 9bfbd88 (Featire specs)
=======
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
            # Use this hook to configure devise mailer, warden hooks and so forth.
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 2fef4a0 (Add login registration pages)
=======
>>>>>>> 1214e1f (Add login registration pages)
=======
            # Use this hook to configure devise mailer, warden hooks and so forth.
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 512d1d87 (Add login registration pages)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
            # Use this hook to configure devise mailer, warden hooks and so forth.
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4976a174 (Add login registration pages)
>>>>>>> e60833c (Add login registration pages)
=======
=======
            # Use this hook to configure devise mailer, warden hooks and so forth.
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> f416f45 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5b7749a (Fix)
=======
<<<<<<< HEAD
>>>>>>> 9bfbd88 (Featire specs)
=======
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
=======
            # Use this hook to configure devise mailer, warden hooks and so forth.
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 2fef4a0 (Add login registration pages)
>>>>>>> 0561be1d (Add login registration pages)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> e60833c (Add login registration pages)
>>>>>>> 512d1d87 (Add login registration pages)
=======
>>>>>>> 4976a174 (Add login registration pages)
=======
=======
>>>>>>> 5b7749a (Fix)
>>>>>>> ef483b6d (Fix)
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
            # Use this hook to configure devise mailer, warden hooks and so forth.
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
              config.stretches = Rails.env.test? ? 1 : 12
=======
            # Use this hook to configure devise mailer, warden hooks and so forth.
>>>>>>> 1214e1f (Add login registration pages)
=======
            # Use this hook to configure devise mailer, warden hooks and so forth.
>>>>>>> 730a8ca (Add login registration pages)
=======
            # Use this hook to configure devise mailer, warden hooks and so forth.
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 7d58507 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> c871248 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e011b0df (Add login registration pages)
=======
=======
=======
              config.stretches = Rails.env.test? ? 1 : 12
>>>>>>> 49e8a6c (Rebased)
>>>>>>> e055dd0 (Rebased)
>>>>>>> bdc24a1a (Rebased)
          
      102. 
        
      
      
        
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0561be1d (Add login registration pages)
=======
>>>>>>> 512d1d87 (Add login registration pages)
=======
>>>>>>> 4976a174 (Add login registration pages)
=======
>>>>>>> ef483b6d (Fix)
=======
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
>>>>>>> bdc24a1a (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 7d58507 (Add login registration pages)
>>>>>>> e011b0df (Add login registration pages)
          
    102. 
            1
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
    103. 
            
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> fd3f47ab (Featire specs)
<<<<<<< HEAD
>>>>>>> 9bfbd88 (Featire specs)
=======
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> e3e66f3 (Featire specs)
=======
          
    104. 
            
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 2fef4a0 (Add login registration pages)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
    105. 
            
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e60833c (Add login registration pages)
=======
=======
          
    106. 
            
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> f416f45 (Add login registration pages)
=======
>>>>>>> 5b7749a (Fix)
=======
>>>>>>> 6da9530 (Featire specs)
=======
=======
          
    107. 
            
<<<<<<< HEAD
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> f92a45b (Featire specs)
=======
=======
>>>>>>> 1214e1f (Add login registration pages)
=======
          
    108. 
            
>>>>>>> 730a8ca (Add login registration pages)
=======
          
    109. 
            
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 7d58507 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> c871248 (Add login registration pages)
=======
=======
          
    110. 
            1
>>>>>>> 49e8a6c (Rebased)
>>>>>>> e055dd0 (Rebased)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9bfbd88 (Featire specs)
=======
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> e3e66f3 (Featire specs)
=======
          
    111. 
            
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 2fef4a0 (Add login registration pages)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
    112. 
            
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e60833c (Add login registration pages)
=======
=======
          
    113. 
            
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> f416f45 (Add login registration pages)
=======
>>>>>>> 5b7749a (Fix)
            

            

=======
>>>>>>> 0561be1d (Add login registration pages)
=======
>>>>>>> 512d1d87 (Add login registration pages)
=======
>>>>>>> 4976a174 (Add login registration pages)
=======
>>>>>>> ef483b6d (Fix)
=======
>>>>>>> e6fc67c7 (Featire specs)
=======
>>>>>>> e011b0df (Add login registration pages)
=======
>>>>>>> bdc24a1a (Rebased)
              config.reconfirmable = true
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
            # Many of these configuration options can be set straight in your model.
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 9bfbd88 (Featire specs)
=======
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
            # Many of these configuration options can be set straight in your model.
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 2fef4a0 (Add login registration pages)
=======
>>>>>>> 1214e1f (Add login registration pages)
=======
            # Many of these configuration options can be set straight in your model.
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 512d1d87 (Add login registration pages)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
            # Many of these configuration options can be set straight in your model.
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4976a174 (Add login registration pages)
>>>>>>> e60833c (Add login registration pages)
=======
=======
            # Many of these configuration options can be set straight in your model.
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> f416f45 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5b7749a (Fix)
=======
<<<<<<< HEAD
>>>>>>> 9bfbd88 (Featire specs)
=======
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
=======
            # Many of these configuration options can be set straight in your model.
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 2fef4a0 (Add login registration pages)
>>>>>>> 0561be1d (Add login registration pages)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> e60833c (Add login registration pages)
>>>>>>> 512d1d87 (Add login registration pages)
=======
>>>>>>> 4976a174 (Add login registration pages)
=======
=======
>>>>>>> 5b7749a (Fix)
>>>>>>> ef483b6d (Fix)
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
            # Many of these configuration options can be set straight in your model.
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
              config.reconfirmable = true
=======
            # Many of these configuration options can be set straight in your model.
>>>>>>> 1214e1f (Add login registration pages)
=======
            # Many of these configuration options can be set straight in your model.
>>>>>>> 730a8ca (Add login registration pages)
=======
            # Many of these configuration options can be set straight in your model.
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 7d58507 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> c871248 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e011b0df (Add login registration pages)
=======
=======
=======
              config.reconfirmable = true
>>>>>>> 49e8a6c (Rebased)
>>>>>>> e055dd0 (Rebased)
>>>>>>> bdc24a1a (Rebased)
          
      114. 
        
      
      
        
      
          
    114. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
          
    115. 
>>>>>>> 9a49b7b (Rebased)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
          
    116. 
>>>>>>> c7a726c5 (Rebased)
            1
=======
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> 156ffe6 (Add login registration pages)
=======
            1
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
            1
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
            1
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
            1
>>>>>>> 6da9530 (Featire specs)
>>>>>>> 0f8241bb (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4976a174 (Add login registration pages)
=======
>>>>>>> ef483b6d (Fix)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> e6fc67c7 (Featire specs)
=======
>>>>>>> e011b0df (Add login registration pages)
=======
>>>>>>> bdc24a1a (Rebased)
=======
>>>>>>> e60833c (Add login registration pages)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> 0561be1d (Add login registration pages)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> e60833c (Add login registration pages)
>>>>>>> 512d1d87 (Add login registration pages)
              config.expire_all_remember_me_on_sign_out = true
=======
            Devise.setup do |config|
>>>>>>> 9bfbd88 (Featire specs)
=======
            Devise.setup do |config|
=======
            # Assuming you have not yet modified this file, each configuration option below
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> 156ffe6 (Add login registration pages)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 2fef4a0 (Add login registration pages)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f416f45 (Add login registration pages)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> 2fef4a0 (Add login registration pages)
>>>>>>> 0561be1d (Add login registration pages)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> f416f45 (Add login registration pages)
>>>>>>> 4976a174 (Add login registration pages)
              config.expire_all_remember_me_on_sign_out = true
=======
            Devise.setup do |config|
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0561be1d (Add login registration pages)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
            Devise.setup do |config|
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 512d1d87 (Add login registration pages)
>>>>>>> 2fef4a0 (Add login registration pages)
=======
=======
            Devise.setup do |config|
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 512d1d87 (Add login registration pages)
=======
=======
            Devise.setup do |config|
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4976a174 (Add login registration pages)
>>>>>>> e60833c (Add login registration pages)
=======
=======
            Devise.setup do |config|
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> f416f45 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
=======
              config.expire_all_remember_me_on_sign_out = true
>>>>>>> 5b7749a (Fix)
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> 2fef4a0 (Add login registration pages)
>>>>>>> 0561be1d (Add login registration pages)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> e60833c (Add login registration pages)
>>>>>>> 512d1d87 (Add login registration pages)
=======
>>>>>>> 4976a174 (Add login registration pages)
=======
=======
              config.expire_all_remember_me_on_sign_out = true
>>>>>>> 5b7749a (Fix)
>>>>>>> ef483b6d (Fix)
=======
              config.expire_all_remember_me_on_sign_out = true
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
>>>>>>> c871248 (Add login registration pages)
=======
>>>>>>> e055dd0 (Rebased)
              config.expire_all_remember_me_on_sign_out = true
=======
            Devise.setup do |config|
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
              config.expire_all_remember_me_on_sign_out = true
=======
            Devise.setup do |config|
>>>>>>> 1214e1f (Add login registration pages)
=======
            Devise.setup do |config|
>>>>>>> 730a8ca (Add login registration pages)
=======
            Devise.setup do |config|
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 7d58507 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> c871248 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e011b0df (Add login registration pages)
=======
=======
=======
              config.expire_all_remember_me_on_sign_out = true
>>>>>>> 49e8a6c (Rebased)
>>>>>>> e055dd0 (Rebased)
>>>>>>> bdc24a1a (Rebased)
          
      117. 
        
      
      
        
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6066f925 (Add login registration pages)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> ed8ea634 (Add login registration pages)
=======
>>>>>>> 2be0d057 (Add login registration pages)
=======
>>>>>>> d9d85ca6 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 2fef4a0 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f6e20266 (Add login registration pages)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
>>>>>>> e60833c (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ed8ea634 (Add login registration pages)
=======
=======
>>>>>>> f416f45 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 2be0d057 (Add login registration pages)
=======
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> 2fef4a0 (Add login registration pages)
>>>>>>> 0561be1d (Add login registration pages)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> e60833c (Add login registration pages)
>>>>>>> 512d1d87 (Add login registration pages)
=======
=======
>>>>>>> f416f45 (Add login registration pages)
>>>>>>> 4976a174 (Add login registration pages)
=======
=======
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
=======
>>>>>>> e055dd0 (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 7d58507 (Add login registration pages)
>>>>>>> c871248 (Add login registration pages)
>>>>>>> e011b0df (Add login registration pages)
          
    117. 
            1
=======
          
    118. 
            
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> fd3f47ab (Featire specs)
<<<<<<< HEAD
>>>>>>> 9bfbd88 (Featire specs)
=======
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> e3e66f3 (Featire specs)
=======
          
    119. 
            
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 2fef4a0 (Add login registration pages)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
    120. 
            
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e60833c (Add login registration pages)
=======
=======
          
    121. 
            
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> f416f45 (Add login registration pages)
=======
          
    122. 
            1
>>>>>>> 5b7749a (Fix)
            

            

<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e6fc67c7 (Featire specs)
=======
>>>>>>> e011b0df (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 9bfbd88 (Featire specs)
=======
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> e3e66f3 (Featire specs)
=======
          
    123. 
            
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 2fef4a0 (Add login registration pages)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
    124. 
            
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e60833c (Add login registration pages)
=======
=======
          
    125. 
            
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> f416f45 (Add login registration pages)
=======
          
    126. 
            1
>>>>>>> 5b7749a (Fix)
=======
          
    127. 
            1
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> df37394 (Featire specs)
>>>>>>> f92a45b (Featire specs)
=======
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 1214e1f (Add login registration pages)
=======
          
    128. 
            
>>>>>>> 730a8ca (Add login registration pages)
=======
          
    129. 
            
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 7d58507 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> c871248 (Add login registration pages)
=======
=======
          
    130. 
            1
>>>>>>> 49e8a6c (Rebased)
>>>>>>> e055dd0 (Rebased)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0561be1d (Add login registration pages)
=======
>>>>>>> 512d1d87 (Add login registration pages)
=======
>>>>>>> 4976a174 (Add login registration pages)
=======
>>>>>>> ef483b6d (Fix)
=======
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> e011b0df (Add login registration pages)
=======
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
              config.password_length = 6..128
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
              # The secret key used by Devise. Devise uses this key to generate
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 9bfbd88 (Featire specs)
=======
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
              # The secret key used by Devise. Devise uses this key to generate
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 2fef4a0 (Add login registration pages)
=======
>>>>>>> 1214e1f (Add login registration pages)
=======
              # The secret key used by Devise. Devise uses this key to generate
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 512d1d87 (Add login registration pages)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
              # The secret key used by Devise. Devise uses this key to generate
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4976a174 (Add login registration pages)
>>>>>>> e60833c (Add login registration pages)
=======
=======
              # The secret key used by Devise. Devise uses this key to generate
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> f416f45 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5b7749a (Fix)
=======
<<<<<<< HEAD
>>>>>>> 9bfbd88 (Featire specs)
=======
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
=======
              # The secret key used by Devise. Devise uses this key to generate
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 2fef4a0 (Add login registration pages)
>>>>>>> 0561be1d (Add login registration pages)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> e60833c (Add login registration pages)
>>>>>>> 512d1d87 (Add login registration pages)
=======
>>>>>>> 4976a174 (Add login registration pages)
=======
=======
>>>>>>> 5b7749a (Fix)
>>>>>>> ef483b6d (Fix)
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
              # The secret key used by Devise. Devise uses this key to generate
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
              config.password_length = 6..128
=======
              # The secret key used by Devise. Devise uses this key to generate
>>>>>>> 1214e1f (Add login registration pages)
=======
              # The secret key used by Devise. Devise uses this key to generate
>>>>>>> 730a8ca (Add login registration pages)
=======
              # The secret key used by Devise. Devise uses this key to generate
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 7d58507 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> c871248 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e011b0df (Add login registration pages)
=======
=======
=======
              config.password_length = 6..128
>>>>>>> 49e8a6c (Rebased)
>>>>>>> e055dd0 (Rebased)
>>>>>>> bdc24a1a (Rebased)
          
      131. 
        
      
      
        
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0561be1d (Add login registration pages)
=======
>>>>>>> 512d1d87 (Add login registration pages)
=======
>>>>>>> 4976a174 (Add login registration pages)
=======
>>>>>>> ef483b6d (Fix)
=======
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
>>>>>>> bdc24a1a (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 7d58507 (Add login registration pages)
>>>>>>> e011b0df (Add login registration pages)
          
    131. 
            1
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
    132. 
            
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> fd3f47ab (Featire specs)
<<<<<<< HEAD
>>>>>>> 9bfbd88 (Featire specs)
=======
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> e3e66f3 (Featire specs)
=======
          
    133. 
            
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 2fef4a0 (Add login registration pages)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
    134. 
            
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e60833c (Add login registration pages)
=======
=======
          
    135. 
            
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> f416f45 (Add login registration pages)
=======
>>>>>>> 5b7749a (Fix)
=======
>>>>>>> 6da9530 (Featire specs)
=======
=======
          
    136. 
            
<<<<<<< HEAD
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> f92a45b (Featire specs)
=======
=======
>>>>>>> 1214e1f (Add login registration pages)
=======
          
    137. 
            
>>>>>>> 730a8ca (Add login registration pages)
=======
          
    138. 
            
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 7d58507 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> c871248 (Add login registration pages)
=======
=======
          
    139. 
            1
>>>>>>> 49e8a6c (Rebased)
>>>>>>> e055dd0 (Rebased)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9bfbd88 (Featire specs)
=======
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> e3e66f3 (Featire specs)
=======
          
    140. 
            
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 2fef4a0 (Add login registration pages)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
    141. 
            
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e60833c (Add login registration pages)
=======
=======
          
    142. 
            
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> f416f45 (Add login registration pages)
=======
>>>>>>> 5b7749a (Fix)
            

            

=======
>>>>>>> 0561be1d (Add login registration pages)
=======
>>>>>>> 512d1d87 (Add login registration pages)
=======
>>>>>>> 4976a174 (Add login registration pages)
=======
>>>>>>> ef483b6d (Fix)
=======
>>>>>>> e6fc67c7 (Featire specs)
=======
>>>>>>> e011b0df (Add login registration pages)
=======
>>>>>>> bdc24a1a (Rebased)
              config.email_regexp = /\A[^@\s]+@[^@\s]+\z/
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
              # random tokens. Changing this key will render invalid all existing
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 9bfbd88 (Featire specs)
=======
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
              # random tokens. Changing this key will render invalid all existing
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 2fef4a0 (Add login registration pages)
=======
>>>>>>> 1214e1f (Add login registration pages)
=======
              # random tokens. Changing this key will render invalid all existing
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 512d1d87 (Add login registration pages)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
              # random tokens. Changing this key will render invalid all existing
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4976a174 (Add login registration pages)
>>>>>>> e60833c (Add login registration pages)
=======
=======
              # random tokens. Changing this key will render invalid all existing
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> f416f45 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5b7749a (Fix)
=======
<<<<<<< HEAD
>>>>>>> 9bfbd88 (Featire specs)
=======
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
=======
              # random tokens. Changing this key will render invalid all existing
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 2fef4a0 (Add login registration pages)
>>>>>>> 0561be1d (Add login registration pages)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> e60833c (Add login registration pages)
>>>>>>> 512d1d87 (Add login registration pages)
=======
>>>>>>> 4976a174 (Add login registration pages)
=======
=======
>>>>>>> 5b7749a (Fix)
>>>>>>> ef483b6d (Fix)
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
              # random tokens. Changing this key will render invalid all existing
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
              config.email_regexp = /\A[^@\s]+@[^@\s]+\z/
=======
              # random tokens. Changing this key will render invalid all existing
>>>>>>> 1214e1f (Add login registration pages)
=======
              # random tokens. Changing this key will render invalid all existing
>>>>>>> 730a8ca (Add login registration pages)
=======
              # random tokens. Changing this key will render invalid all existing
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 7d58507 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> c871248 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e011b0df (Add login registration pages)
=======
=======
=======
              config.email_regexp = /\A[^@\s]+@[^@\s]+\z/
>>>>>>> 49e8a6c (Rebased)
>>>>>>> e055dd0 (Rebased)
>>>>>>> bdc24a1a (Rebased)
          
      143. 
        
      
      
        
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0561be1d (Add login registration pages)
=======
>>>>>>> 512d1d87 (Add login registration pages)
=======
>>>>>>> 4976a174 (Add login registration pages)
=======
>>>>>>> ef483b6d (Fix)
=======
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
>>>>>>> bdc24a1a (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 7d58507 (Add login registration pages)
>>>>>>> e011b0df (Add login registration pages)
          
    143. 
            1
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
    144. 
            
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> fd3f47ab (Featire specs)
<<<<<<< HEAD
>>>>>>> 9bfbd88 (Featire specs)
=======
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> e3e66f3 (Featire specs)
=======
          
    145. 
            
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 2fef4a0 (Add login registration pages)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
    146. 
            
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e60833c (Add login registration pages)
=======
=======
          
    147. 
            
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> f416f45 (Add login registration pages)
=======
>>>>>>> 5b7749a (Fix)
=======
>>>>>>> 6da9530 (Featire specs)
=======
=======
          
    148. 
            
<<<<<<< HEAD
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> f92a45b (Featire specs)
=======
=======
>>>>>>> 1214e1f (Add login registration pages)
=======
          
    149. 
            
>>>>>>> 730a8ca (Add login registration pages)
=======
          
    150. 
            
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 7d58507 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> c871248 (Add login registration pages)
=======
=======
          
    151. 
            1
>>>>>>> 49e8a6c (Rebased)
>>>>>>> e055dd0 (Rebased)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9bfbd88 (Featire specs)
=======
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> e3e66f3 (Featire specs)
=======
          
    152. 
            
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 2fef4a0 (Add login registration pages)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
    153. 
            
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e60833c (Add login registration pages)
=======
=======
          
    154. 
            
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> f416f45 (Add login registration pages)
=======
>>>>>>> 5b7749a (Fix)
            

            

=======
>>>>>>> 0561be1d (Add login registration pages)
=======
>>>>>>> 512d1d87 (Add login registration pages)
=======
>>>>>>> 4976a174 (Add login registration pages)
=======
>>>>>>> ef483b6d (Fix)
=======
>>>>>>> e6fc67c7 (Featire specs)
=======
>>>>>>> e011b0df (Add login registration pages)
=======
>>>>>>> bdc24a1a (Rebased)
              config.reset_password_within = 6.hours
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
              # confirmation, reset password and unlock tokens in the database.
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 9bfbd88 (Featire specs)
=======
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
              # confirmation, reset password and unlock tokens in the database.
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 2fef4a0 (Add login registration pages)
=======
>>>>>>> 1214e1f (Add login registration pages)
=======
              # confirmation, reset password and unlock tokens in the database.
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 512d1d87 (Add login registration pages)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
              # confirmation, reset password and unlock tokens in the database.
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4976a174 (Add login registration pages)
>>>>>>> e60833c (Add login registration pages)
=======
=======
              # confirmation, reset password and unlock tokens in the database.
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> f416f45 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5b7749a (Fix)
=======
<<<<<<< HEAD
>>>>>>> 9bfbd88 (Featire specs)
=======
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
=======
              # confirmation, reset password and unlock tokens in the database.
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 2fef4a0 (Add login registration pages)
>>>>>>> 0561be1d (Add login registration pages)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> e60833c (Add login registration pages)
>>>>>>> 512d1d87 (Add login registration pages)
=======
>>>>>>> 4976a174 (Add login registration pages)
=======
=======
>>>>>>> 5b7749a (Fix)
>>>>>>> ef483b6d (Fix)
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
              # confirmation, reset password and unlock tokens in the database.
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
              config.reset_password_within = 6.hours
=======
              # confirmation, reset password and unlock tokens in the database.
>>>>>>> 1214e1f (Add login registration pages)
=======
              # confirmation, reset password and unlock tokens in the database.
>>>>>>> 730a8ca (Add login registration pages)
=======
              # confirmation, reset password and unlock tokens in the database.
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 7d58507 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> c871248 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e011b0df (Add login registration pages)
=======
=======
=======
              config.reset_password_within = 6.hours
>>>>>>> 49e8a6c (Rebased)
>>>>>>> e055dd0 (Rebased)
>>>>>>> bdc24a1a (Rebased)
          
      155. 
        
      
      
        
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0561be1d (Add login registration pages)
=======
>>>>>>> 512d1d87 (Add login registration pages)
=======
>>>>>>> 4976a174 (Add login registration pages)
=======
>>>>>>> ef483b6d (Fix)
=======
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
>>>>>>> bdc24a1a (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 7d58507 (Add login registration pages)
>>>>>>> e011b0df (Add login registration pages)
          
    155. 
            1
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
    156. 
            
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> fd3f47ab (Featire specs)
<<<<<<< HEAD
>>>>>>> 9bfbd88 (Featire specs)
=======
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> e3e66f3 (Featire specs)
=======
          
    157. 
            
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 2fef4a0 (Add login registration pages)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
    158. 
            
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e60833c (Add login registration pages)
=======
=======
          
    159. 
            
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> f416f45 (Add login registration pages)
=======
>>>>>>> 5b7749a (Fix)
=======
>>>>>>> 6da9530 (Featire specs)
=======
=======
          
    160. 
            
<<<<<<< HEAD
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> f92a45b (Featire specs)
=======
=======
>>>>>>> 1214e1f (Add login registration pages)
=======
          
    161. 
            
>>>>>>> 730a8ca (Add login registration pages)
=======
          
    162. 
            
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 7d58507 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> c871248 (Add login registration pages)
=======
=======
          
    163. 
            1
>>>>>>> 49e8a6c (Rebased)
>>>>>>> e055dd0 (Rebased)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9bfbd88 (Featire specs)
=======
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> e3e66f3 (Featire specs)
=======
          
    164. 
            
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 2fef4a0 (Add login registration pages)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
    165. 
            
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e60833c (Add login registration pages)
=======
=======
          
    166. 
            
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> f416f45 (Add login registration pages)
=======
>>>>>>> 5b7749a (Fix)
            

            

=======
>>>>>>> 0561be1d (Add login registration pages)
=======
>>>>>>> 512d1d87 (Add login registration pages)
=======
>>>>>>> 4976a174 (Add login registration pages)
=======
>>>>>>> ef483b6d (Fix)
=======
>>>>>>> e6fc67c7 (Featire specs)
=======
>>>>>>> e011b0df (Add login registration pages)
=======
>>>>>>> bdc24a1a (Rebased)
              config.sign_out_via = :delete
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
              # Devise will use the `secret_key_base` as its `secret_key`
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 9bfbd88 (Featire specs)
=======
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
              # Devise will use the `secret_key_base` as its `secret_key`
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 2fef4a0 (Add login registration pages)
=======
>>>>>>> 1214e1f (Add login registration pages)
=======
              # Devise will use the `secret_key_base` as its `secret_key`
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 512d1d87 (Add login registration pages)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
              # Devise will use the `secret_key_base` as its `secret_key`
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4976a174 (Add login registration pages)
>>>>>>> e60833c (Add login registration pages)
=======
=======
              # Devise will use the `secret_key_base` as its `secret_key`
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> f416f45 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5b7749a (Fix)
=======
<<<<<<< HEAD
>>>>>>> 9bfbd88 (Featire specs)
=======
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
=======
              # Devise will use the `secret_key_base` as its `secret_key`
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 2fef4a0 (Add login registration pages)
>>>>>>> 0561be1d (Add login registration pages)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> e60833c (Add login registration pages)
>>>>>>> 512d1d87 (Add login registration pages)
=======
>>>>>>> 4976a174 (Add login registration pages)
=======
=======
>>>>>>> 5b7749a (Fix)
>>>>>>> ef483b6d (Fix)
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
              # Devise will use the `secret_key_base` as its `secret_key`
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
              config.sign_out_via = :delete
=======
              # Devise will use the `secret_key_base` as its `secret_key`
>>>>>>> 1214e1f (Add login registration pages)
=======
              # Devise will use the `secret_key_base` as its `secret_key`
>>>>>>> 730a8ca (Add login registration pages)
=======
              # Devise will use the `secret_key_base` as its `secret_key`
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 7d58507 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> c871248 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e011b0df (Add login registration pages)
=======
=======
=======
              config.sign_out_via = :delete
>>>>>>> 49e8a6c (Rebased)
>>>>>>> e055dd0 (Rebased)
>>>>>>> bdc24a1a (Rebased)
          
      167. 
        
      
      
        
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0561be1d (Add login registration pages)
=======
>>>>>>> 512d1d87 (Add login registration pages)
=======
>>>>>>> 4976a174 (Add login registration pages)
=======
>>>>>>> ef483b6d (Fix)
=======
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
>>>>>>> bdc24a1a (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 7d58507 (Add login registration pages)
>>>>>>> e011b0df (Add login registration pages)
          
    167. 
            1
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
    168. 
            
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> fd3f47ab (Featire specs)
<<<<<<< HEAD
>>>>>>> 9bfbd88 (Featire specs)
=======
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> e3e66f3 (Featire specs)
=======
          
    169. 
            
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 2fef4a0 (Add login registration pages)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
    170. 
            
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e60833c (Add login registration pages)
=======
=======
          
    171. 
            
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> f416f45 (Add login registration pages)
=======
>>>>>>> 5b7749a (Fix)
=======
>>>>>>> 6da9530 (Featire specs)
=======
=======
          
    172. 
            
<<<<<<< HEAD
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> f92a45b (Featire specs)
=======
=======
>>>>>>> 1214e1f (Add login registration pages)
=======
          
    173. 
            
>>>>>>> 730a8ca (Add login registration pages)
=======
          
    174. 
            
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 7d58507 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> c871248 (Add login registration pages)
=======
=======
          
    175. 
            1
>>>>>>> 49e8a6c (Rebased)
>>>>>>> e055dd0 (Rebased)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9bfbd88 (Featire specs)
=======
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> e3e66f3 (Featire specs)
=======
          
    176. 
            
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 2fef4a0 (Add login registration pages)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
    177. 
            
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e60833c (Add login registration pages)
=======
=======
          
    178. 
            
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> f416f45 (Add login registration pages)
=======
>>>>>>> 5b7749a (Fix)
            

            

=======
>>>>>>> 0561be1d (Add login registration pages)
=======
>>>>>>> 512d1d87 (Add login registration pages)
=======
>>>>>>> 4976a174 (Add login registration pages)
=======
>>>>>>> ef483b6d (Fix)
=======
>>>>>>> e6fc67c7 (Featire specs)
=======
>>>>>>> e011b0df (Add login registration pages)
=======
>>>>>>> bdc24a1a (Rebased)
              config.omniauth :facebook,
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
              # by default. You can change it below and use your own secret key.
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 9bfbd88 (Featire specs)
=======
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
              # by default. You can change it below and use your own secret key.
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 2fef4a0 (Add login registration pages)
=======
>>>>>>> 1214e1f (Add login registration pages)
=======
              # by default. You can change it below and use your own secret key.
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 512d1d87 (Add login registration pages)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
              # by default. You can change it below and use your own secret key.
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4976a174 (Add login registration pages)
>>>>>>> e60833c (Add login registration pages)
=======
=======
              # by default. You can change it below and use your own secret key.
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> f416f45 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5b7749a (Fix)
=======
<<<<<<< HEAD
>>>>>>> 9bfbd88 (Featire specs)
=======
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
=======
              # by default. You can change it below and use your own secret key.
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 2fef4a0 (Add login registration pages)
>>>>>>> 0561be1d (Add login registration pages)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> e60833c (Add login registration pages)
>>>>>>> 512d1d87 (Add login registration pages)
=======
>>>>>>> 4976a174 (Add login registration pages)
=======
=======
>>>>>>> 5b7749a (Fix)
>>>>>>> ef483b6d (Fix)
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
              # by default. You can change it below and use your own secret key.
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
              config.omniauth :facebook,
=======
              # by default. You can change it below and use your own secret key.
>>>>>>> 1214e1f (Add login registration pages)
=======
              # by default. You can change it below and use your own secret key.
>>>>>>> 730a8ca (Add login registration pages)
=======
              # by default. You can change it below and use your own secret key.
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 7d58507 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> c871248 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e011b0df (Add login registration pages)
=======
=======
=======
              config.omniauth :facebook,
>>>>>>> 49e8a6c (Rebased)
>>>>>>> e055dd0 (Rebased)
>>>>>>> bdc24a1a (Rebased)
          
      179. 
        
      
      
        
      
          
    179. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0561be1d (Add login registration pages)
=======
>>>>>>> 512d1d87 (Add login registration pages)
=======
>>>>>>> 4976a174 (Add login registration pages)
=======
>>>>>>> ef483b6d (Fix)
=======
>>>>>>> e6fc67c7 (Featire specs)
=======
>>>>>>> e011b0df (Add login registration pages)
=======
>>>>>>> bdc24a1a (Rebased)
                              Rails.application.credentials.dig(:facebook, :FACEBOOK_ID),
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
              # config.secret_key = 'b0412bb2e70b23477c2527471c87d55e4ca905e45d6533ac6a021ef302571810a86cd1b0c244fc8e83ef34f986e1b646bcd9cb7867b14799f6042ffc17267c24'
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 9bfbd88 (Featire specs)
=======
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
              # config.secret_key = 'b0412bb2e70b23477c2527471c87d55e4ca905e45d6533ac6a021ef302571810a86cd1b0c244fc8e83ef34f986e1b646bcd9cb7867b14799f6042ffc17267c24'
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 2fef4a0 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 1214e1f (Add login registration pages)
=======
              # config.secret_key = 'b0412bb2e70b23477c2527471c87d55e4ca905e45d6533ac6a021ef302571810a86cd1b0c244fc8e83ef34f986e1b646bcd9cb7867b14799f6042ffc17267c24'
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 512d1d87 (Add login registration pages)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
              # config.secret_key = 'b0412bb2e70b23477c2527471c87d55e4ca905e45d6533ac6a021ef302571810a86cd1b0c244fc8e83ef34f986e1b646bcd9cb7867b14799f6042ffc17267c24'
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4976a174 (Add login registration pages)
>>>>>>> e60833c (Add login registration pages)
=======
=======
              # config.secret_key = 'b0412bb2e70b23477c2527471c87d55e4ca905e45d6533ac6a021ef302571810a86cd1b0c244fc8e83ef34f986e1b646bcd9cb7867b14799f6042ffc17267c24'
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> f416f45 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5b7749a (Fix)
=======
<<<<<<< HEAD
>>>>>>> 9bfbd88 (Featire specs)
=======
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> 0561be1d (Add login registration pages)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> e60833c (Add login registration pages)
>>>>>>> 512d1d87 (Add login registration pages)
=======
>>>>>>> 4976a174 (Add login registration pages)
=======
=======
>>>>>>> 5b7749a (Fix)
>>>>>>> ef483b6d (Fix)
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
              # config.secret_key = 'b0412bb2e70b23477c2527471c87d55e4ca905e45d6533ac6a021ef302571810a86cd1b0c244fc8e83ef34f986e1b646bcd9cb7867b14799f6042ffc17267c24'
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
                              Rails.application.credentials.dig(:facebook, :FACEBOOK_ID),
=======
              # config.secret_key = 'b0412bb2e70b23477c2527471c87d55e4ca905e45d6533ac6a021ef302571810a86cd1b0c244fc8e83ef34f986e1b646bcd9cb7867b14799f6042ffc17267c24'
>>>>>>> 1214e1f (Add login registration pages)
=======
              # config.secret_key = 'b0412bb2e70b23477c2527471c87d55e4ca905e45d6533ac6a021ef302571810a86cd1b0c244fc8e83ef34f986e1b646bcd9cb7867b14799f6042ffc17267c24'
>>>>>>> 730a8ca (Add login registration pages)
=======
              # config.secret_key = 'b0412bb2e70b23477c2527471c87d55e4ca905e45d6533ac6a021ef302571810a86cd1b0c244fc8e83ef34f986e1b646bcd9cb7867b14799f6042ffc17267c24'
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 7d58507 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> c871248 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e011b0df (Add login registration pages)
=======
=======
=======
                              Rails.application.credentials.dig(:facebook, :FACEBOOK_ID),
>>>>>>> 49e8a6c (Rebased)
>>>>>>> e055dd0 (Rebased)
>>>>>>> bdc24a1a (Rebased)
          
      180. 
        
      
      
        
      
          
    180. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0561be1d (Add login registration pages)
=======
>>>>>>> 512d1d87 (Add login registration pages)
=======
>>>>>>> 4976a174 (Add login registration pages)
=======
>>>>>>> ef483b6d (Fix)
=======
>>>>>>> e6fc67c7 (Featire specs)
=======
>>>>>>> e011b0df (Add login registration pages)
=======
>>>>>>> bdc24a1a (Rebased)
                              Rails.application.credentials.dig(:facebook, :FACEBOOK_SECRET),
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
            
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 9bfbd88 (Featire specs)
=======
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
            
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 2fef4a0 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 1214e1f (Add login registration pages)
=======
            
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 512d1d87 (Add login registration pages)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
            
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4976a174 (Add login registration pages)
>>>>>>> e60833c (Add login registration pages)
=======
=======
            
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> f416f45 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5b7749a (Fix)
=======
<<<<<<< HEAD
>>>>>>> 9bfbd88 (Featire specs)
=======
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> 0561be1d (Add login registration pages)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> e60833c (Add login registration pages)
>>>>>>> 512d1d87 (Add login registration pages)
=======
>>>>>>> 4976a174 (Add login registration pages)
=======
=======
>>>>>>> 5b7749a (Fix)
>>>>>>> ef483b6d (Fix)
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
            
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
                              Rails.application.credentials.dig(:facebook, :FACEBOOK_SECRET),
=======
            
>>>>>>> 1214e1f (Add login registration pages)
=======
            
>>>>>>> 730a8ca (Add login registration pages)
=======
            
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 7d58507 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> c871248 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e011b0df (Add login registration pages)
=======
=======
=======
                              Rails.application.credentials.dig(:facebook, :FACEBOOK_SECRET),
>>>>>>> 49e8a6c (Rebased)
>>>>>>> e055dd0 (Rebased)
>>>>>>> bdc24a1a (Rebased)
          
      181. 
        
      
      
        
      
          
    181. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0561be1d (Add login registration pages)
=======
>>>>>>> 512d1d87 (Add login registration pages)
=======
>>>>>>> 4976a174 (Add login registration pages)
=======
>>>>>>> ef483b6d (Fix)
=======
>>>>>>> e6fc67c7 (Featire specs)
=======
>>>>>>> e011b0df (Add login registration pages)
=======
>>>>>>> bdc24a1a (Rebased)
                              scope: 'email', info_fields: 'email,name'
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
              # ==> Controller configuration
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 9bfbd88 (Featire specs)
=======
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
              # ==> Controller configuration
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 2fef4a0 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 1214e1f (Add login registration pages)
=======
              # ==> Controller configuration
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 512d1d87 (Add login registration pages)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
              # ==> Controller configuration
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4976a174 (Add login registration pages)
>>>>>>> e60833c (Add login registration pages)
=======
=======
              # ==> Controller configuration
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> f416f45 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5b7749a (Fix)
=======
<<<<<<< HEAD
>>>>>>> 9bfbd88 (Featire specs)
=======
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> 0561be1d (Add login registration pages)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> e60833c (Add login registration pages)
>>>>>>> 512d1d87 (Add login registration pages)
=======
>>>>>>> 4976a174 (Add login registration pages)
=======
=======
>>>>>>> 5b7749a (Fix)
>>>>>>> ef483b6d (Fix)
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
              # ==> Controller configuration
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
                              scope: 'email', info_fields: 'email,name'
=======
              # ==> Controller configuration
>>>>>>> 1214e1f (Add login registration pages)
=======
              # ==> Controller configuration
>>>>>>> 730a8ca (Add login registration pages)
=======
              # ==> Controller configuration
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 7d58507 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> c871248 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e011b0df (Add login registration pages)
=======
=======
=======
                              scope: 'email', info_fields: 'email,name'
>>>>>>> 49e8a6c (Rebased)
>>>>>>> e055dd0 (Rebased)
>>>>>>> bdc24a1a (Rebased)
          
      182. 
        
      
      
        
      
          
    182. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ef483b6d (Fix)
=======
=======
>>>>>>> 730a8ca (Add login registration pages)
=======
>>>>>>> e1f4d17 (Add login registration pages)
=======
>>>>>>> 26b462d (Add login registration pages)
              # Configure the parent class to the devise controllers.
          
      183. 
        
      
      
        
      
          
    183. 
            
            

            

              # config.parent_controller = 'DeviseController'
          
      184. 
        
      
      
        
      
          
    184. 
            
            

            

            
          
      185. 
        
      
      
        
      
          
    185. 
            
            

            

              # ==> Mailer Configuration
          
      186. 
        
      
      
        
      
          
    186. 
            
            

            

              # Configure the e-mail address which will be shown in Devise::Mailer,
          
      187. 
        
      
      
        
      
          
    187. 
            
            

            

              # note that it will be overwritten if you use your own mailer class
          
      188. 
        
      
      
        
      
          
    188. 
            
            

            

              # with default "from" parameter.
          
      189. 
        
      
      
        
      
          
    189. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
=======
>>>>>>> 156ffe6 (Add login registration pages)
          
    190. 
>>>>>>> 9a49b7b (Rebased)
>>>>>>> 6066f925 (Add login registration pages)
            1
=======
          
    191. 
            
>>>>>>> 1214e1f (Add login registration pages)
=======
          
    192. 
            
>>>>>>> 730a8ca (Add login registration pages)
=======
          
    193. 
            
>>>>>>> e1f4d17 (Add login registration pages)
=======
>>>>>>> aa3618b (Rebased)
=======
>>>>>>> 824bb2b (Featire specs)
=======
=======
          
    194. 
            
<<<<<<< HEAD
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
=======
=======
>>>>>>> 1214e1f (Add login registration pages)
=======
          
    195. 
            
>>>>>>> 730a8ca (Add login registration pages)
=======
          
    196. 
            
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 7d58507 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 31507b8 (Add login registration pages)
=======
=======
          
    197. 
            1
>>>>>>> 49e8a6c (Rebased)
>>>>>>> 311e9fa (Rebased)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.mailer_sender = 'please-change-me-at-config-initializers-devise@example.com'
=======
            # is set to its default value. Note that some are commented out while others
>>>>>>> df37394 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
              config.mailer_sender = 'please-change-me-at-config-initializers-devise@example.com'
=======
            # is set to its default value. Note that some are commented out while others
>>>>>>> 1214e1f (Add login registration pages)
=======
            # is set to its default value. Note that some are commented out while others
>>>>>>> 730a8ca (Add login registration pages)
=======
            # is set to its default value. Note that some are commented out while others
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 7d58507 (Add login registration pages)
=======
              config.mailer_sender = 'please-change-me-at-config-initializers-devise@example.com'
>>>>>>> 49e8a6c (Rebased)
          
      198. 
        
      
      
        
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
    198. 
            
            

            

            
          
      199. 
        
      
      
        
      
          
    199. 
            
            

            

              # Configure the class responsible to send e-mails.
          
      200. 
        
      
      
        
      
          
    200. 
            
            

            

              # config.mailer = 'Devise::Mailer'
          
      201. 
        
      
      
        
      
          
    201. 
            
            

            

            
          
      202. 
        
      
      
        
      
          
    202. 
            
            

            

              # Configure the parent class responsible to send e-mails.
          
      203. 
        
      
      
        
      
          
    203. 
            
            

            

              # config.parent_mailer = 'ActionMailer::Base'
          
      204. 
        
      
      
        
      
          
    204. 
            
            

            

            
          
      205. 
        
      
      
        
      
          
    205. 
            
            

            

              # ==> ORM configuration
          
      206. 
        
      
      
        
      
          
    206. 
            
            

            

              # Load and configure the ORM. Supports :active_record (default) and
          
      207. 
        
      
      
        
      
          
    207. 
            
            

            

              # :mongoid (bson_ext recommended) by default. Other ORMs may be
          
      208. 
        
      
      
        
      
          
    208. 
            
            

            

              # available as additional gems.
          
      209. 
        
      
      
        
      
          
    209. 
=======
=======
>>>>>>> 8249ff3c (Add login registration pages)
=======
>>>>>>> e989024d (Add login registration pages)
<<<<<<< HEAD
=======
>>>>>>> 75fa7e1b (Rebased)
=======
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
>>>>>>> 13fca83d (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 7d58507 (Add login registration pages)
>>>>>>> 29e1af94 (Add login registration pages)
          
    210. 
>>>>>>> 6066f925 (Add login registration pages)
            1
=======
          
    211. 
            
<<<<<<< HEAD
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 1214e1f (Add login registration pages)
=======
          
    212. 
            
>>>>>>> 730a8ca (Add login registration pages)
=======
          
    213. 
            
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 7d58507 (Add login registration pages)
=======
          
    214. 
            1
>>>>>>> 49e8a6c (Rebased)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              require 'devise/orm/active_record'
=======
            # are not: uncommented lines are intended to protect your configuration from
>>>>>>> df37394 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
              require 'devise/orm/active_record'
=======
            # are not: uncommented lines are intended to protect your configuration from
>>>>>>> 1214e1f (Add login registration pages)
=======
            # are not: uncommented lines are intended to protect your configuration from
>>>>>>> 730a8ca (Add login registration pages)
=======
            # are not: uncommented lines are intended to protect your configuration from
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 7d58507 (Add login registration pages)
=======
              require 'devise/orm/active_record'
>>>>>>> 49e8a6c (Rebased)
          
      215. 
        
      
      
        
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
    215. 
            
            

            

            
          
      216. 
        
      
      
        
      
          
    216. 
            
            

            

              # ==> Configuration for any authentication mechanism
          
      217. 
        
      
      
        
      
          
    217. 
            
            

            

              # Configure which keys are used when authenticating a user. The default is
          
      218. 
        
      
      
        
      
          
    218. 
            
            

            

              # just :email. You can configure it to use [:username, :subdomain], so for
          
      219. 
        
      
      
        
      
          
    219. 
            
            

            

              # authenticating a user, both parameters are required. Remember that those
          
      220. 
        
      
      
        
      
          
    220. 
            
            

            

              # parameters are used only when authenticating and not when retrieving from
          
      221. 
        
      
      
        
      
          
    221. 
            
            

            

              # session. If you need permissions, you should implement that in a before filter.
          
      222. 
        
      
      
        
      
          
    222. 
            
            

            

              # You can also supply a hash where the value is a boolean determining whether
          
      223. 
        
      
      
        
      
          
    223. 
            
            

            

              # or not authentication should be aborted when the value is not present.
          
      224. 
        
      
      
        
      
          
    224. 
            
            

            

              # config.authentication_keys = [:email]
          
      225. 
        
      
      
        
      
          
    225. 
            
            

            

            
          
      226. 
        
      
      
        
      
          
    226. 
            
            

            

              # Configure parameters from the request object used for authentication. Each entry
          
      227. 
        
      
      
        
      
          
    227. 
            
            

            

              # given should be a request method and it will automatically be passed to the
          
      228. 
        
      
      
        
      
          
    228. 
            
            

            

              # find_for_authentication method and considered in your model lookup. For instance,
          
      229. 
        
      
      
        
      
          
    229. 
            
            

            

              # if you set :request_keys to [:subdomain], :subdomain will be used on authentication.
          
      230. 
        
      
      
        
      
          
    230. 
            
            

            

              # The same considerations mentioned for authentication_keys also apply to request_keys.
          
      231. 
        
      
      
        
      
          
    231. 
            
            

            

              # config.request_keys = []
          
      232. 
        
      
      
        
      
          
    232. 
            
            

            

            
          
      233. 
        
      
      
        
      
          
    233. 
            
            

            

              # Configure which authentication keys should be case-insensitive.
          
      234. 
        
      
      
        
      
          
    234. 
            
            

            

              # These keys will be downcased upon creating or modifying a user and when used
          
      235. 
        
      
      
        
      
          
    235. 
            
            

            

              # to authenticate or find a user. Default is :email.
          
      236. 
        
      
      
        
      
          
    236. 
=======
=======
>>>>>>> 8249ff3c (Add login registration pages)
=======
>>>>>>> e989024d (Add login registration pages)
<<<<<<< HEAD
=======
>>>>>>> 75fa7e1b (Rebased)
=======
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
>>>>>>> 13fca83d (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 7d58507 (Add login registration pages)
>>>>>>> 29e1af94 (Add login registration pages)
          
    237. 
>>>>>>> 6066f925 (Add login registration pages)
            1
=======
          
    238. 
            
<<<<<<< HEAD
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 1214e1f (Add login registration pages)
=======
          
    239. 
            
>>>>>>> 730a8ca (Add login registration pages)
=======
          
    240. 
            
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 7d58507 (Add login registration pages)
=======
          
    241. 
            1
>>>>>>> 49e8a6c (Rebased)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.case_insensitive_keys = [:email]
=======
            # breaking changes in upgrades (i.e., in the event that future versions of
>>>>>>> df37394 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
              config.case_insensitive_keys = [:email]
=======
            # breaking changes in upgrades (i.e., in the event that future versions of
>>>>>>> 1214e1f (Add login registration pages)
=======
            # breaking changes in upgrades (i.e., in the event that future versions of
>>>>>>> 730a8ca (Add login registration pages)
=======
            # breaking changes in upgrades (i.e., in the event that future versions of
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 7d58507 (Add login registration pages)
=======
              config.case_insensitive_keys = [:email]
>>>>>>> 49e8a6c (Rebased)
          
      242. 
        
      
      
        
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
    242. 
            
            

            

            
          
      243. 
        
      
      
        
      
          
    243. 
            
            

            

              # Configure which authentication keys should have whitespace stripped.
          
      244. 
        
      
      
        
      
          
    244. 
            
            

            

              # These keys will have whitespace before and after removed upon creating or
          
      245. 
        
      
      
        
      
          
    245. 
            
            

            

              # modifying a user and when used to authenticate or find a user. Default is :email.
          
      246. 
        
      
      
        
      
          
    246. 
=======
=======
>>>>>>> 8249ff3c (Add login registration pages)
=======
>>>>>>> e989024d (Add login registration pages)
<<<<<<< HEAD
=======
>>>>>>> 75fa7e1b (Rebased)
=======
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
>>>>>>> 13fca83d (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 7d58507 (Add login registration pages)
>>>>>>> 29e1af94 (Add login registration pages)
          
    247. 
>>>>>>> 6066f925 (Add login registration pages)
            1
=======
          
    248. 
            
<<<<<<< HEAD
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 1214e1f (Add login registration pages)
=======
          
    249. 
            
>>>>>>> 730a8ca (Add login registration pages)
=======
          
    250. 
            
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 7d58507 (Add login registration pages)
=======
          
    251. 
            1
>>>>>>> 49e8a6c (Rebased)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.strip_whitespace_keys = [:email]
=======
            # Devise change the default values for those options).
>>>>>>> df37394 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
              config.strip_whitespace_keys = [:email]
=======
            # Devise change the default values for those options).
>>>>>>> 1214e1f (Add login registration pages)
=======
            # Devise change the default values for those options).
>>>>>>> 730a8ca (Add login registration pages)
=======
            # Devise change the default values for those options).
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 7d58507 (Add login registration pages)
=======
              config.strip_whitespace_keys = [:email]
>>>>>>> 49e8a6c (Rebased)
          
      252. 
        
      
      
        
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
    252. 
            
            

            

            
          
      253. 
        
      
      
        
      
          
    253. 
            
            

            

              # Tell if authentication through request.params is enabled. True by default.
          
      254. 
        
      
      
        
      
          
    254. 
            
            

            

              # It can be set to an array that will enable params authentication only for the
          
      255. 
        
      
      
        
      
          
    255. 
            
            

            

              # given strategies, for example, `config.params_authenticatable = [:database]` will
          
      256. 
        
      
      
        
      
          
    256. 
            
            

            

              # enable it only for database (email + password) authentication.
          
      257. 
        
      
      
        
      
          
    257. 
            
            

            

              # config.params_authenticatable = true
          
      258. 
        
      
      
        
      
          
    258. 
            
            

            

            
          
      259. 
        
      
      
        
      
          
    259. 
            
            

            

              # Tell if authentication through HTTP Auth is enabled. False by default.
          
      260. 
        
      
      
        
      
          
    260. 
            
            

            

              # It can be set to an array that will enable http authentication only for the
          
      261. 
        
      
      
        
      
          
    261. 
            
            

            

              # given strategies, for example, `config.http_authenticatable = [:database]` will
          
      262. 
        
      
      
        
      
          
    262. 
            
            

            

              # enable it only for database authentication.
          
      263. 
        
      
      
        
      
          
    263. 
            
            

            

              # For API-only applications to support authentication "out-of-the-box", you will likely want to
          
      264. 
        
      
      
        
      
          
    264. 
            
            

            

              # enable this with :database unless you are using a custom strategy.
          
      265. 
        
      
      
        
      
          
    265. 
            
            

            

              # The supported strategies are:
          
      266. 
        
      
      
        
      
          
    266. 
            
            

            

              # :database      = Support basic authentication with authentication key + password
          
      267. 
        
      
      
        
      
          
    267. 
            
            

            

              # config.http_authenticatable = false
          
      268. 
        
      
      
        
      
          
    268. 
            
            

            

            
          
      269. 
        
      
      
        
      
          
    269. 
            
            

            

              # If 401 status code should be returned for AJAX requests. True by default.
          
      270. 
        
      
      
        
      
          
    270. 
            
            

            

              # config.http_authenticatable_on_xhr = true
          
      271. 
        
      
      
        
      
          
    271. 
            
            

            

            
          
      272. 
        
      
      
        
      
          
    272. 
            
            

            

              # The realm used in Http Basic Authentication. 'Application' by default.
          
      273. 
        
      
      
        
      
          
    273. 
            
            

            

              # config.http_authentication_realm = 'Application'
          
      274. 
        
      
      
        
      
          
    274. 
            
            

            

            
          
      275. 
        
      
      
        
      
          
    275. 
            
            

            

              # It will change confirmation, password recovery and other workflows
          
      276. 
        
      
      
        
      
          
    276. 
            
            

            

              # to behave the same regardless if the e-mail provided was right or wrong.
          
      277. 
        
      
      
        
      
          
    277. 
            
            

            

              # Does not affect registerable.
          
      278. 
        
      
      
        
      
          
    278. 
            
            

            

              # config.paranoid = true
          
      279. 
        
      
      
        
      
          
    279. 
            
            

            

            
          
      280. 
        
      
      
        
      
          
    280. 
            
            

            

              # By default Devise will store the user in session. You can skip storage for
          
      281. 
        
      
      
        
      
          
    281. 
            
            

            

              # particular strategies by setting this option.
          
      282. 
        
      
      
        
      
          
    282. 
            
            

            

              # Notice that if you are skipping storage for all authentication paths, you
          
      283. 
        
      
      
        
      
          
    283. 
            
            

            

              # may want to disable generating routes to Devise's sessions controller by
          
      284. 
        
      
      
        
      
          
    284. 
            
            

            

              # passing skip: :sessions to `devise_for` in your config/routes.rb
          
      285. 
        
      
      
        
      
          
    285. 
=======
=======
>>>>>>> 8249ff3c (Add login registration pages)
=======
>>>>>>> e989024d (Add login registration pages)
<<<<<<< HEAD
=======
>>>>>>> 75fa7e1b (Rebased)
=======
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
>>>>>>> 13fca83d (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 7d58507 (Add login registration pages)
>>>>>>> 29e1af94 (Add login registration pages)
          
    286. 
>>>>>>> 6066f925 (Add login registration pages)
            1
=======
          
    287. 
            
<<<<<<< HEAD
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 1214e1f (Add login registration pages)
=======
          
    288. 
            
>>>>>>> 730a8ca (Add login registration pages)
=======
          
    289. 
            
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 7d58507 (Add login registration pages)
=======
          
    290. 
            1
>>>>>>> 49e8a6c (Rebased)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.skip_session_storage = [:http_auth]
=======
            #
>>>>>>> df37394 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
              config.skip_session_storage = [:http_auth]
=======
            #
>>>>>>> 1214e1f (Add login registration pages)
=======
            #
>>>>>>> 730a8ca (Add login registration pages)
=======
            #
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 7d58507 (Add login registration pages)
=======
              config.skip_session_storage = [:http_auth]
>>>>>>> 49e8a6c (Rebased)
          
      291. 
        
      
      
        
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
    291. 
            
            

            

            
          
      292. 
        
      
      
        
      
          
    292. 
            
            

            

              # By default, Devise cleans up the CSRF token on authentication to
          
      293. 
        
      
      
        
      
          
    293. 
            
            

            

              # avoid CSRF token fixation attacks. This means that, when using AJAX
          
      294. 
        
      
      
        
      
          
    294. 
            
            

            

              # requests for sign in and sign up, you need to get a new CSRF token
          
      295. 
        
      
      
        
      
          
    295. 
            
            

            

              # from the server. You can disable this option at your own risk.
          
      296. 
        
      
      
        
      
          
    296. 
            
            

            

              # config.clean_up_csrf_token_on_authentication = true
          
      297. 
        
      
      
        
      
          
    297. 
            
            

            

            
          
      298. 
        
      
      
        
      
          
    298. 
            
            

            

              # When false, Devise will not attempt to reload routes on eager load.
          
      299. 
        
      
      
        
      
          
    299. 
            
            

            

              # This can reduce the time taken to boot the app but if your application
          
      300. 
        
      
      
        
      
          
    300. 
            
            

            

              # requires the Devise mappings to be loaded during boot time the application
          
      301. 
        
      
      
        
      
          
    301. 
            
            

            

              # won't boot properly.
          
      302. 
        
      
      
        
      
          
    302. 
            
            

            

              # config.reload_routes = true
          
      303. 
        
      
      
        
      
          
    303. 
            
            

            

            
          
      304. 
        
      
      
        
      
          
    304. 
            
            

            

              # ==> Configuration for :database_authenticatable
          
      305. 
        
      
      
        
      
          
    305. 
            
            

            

              # For bcrypt, this is the cost for hashing the password and defaults to 12. If
          
      306. 
        
      
      
        
      
          
    306. 
            
            

            

              # using other algorithms, it sets how many times you want the password to be hashed.
          
      307. 
        
      
      
        
      
          
    307. 
            
            

            

              # The number of stretches used for generating the hashed password are stored
          
      308. 
        
      
      
        
      
          
    308. 
            
            

            

              # with the hashed password. This allows you to change the stretches without
          
      309. 
        
      
      
        
      
          
    309. 
            
            

            

              # invalidating existing passwords.
          
      310. 
        
      
      
        
      
          
    310. 
            
            

            

              #
          
      311. 
        
      
      
        
      
          
    311. 
            
            

            

              # Limiting the stretches to just one in testing will increase the performance of
          
      312. 
        
      
      
        
      
          
    312. 
            
            

            

              # your test suite dramatically. However, it is STRONGLY RECOMMENDED to not use
          
      313. 
        
      
      
        
      
          
    313. 
            
            

            

              # a value less than 10 in other environments. Note that, for bcrypt (the default
          
      314. 
        
      
      
        
      
          
    314. 
            
            

            

              # algorithm), the cost increases exponentially with the number of stretches (e.g.
          
      315. 
        
      
      
        
      
          
    315. 
            
            

            

              # a value of 20 is already extremely slow: approx. 60 seconds for 1 calculation).
          
      316. 
        
      
      
        
      
          
    316. 
=======
=======
>>>>>>> 8249ff3c (Add login registration pages)
=======
>>>>>>> e989024d (Add login registration pages)
<<<<<<< HEAD
=======
>>>>>>> 75fa7e1b (Rebased)
=======
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
>>>>>>> 13fca83d (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 7d58507 (Add login registration pages)
>>>>>>> 29e1af94 (Add login registration pages)
          
    317. 
>>>>>>> 6066f925 (Add login registration pages)
            1
=======
          
    318. 
            
<<<<<<< HEAD
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 1214e1f (Add login registration pages)
=======
          
    319. 
            
>>>>>>> 730a8ca (Add login registration pages)
=======
          
    320. 
            
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 7d58507 (Add login registration pages)
=======
          
    321. 
            1
>>>>>>> 49e8a6c (Rebased)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.stretches = Rails.env.test? ? 1 : 12
=======
            # Use this hook to configure devise mailer, warden hooks and so forth.
>>>>>>> df37394 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
              config.stretches = Rails.env.test? ? 1 : 12
=======
            # Use this hook to configure devise mailer, warden hooks and so forth.
>>>>>>> 1214e1f (Add login registration pages)
=======
            # Use this hook to configure devise mailer, warden hooks and so forth.
>>>>>>> 730a8ca (Add login registration pages)
=======
            # Use this hook to configure devise mailer, warden hooks and so forth.
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 7d58507 (Add login registration pages)
=======
              config.stretches = Rails.env.test? ? 1 : 12
>>>>>>> 49e8a6c (Rebased)
          
      322. 
        
      
      
        
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
    322. 
            
            

            

            
          
      323. 
        
      
      
        
      
          
    323. 
            
            

            

              # Set up a pepper to generate the hashed password.
          
      324. 
        
      
      
        
      
          
    324. 
            
            

            

              # config.pepper = 'ceca2dd0db4a8ea4b0604585575dbae22182ecf60d97a87f4914cc23cfe747f8ff22aac7e416e94240a6fe3cfe3cea929d0a8278c66c5388d059bf5bcfdc8a27'
          
      325. 
        
      
      
        
      
          
    325. 
            
            

            

            
          
      326. 
        
      
      
        
      
          
    326. 
            
            

            

              # Send a notification to the original email when the user's email is changed.
          
      327. 
        
      
      
        
      
          
    327. 
            
            

            

              # config.send_email_changed_notification = false
          
      328. 
        
      
      
        
      
          
    328. 
            
            

            

            
          
      329. 
        
      
      
        
      
          
    329. 
            
            

            

              # Send a notification email when the user's password is changed.
          
      330. 
        
      
      
        
      
          
    330. 
            
            

            

              # config.send_password_change_notification = false
          
      331. 
        
      
      
        
      
          
    331. 
            
            

            

            
          
      332. 
        
      
      
        
      
          
    332. 
            
            

            

              # ==> Configuration for :confirmable
          
      333. 
        
      
      
        
      
          
    333. 
            
            

            

              # A period that the user is allowed to access the website even without
          
      334. 
        
      
      
        
      
          
    334. 
            
            

            

              # confirming their account. For instance, if set to 2.days, the user will be
          
      335. 
        
      
      
        
      
          
    335. 
            
            

            

              # able to access the website for two days without confirming their account,
          
      336. 
        
      
      
        
      
          
    336. 
            
            

            

              # access will be blocked just in the third day.
          
      337. 
        
      
      
        
      
          
    337. 
            
            

            

              # You can also set it to nil, which will allow the user to access the website
          
      338. 
        
      
      
        
      
          
    338. 
            
            

            

              # without confirming their account.
          
      339. 
        
      
      
        
      
          
    339. 
            
            

            

              # Default is 0.days, meaning the user cannot access the website without
          
      340. 
        
      
      
        
      
          
    340. 
            
            

            

              # confirming their account.
          
      341. 
        
      
      
        
      
          
    341. 
            
            

            

              # config.allow_unconfirmed_access_for = 2.days
          
      342. 
        
      
      
        
      
          
    342. 
            
            

            

            
          
      343. 
        
      
      
        
      
          
    343. 
            
            

            

              # A period that the user is allowed to confirm their account before their
          
      344. 
        
      
      
        
      
          
    344. 
            
            

            

              # token becomes invalid. For example, if set to 3.days, the user can confirm
          
      345. 
        
      
      
        
      
          
    345. 
            
            

            

              # their account within 3 days after the mail was sent, but on the fourth day
          
      346. 
        
      
      
        
      
          
    346. 
            
            

            

              # their account can't be confirmed with the token any more.
          
      347. 
        
      
      
        
      
          
    347. 
            
            

            

              # Default is nil, meaning there is no restriction on how long a user can take
          
      348. 
        
      
      
        
      
          
    348. 
            
            

            

              # before confirming their account.
          
      349. 
        
      
      
        
      
          
    349. 
            
            

            

              # config.confirm_within = 3.days
          
      350. 
        
      
      
        
      
          
    350. 
            
            

            

            
          
      351. 
        
      
      
        
      
          
    351. 
            
            

            

              # If true, requires any email changes to be confirmed (exactly the same way as
          
      352. 
        
      
      
        
      
          
    352. 
            
            

            

              # initial account confirmation) to be applied. Requires additional unconfirmed_email
          
      353. 
        
      
      
        
      
          
    353. 
            
            

            

              # db field (see migrations). Until confirmed, new email is stored in
          
      354. 
        
      
      
        
      
          
    354. 
            
            

            

              # unconfirmed_email column, and copied to email column on successful confirmation.
          
      355. 
        
      
      
        
      
          
    355. 
=======
=======
>>>>>>> 8249ff3c (Add login registration pages)
=======
>>>>>>> e989024d (Add login registration pages)
<<<<<<< HEAD
=======
>>>>>>> 75fa7e1b (Rebased)
=======
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
>>>>>>> 13fca83d (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 7d58507 (Add login registration pages)
>>>>>>> 29e1af94 (Add login registration pages)
          
    356. 
>>>>>>> 6066f925 (Add login registration pages)
            1
=======
          
    357. 
            
<<<<<<< HEAD
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 1214e1f (Add login registration pages)
=======
          
    358. 
            
>>>>>>> 730a8ca (Add login registration pages)
=======
          
    359. 
            
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 7d58507 (Add login registration pages)
=======
          
    360. 
            1
>>>>>>> 49e8a6c (Rebased)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.reconfirmable = true
=======
            # Many of these configuration options can be set straight in your model.
>>>>>>> df37394 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
              config.reconfirmable = true
=======
            # Many of these configuration options can be set straight in your model.
>>>>>>> 1214e1f (Add login registration pages)
=======
            # Many of these configuration options can be set straight in your model.
>>>>>>> 730a8ca (Add login registration pages)
=======
            # Many of these configuration options can be set straight in your model.
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 7d58507 (Add login registration pages)
=======
              config.reconfirmable = true
>>>>>>> 49e8a6c (Rebased)
          
      361. 
        
      
      
        
      
          
    361. 
            
            

            

            
          
      362. 
        
      
      
        
      
          
    362. 
            
            

            

              # Defines which key will be used when confirming an account
          
      363. 
        
      
      
        
      
          
    363. 
            
            

            

              # config.confirmation_keys = [:email]
          
      364. 
        
      
      
        
      
          
    364. 
            
            

            

            
          
      365. 
        
      
      
        
      
          
    365. 
            
            

            

              # ==> Configuration for :rememberable
          
      366. 
        
      
      
        
      
          
    366. 
            
            

            

              # The time the user will be remembered without asking for credentials again.
          
      367. 
        
      
      
        
      
          
    367. 
            
            

            

              # config.remember_for = 2.weeks
          
      368. 
        
      
      
        
      
          
    368. 
            
            

            

            
          
      369. 
        
      
      
        
      
          
    369. 
            
            

            

              # Invalidates all the remember me tokens when the user signs out.
          
      370. 
        
      
      
        
      
          
    370. 
            1
=======
>>>>>>> 9bfbd88 (Featire specs)
>>>>>>> ebcdce06 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.expire_all_remember_me_on_sign_out = true
=======
            Devise.setup do |config|
>>>>>>> df37394 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
              config.expire_all_remember_me_on_sign_out = true
=======
            Devise.setup do |config|
>>>>>>> 1214e1f (Add login registration pages)
=======
            Devise.setup do |config|
>>>>>>> 730a8ca (Add login registration pages)
=======
            Devise.setup do |config|
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 7d58507 (Add login registration pages)
=======
              config.expire_all_remember_me_on_sign_out = true
>>>>>>> 49e8a6c (Rebased)
=======
            Devise.setup do |config|
=======
            # Assuming you have not yet modified this file, each configuration option below
>>>>>>> 9bfbd88 (Featire specs)
>>>>>>> ebcdce06 (Featire specs)
          
      371. 
        
      
      
        
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
    371. 
            
            

            

            
          
      372. 
        
      
      
        
      
          
    372. 
            
            

            

              # If true, extends the user's remember period when remembered via cookie.
          
      373. 
        
      
      
        
      
          
    373. 
            
            

            

              # config.extend_remember_period = false
          
      374. 
        
      
      
        
      
          
    374. 
            
            

            

            
          
      375. 
        
      
      
        
      
          
    375. 
            
            

            

              # Options to be passed to the created cookie. For instance, you can set
          
      376. 
        
      
      
        
      
          
    376. 
            
            

            

              # secure: true in order to force SSL only cookies.
          
      377. 
        
      
      
        
      
          
    377. 
            
            

            

              # config.rememberable_options = {}
          
      378. 
        
      
      
        
      
          
    378. 
            
            

            

            
          
      379. 
        
      
      
        
      
          
    379. 
            
            

            

              # ==> Configuration for :validatable
          
      380. 
        
      
      
        
      
          
    380. 
            
            

            

              # Range for password length.
          
      381. 
        
      
      
        
      
          
    381. 
=======
=======
>>>>>>> 8249ff3c (Add login registration pages)
=======
>>>>>>> e989024d (Add login registration pages)
<<<<<<< HEAD
=======
>>>>>>> 75fa7e1b (Rebased)
=======
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
>>>>>>> 13fca83d (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 7d58507 (Add login registration pages)
>>>>>>> 29e1af94 (Add login registration pages)
          
    382. 
>>>>>>> 6066f925 (Add login registration pages)
            1
=======
          
    383. 
            
<<<<<<< HEAD
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 1214e1f (Add login registration pages)
=======
          
    384. 
            
>>>>>>> 730a8ca (Add login registration pages)
=======
          
    385. 
            
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 7d58507 (Add login registration pages)
=======
          
    386. 
            1
>>>>>>> 49e8a6c (Rebased)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.password_length = 6..128
=======
              # The secret key used by Devise. Devise uses this key to generate
>>>>>>> df37394 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
              config.password_length = 6..128
=======
              # The secret key used by Devise. Devise uses this key to generate
>>>>>>> 1214e1f (Add login registration pages)
=======
              # The secret key used by Devise. Devise uses this key to generate
>>>>>>> 730a8ca (Add login registration pages)
=======
              # The secret key used by Devise. Devise uses this key to generate
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 7d58507 (Add login registration pages)
=======
              config.password_length = 6..128
>>>>>>> 49e8a6c (Rebased)
          
      387. 
        
      
      
        
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
    387. 
            
            

            

            
          
      388. 
        
      
      
        
      
          
    388. 
            
            

            

              # Email regex used to validate email formats. It simply asserts that
          
      389. 
        
      
      
        
      
          
    389. 
            
            

            

              # one (and only one) @ exists in the given string. This is mainly
          
      390. 
        
      
      
        
      
          
    390. 
            
            

            

              # to give user feedback and not to assert the e-mail validity.
          
      391. 
        
      
      
        
      
          
    391. 
=======
=======
>>>>>>> 8249ff3c (Add login registration pages)
=======
>>>>>>> e989024d (Add login registration pages)
<<<<<<< HEAD
=======
>>>>>>> 75fa7e1b (Rebased)
=======
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
>>>>>>> 13fca83d (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 7d58507 (Add login registration pages)
>>>>>>> 29e1af94 (Add login registration pages)
          
    392. 
>>>>>>> 6066f925 (Add login registration pages)
            1
=======
          
    393. 
            
<<<<<<< HEAD
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 1214e1f (Add login registration pages)
=======
          
    394. 
            
>>>>>>> 730a8ca (Add login registration pages)
=======
          
    395. 
            
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 7d58507 (Add login registration pages)
=======
          
    396. 
            1
>>>>>>> 49e8a6c (Rebased)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.email_regexp = /\A[^@\s]+@[^@\s]+\z/
=======
              # random tokens. Changing this key will render invalid all existing
>>>>>>> df37394 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
              config.email_regexp = /\A[^@\s]+@[^@\s]+\z/
=======
              # random tokens. Changing this key will render invalid all existing
>>>>>>> 1214e1f (Add login registration pages)
=======
              # random tokens. Changing this key will render invalid all existing
>>>>>>> 730a8ca (Add login registration pages)
=======
              # random tokens. Changing this key will render invalid all existing
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 7d58507 (Add login registration pages)
=======
              config.email_regexp = /\A[^@\s]+@[^@\s]+\z/
>>>>>>> 49e8a6c (Rebased)
          
      397. 
        
      
      
        
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
    397. 
            
            

            

            
          
      398. 
        
      
      
        
      
          
    398. 
            
            

            

              # ==> Configuration for :timeoutable
          
      399. 
        
      
      
        
      
          
    399. 
            
            

            

              # The time you want to timeout the user session without activity. After this
          
      400. 
        
      
      
        
      
          
    400. 
            
            

            

              # time the user will be asked for credentials again. Default is 30 minutes.
          
      401. 
        
      
      
        
      
          
    401. 
            
            

            

              # config.timeout_in = 30.minutes
          
      402. 
        
      
      
        
      
          
    402. 
            
            

            

            
          
      403. 
        
      
      
        
      
          
    403. 
            
            

            

              # ==> Configuration for :lockable
          
      404. 
        
      
      
        
      
          
    404. 
            
            

            

              # Defines which strategy will be used to lock an account.
          
      405. 
        
      
      
        
      
          
    405. 
            
            

            

              # :failed_attempts = Locks an account after a number of failed attempts to sign in.
          
      406. 
        
      
      
        
      
          
    406. 
            
            

            

              # :none            = No lock strategy. You should handle locking by yourself.
          
      407. 
        
      
      
        
      
          
    407. 
            
            

            

              # config.lock_strategy = :failed_attempts
          
      408. 
        
      
      
        
      
          
    408. 
            
            

            

            
          
      409. 
        
      
      
        
      
          
    409. 
            
            

            

              # Defines which key will be used when locking and unlocking an account
          
      410. 
        
      
      
        
      
          
    410. 
            
            

            

              # config.unlock_keys = [:email]
          
      411. 
        
      
      
        
      
          
    411. 
            
            

            

            
          
      412. 
        
      
      
        
      
          
    412. 
            
            

            

              # Defines which strategy will be used to unlock an account.
          
      413. 
        
      
      
        
      
          
    413. 
            
            

            

              # :email = Sends an unlock link to the user email
          
      414. 
        
      
      
        
      
          
    414. 
            
            

            

              # :time  = Re-enables login after a certain amount of time (see :unlock_in below)
          
      415. 
        
      
      
        
      
          
    415. 
            
            

            

              # :both  = Enables both strategies
          
      416. 
        
      
      
        
      
          
    416. 
            
            

            

              # :none  = No unlock strategy. You should handle unlocking by yourself.
          
      417. 
        
      
      
        
      
          
    417. 
            
            

            

              # config.unlock_strategy = :both
          
      418. 
        
      
      
        
      
          
    418. 
            
            

            

            
          
      419. 
        
      
      
        
      
          
    419. 
            
            

            

              # Number of authentication tries before locking an account if lock_strategy
          
      420. 
        
      
      
        
      
          
    420. 
            
            

            

              # is failed attempts.
          
      421. 
        
      
      
        
      
          
    421. 
            
            

            

              # config.maximum_attempts = 20
          
      422. 
        
      
      
        
      
          
    422. 
            
            

            

            
          
      423. 
        
      
      
        
      
          
    423. 
            
            

            

              # Time interval to unlock the account if :time is enabled as unlock_strategy.
          
      424. 
        
      
      
        
      
          
    424. 
            
            

            

              # config.unlock_in = 1.hour
          
      425. 
        
      
      
        
      
          
    425. 
            
            

            

            
          
      426. 
        
      
      
        
      
          
    426. 
            
            

            

              # Warn on the last attempt before the account is locked.
          
      427. 
        
      
      
        
      
          
    427. 
            
            

            

              # config.last_attempt_warning = true
          
      428. 
        
      
      
        
      
          
    428. 
            
            

            

            
          
      429. 
        
      
      
        
      
          
    429. 
            
            

            

              # ==> Configuration for :recoverable
          
      430. 
        
      
      
        
      
          
    430. 
            
            

            

              #
          
      431. 
        
      
      
        
      
          
    431. 
            
            

            

              # Defines which key will be used when recovering the password for an account
          
      432. 
        
      
      
        
      
          
    432. 
            
            

            

              # config.reset_password_keys = [:email]
          
      433. 
        
      
      
        
      
          
    433. 
            
            

            

            
          
      434. 
        
      
      
        
      
          
    434. 
            
            

            

              # Time interval you can reset your password with a reset password key.
          
      435. 
        
      
      
        
      
          
    435. 
            
            

            

              # Don't put a too small interval or your users won't have the time to
          
      436. 
        
      
      
        
      
          
    436. 
            
            

            

              # change their passwords.
          
      437. 
        
      
      
        
      
          
    437. 
=======
=======
>>>>>>> 8249ff3c (Add login registration pages)
=======
>>>>>>> e989024d (Add login registration pages)
<<<<<<< HEAD
=======
>>>>>>> 75fa7e1b (Rebased)
=======
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
>>>>>>> 13fca83d (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 7d58507 (Add login registration pages)
>>>>>>> 29e1af94 (Add login registration pages)
          
    438. 
>>>>>>> 6066f925 (Add login registration pages)
            1
=======
          
    439. 
            
<<<<<<< HEAD
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 1214e1f (Add login registration pages)
=======
          
    440. 
            
>>>>>>> 730a8ca (Add login registration pages)
=======
          
    441. 
            
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 7d58507 (Add login registration pages)
=======
          
    442. 
            1
>>>>>>> 49e8a6c (Rebased)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.reset_password_within = 6.hours
=======
              # confirmation, reset password and unlock tokens in the database.
>>>>>>> df37394 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
              config.reset_password_within = 6.hours
=======
              # confirmation, reset password and unlock tokens in the database.
>>>>>>> 1214e1f (Add login registration pages)
=======
              # confirmation, reset password and unlock tokens in the database.
>>>>>>> 730a8ca (Add login registration pages)
=======
              # confirmation, reset password and unlock tokens in the database.
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 7d58507 (Add login registration pages)
=======
              config.reset_password_within = 6.hours
>>>>>>> 49e8a6c (Rebased)
          
      443. 
        
      
      
        
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
    443. 
            
            

            

            
          
      444. 
        
      
      
        
      
          
    444. 
            
            

            

              # When set to false, does not sign a user in automatically after their password is
          
      445. 
        
      
      
        
      
          
    445. 
            
            

            

              # reset. Defaults to true, so a user is signed in automatically after a reset.
          
      446. 
        
      
      
        
      
          
    446. 
            
            

            

              # config.sign_in_after_reset_password = true
          
      447. 
        
      
      
        
      
          
    447. 
            
            

            

            
          
      448. 
        
      
      
        
      
          
    448. 
            
            

            

              # ==> Configuration for :encryptable
          
      449. 
        
      
      
        
      
          
    449. 
            
            

            

              # Allow you to use another hashing or encryption algorithm besides bcrypt (default).
          
      450. 
        
      
      
        
      
          
    450. 
            
            

            

              # You can use :sha1, :sha512 or algorithms from others authentication tools as
          
      451. 
        
      
      
        
      
          
    451. 
            
            

            

              # :clearance_sha1, :authlogic_sha512 (then you should set stretches above to 20
          
      452. 
        
      
      
        
      
          
    452. 
            
            

            

              # for default behavior) and :restful_authentication_sha1 (then you should set
          
      453. 
        
      
      
        
      
          
    453. 
            
            

            

              # stretches to 10, and copy REST_AUTH_SITE_KEY to pepper).
          
      454. 
        
      
      
        
      
          
    454. 
            
            

            

              #
          
      455. 
        
      
      
        
      
          
    455. 
            
            

            

              # Require the `devise-encryptable` gem when using anything other than bcrypt
          
      456. 
        
      
      
        
      
          
    456. 
            
            

            

              # config.encryptor = :sha512
          
      457. 
        
      
      
        
      
          
    457. 
            
            

            

            
          
      458. 
        
      
      
        
      
          
    458. 
            
            

            

              # ==> Scopes configuration
          
      459. 
        
      
      
        
      
          
    459. 
            
            

            

              # Turn scoped views on. Before rendering "sessions/new", it will first check for
          
      460. 
        
      
      
        
      
          
    460. 
            
            

            

              # "users/sessions/new". It's turned off by default because it's slower if you
          
      461. 
        
      
      
        
      
          
    461. 
            
            

            

              # are using only default views.
          
      462. 
        
      
      
        
      
          
    462. 
            
            

            

              # config.scoped_views = false
          
      463. 
        
      
      
        
      
          
    463. 
            
            

            

            
          
      464. 
        
      
      
        
      
          
    464. 
            
            

            

              # Configure the default scope given to Warden. By default it's the first
          
      465. 
        
      
      
        
      
          
    465. 
            
            

            

              # devise role declared in your routes (usually :user).
          
      466. 
        
      
      
        
      
          
    466. 
            
            

            

              # config.default_scope = :user
          
      467. 
        
      
      
        
      
          
    467. 
            
            

            

            
          
      468. 
        
      
      
        
      
          
    468. 
            
            

            

              # Set this configuration to false if you want /users/sign_out to sign out
          
      469. 
        
      
      
        
      
          
    469. 
            
            

            

              # only the current scope. By default, Devise signs out all scopes.
          
      470. 
        
      
      
        
      
          
    470. 
            
            

            

              # config.sign_out_all_scopes = true
          
      471. 
        
      
      
        
      
          
    471. 
            
            

            

            
          
      472. 
        
      
      
        
      
          
    472. 
            
            

            

              # ==> Navigation configuration
          
      473. 
        
      
      
        
      
          
    473. 
            
            

            

              # Lists the formats that should be treated as navigational. Formats like
          
      474. 
        
      
      
        
      
          
    474. 
            
            

            

              # :html, should redirect to the sign in page when the user does not have
          
      475. 
        
      
      
        
      
          
    475. 
            
            

            

              # access, but formats like :xml or :json, should return 401.
          
      476. 
        
      
      
        
      
          
    476. 
            
            

            

              #
          
      477. 
        
      
      
        
      
          
    477. 
            
            

            

              # If you have any extra navigational formats, like :iphone or :mobile, you
          
      478. 
        
      
      
        
      
          
    478. 
            
            

            

              # should add them to the navigational formats lists.
          
      479. 
        
      
      
        
      
          
    479. 
            
            

            

              #
          
      480. 
        
      
      
        
      
          
    480. 
            
            

            

              # The "*/*" below is required to match Internet Explorer requests.
          
      481. 
        
      
      
        
      
          
    481. 
            
            

            

              # config.navigational_formats = ['*/*', :html]
          
      482. 
        
      
      
        
      
          
    482. 
            
            

            

            
          
      483. 
        
      
      
        
      
          
    483. 
            
            

            

              # The default HTTP method used to sign out a resource. Default is :delete.
          
      484. 
        
      
      
        
      
          
    484. 
=======
=======
>>>>>>> 8249ff3c (Add login registration pages)
=======
>>>>>>> e989024d (Add login registration pages)
<<<<<<< HEAD
=======
>>>>>>> 75fa7e1b (Rebased)
=======
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
>>>>>>> 13fca83d (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 7d58507 (Add login registration pages)
>>>>>>> 29e1af94 (Add login registration pages)
          
    485. 
>>>>>>> 6066f925 (Add login registration pages)
            1
=======
          
    486. 
            
<<<<<<< HEAD
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 1214e1f (Add login registration pages)
=======
          
    487. 
            
>>>>>>> 730a8ca (Add login registration pages)
=======
          
    488. 
            
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 7d58507 (Add login registration pages)
=======
          
    489. 
            1
>>>>>>> 49e8a6c (Rebased)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.sign_out_via = :delete
=======
              # Devise will use the `secret_key_base` as its `secret_key`
>>>>>>> df37394 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
              config.sign_out_via = :delete
=======
              # Devise will use the `secret_key_base` as its `secret_key`
>>>>>>> 1214e1f (Add login registration pages)
=======
              # Devise will use the `secret_key_base` as its `secret_key`
>>>>>>> 730a8ca (Add login registration pages)
=======
              # Devise will use the `secret_key_base` as its `secret_key`
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 7d58507 (Add login registration pages)
=======
              config.sign_out_via = :delete
>>>>>>> 49e8a6c (Rebased)
          
      490. 
        
      
      
        
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
    490. 
            
=======
=======
>>>>>>> 8249ff3c (Add login registration pages)
=======
>>>>>>> e989024d (Add login registration pages)
<<<<<<< HEAD
=======
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
>>>>>>> 13fca83d (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 7d58507 (Add login registration pages)
>>>>>>> 29e1af94 (Add login registration pages)
          
    491. 
            1
=======
          
    492. 
            
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 6066f925 (Add login registration pages)
=======
=======
          
    493. 
            
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 8249ff3c (Add login registration pages)
=======
=======
          
    494. 
            
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> e989024d (Add login registration pages)
=======
          
    495. 
            1
>>>>>>> 75fa7e1b (Rebased)
=======
>>>>>>> df37394 (Featire specs)
>>>>>>> 4f4ea3f9 (Featire specs)
=======
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 1214e1f (Add login registration pages)
=======
          
    496. 
            
>>>>>>> 730a8ca (Add login registration pages)
=======
          
    497. 
            
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 7d58507 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 29e1af94 (Add login registration pages)
=======
=======
          
    498. 
            1
>>>>>>> 49e8a6c (Rebased)
>>>>>>> 13fca83d (Rebased)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
            
=======
=======
>>>>>>> 8249ff3c (Add login registration pages)
=======
>>>>>>> e989024d (Add login registration pages)
<<<<<<< HEAD
              config.omniauth :facebook,
=======
              # by default. You can change it below and use your own secret key.
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 6066f925 (Add login registration pages)
=======
=======
              # by default. You can change it below and use your own secret key.
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 8249ff3c (Add login registration pages)
=======
=======
              # by default. You can change it below and use your own secret key.
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> e989024d (Add login registration pages)
=======
              config.omniauth :facebook,
>>>>>>> 75fa7e1b (Rebased)
=======
=======
>>>>>>> 29e1af94 (Add login registration pages)
=======
>>>>>>> 13fca83d (Rebased)
              config.omniauth :facebook,
=======
              # by default. You can change it below and use your own secret key.
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
              config.omniauth :facebook,
=======
              # by default. You can change it below and use your own secret key.
>>>>>>> 1214e1f (Add login registration pages)
=======
              # by default. You can change it below and use your own secret key.
>>>>>>> 730a8ca (Add login registration pages)
=======
              # by default. You can change it below and use your own secret key.
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 7d58507 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 29e1af94 (Add login registration pages)
=======
=======
              config.omniauth :facebook,
>>>>>>> 49e8a6c (Rebased)
>>>>>>> 13fca83d (Rebased)
          
      499. 
        
      
      
        
      
          
    499. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              # ==> OmniAuth
=======
=======
>>>>>>> 8249ff3c (Add login registration pages)
=======
>>>>>>> e989024d (Add login registration pages)
<<<<<<< HEAD
                              Rails.application.credentials.dig(:facebook, :FACEBOOK_ID),
=======
              # config.secret_key = 'b0412bb2e70b23477c2527471c87d55e4ca905e45d6533ac6a021ef302571810a86cd1b0c244fc8e83ef34f986e1b646bcd9cb7867b14799f6042ffc17267c24'
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 6066f925 (Add login registration pages)
=======
=======
              # config.secret_key = 'b0412bb2e70b23477c2527471c87d55e4ca905e45d6533ac6a021ef302571810a86cd1b0c244fc8e83ef34f986e1b646bcd9cb7867b14799f6042ffc17267c24'
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 8249ff3c (Add login registration pages)
=======
=======
              # config.secret_key = 'b0412bb2e70b23477c2527471c87d55e4ca905e45d6533ac6a021ef302571810a86cd1b0c244fc8e83ef34f986e1b646bcd9cb7867b14799f6042ffc17267c24'
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> e989024d (Add login registration pages)
=======
                              Rails.application.credentials.dig(:facebook, :FACEBOOK_ID),
>>>>>>> 75fa7e1b (Rebased)
=======
=======
>>>>>>> 29e1af94 (Add login registration pages)
=======
>>>>>>> 13fca83d (Rebased)
                              Rails.application.credentials.dig(:facebook, :FACEBOOK_ID),
=======
              # config.secret_key = 'b0412bb2e70b23477c2527471c87d55e4ca905e45d6533ac6a021ef302571810a86cd1b0c244fc8e83ef34f986e1b646bcd9cb7867b14799f6042ffc17267c24'
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
                              Rails.application.credentials.dig(:facebook, :FACEBOOK_ID),
=======
              # config.secret_key = 'b0412bb2e70b23477c2527471c87d55e4ca905e45d6533ac6a021ef302571810a86cd1b0c244fc8e83ef34f986e1b646bcd9cb7867b14799f6042ffc17267c24'
>>>>>>> 1214e1f (Add login registration pages)
=======
              # config.secret_key = 'b0412bb2e70b23477c2527471c87d55e4ca905e45d6533ac6a021ef302571810a86cd1b0c244fc8e83ef34f986e1b646bcd9cb7867b14799f6042ffc17267c24'
>>>>>>> 730a8ca (Add login registration pages)
=======
              # config.secret_key = 'b0412bb2e70b23477c2527471c87d55e4ca905e45d6533ac6a021ef302571810a86cd1b0c244fc8e83ef34f986e1b646bcd9cb7867b14799f6042ffc17267c24'
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 7d58507 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 29e1af94 (Add login registration pages)
=======
=======
                              Rails.application.credentials.dig(:facebook, :FACEBOOK_ID),
>>>>>>> 49e8a6c (Rebased)
>>>>>>> 13fca83d (Rebased)
          
      500. 
        
      
      
        
      
          
    500. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              # Add a new OmniAuth provider. Check the wiki for more information on setting
=======
=======
>>>>>>> 8249ff3c (Add login registration pages)
=======
>>>>>>> e989024d (Add login registration pages)
<<<<<<< HEAD
                              Rails.application.credentials.dig(:facebook, :FACEBOOK_SECRET),
=======
            
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 6066f925 (Add login registration pages)
=======
=======
            
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 8249ff3c (Add login registration pages)
=======
=======
            
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> e989024d (Add login registration pages)
=======
                              Rails.application.credentials.dig(:facebook, :FACEBOOK_SECRET),
>>>>>>> 75fa7e1b (Rebased)
=======
=======
>>>>>>> 29e1af94 (Add login registration pages)
=======
>>>>>>> 13fca83d (Rebased)
                              Rails.application.credentials.dig(:facebook, :FACEBOOK_SECRET),
=======
            
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
                              Rails.application.credentials.dig(:facebook, :FACEBOOK_SECRET),
=======
            
>>>>>>> 1214e1f (Add login registration pages)
=======
            
>>>>>>> 730a8ca (Add login registration pages)
=======
            
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 7d58507 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 29e1af94 (Add login registration pages)
=======
=======
                              Rails.application.credentials.dig(:facebook, :FACEBOOK_SECRET),
>>>>>>> 49e8a6c (Rebased)
>>>>>>> 13fca83d (Rebased)
          
      501. 
        
      
      
        
      
          
    501. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              # up on your models and hooks.
=======
=======
>>>>>>> 8249ff3c (Add login registration pages)
=======
>>>>>>> e989024d (Add login registration pages)
<<<<<<< HEAD
                              scope: 'email', info_fields: 'email,name'
=======
              # ==> Controller configuration
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 6066f925 (Add login registration pages)
=======
=======
              # ==> Controller configuration
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 8249ff3c (Add login registration pages)
=======
=======
              # ==> Controller configuration
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> e989024d (Add login registration pages)
=======
                              scope: 'email', info_fields: 'email,name'
>>>>>>> 75fa7e1b (Rebased)
=======
=======
>>>>>>> 29e1af94 (Add login registration pages)
=======
>>>>>>> 13fca83d (Rebased)
                              scope: 'email', info_fields: 'email,name'
=======
              # ==> Controller configuration
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
                              scope: 'email', info_fields: 'email,name'
=======
              # ==> Controller configuration
>>>>>>> 1214e1f (Add login registration pages)
=======
              # ==> Controller configuration
>>>>>>> 730a8ca (Add login registration pages)
=======
              # ==> Controller configuration
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 7d58507 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 29e1af94 (Add login registration pages)
=======
=======
                              scope: 'email', info_fields: 'email,name'
>>>>>>> 49e8a6c (Rebased)
>>>>>>> 13fca83d (Rebased)
          
      502. 
        
      
      
        
      
          
    502. 
            
            

            

              # config.omniauth :github, 'APP_ID', 'APP_SECRET', scope: 'user,public_repo'
          
      503. 
        
      
      
        
      
          
    503. 
            
            

            

            
          
      504. 
        
      
      
        
      
          
    504. 
            
            

            

              # ==> Warden configuration
          
      505. 
        
      
      
        
      
          
    505. 
            
            

            

              # If you want to use other strategies, that are not supported by Devise, or
          
      506. 
        
      
      
        
      
          
    506. 
            
            

            

              # change the failure app, you can configure them inside the config.warden block.
          
      507. 
        
      
      
        
      
          
    507. 
            
            

            

              #
          
      508. 
        
      
      
        
      
          
    508. 
            
            

            

              # config.warden do |manager|
          
      509. 
        
      
      
        
      
          
    509. 
            
            

            

              #   manager.intercept_401 = false
          
      510. 
        
      
      
        
      
          
    510. 
            
            

            

              #   manager.default_strategies(scope: :user).unshift :some_external_strategy
          
      511. 
        
      
      
        
      
          
    511. 
            
            

            

              # end
          
      512. 
        
      
      
        
      
          
    512. 
            
            

            

            
          
      513. 
        
      
      
        
      
          
    513. 
            
            

            

              # ==> Mountable engine configurations
          
      514. 
        
      
      
        
      
          
    514. 
            
            

            

              # When using Devise inside an engine, let's call it `MyEngine`, and this engine
          
      515. 
        
      
      
        
      
          
    515. 
            
            

            

              # is mountable, there are some extra configurations to be taken into account.
          
      516. 
        
      
      
        
      
          
    516. 
            
            

            

              # The following options are available, assuming the engine is mounted as:
          
      517. 
        
      
      
        
      
          
    517. 
            
            

            

              #
          
      518. 
        
      
      
        
      
          
    518. 
            
            

            

              #     mount MyEngine, at: '/my_engine'
          
      519. 
        
      
      
        
      
          
    519. 
            
            

            

              #
          
      520. 
        
      
      
        
      
          
    520. 
            
            

            

              # The router that invoked `devise_for`, in the example above, would be:
          
      521. 
        
      
      
        
      
          
    521. 
            
            

            

              # config.router_name = :my_engine
          
      522. 
        
      
      
        
      
          
    522. 
            
            

            

              #
          
      523. 
        
      
      
        
      
          
    523. 
            
            

            

              # When using OmniAuth, Devise cannot automatically set OmniAuth path,
          
      524. 
        
      
      
        
      
          
    524. 
            
            

            

              # so you need to do it manually. For the users scope, it would be:
          
      525. 
        
      
      
        
      
          
    525. 
            
            

            

              # config.omniauth_path_prefix = '/my_engine/users/auth'
          
      526. 
        
      
      
        
      
          
    526. 
            
            

            

            
          
      527. 
        
      
      
        
      
          
    527. 
            
            

            

              # ==> Turbolinks configuration
          
      528. 
        
      
      
        
      
          
    528. 
            
            

            

              # If your app is using Turbolinks, Turbolinks::Controller needs to be included to make redirection work correctly:
          
      529. 
        
      
      
        
      
          
    529. 
            
            

            

              #
          
      530. 
        
      
      
        
      
          
    530. 
            
            

            

              # ActiveSupport.on_load(:devise_failure_app) do
          
      531. 
        
      
      
        
      
          
    531. 
            
            

            

              #   include Turbolinks::Controller
          
      532. 
        
      
      
        
      
          
    532. 
            
            

            

              # end
          
      533. 
        
      
      
        
      
          
    533. 
            
            

            

            
          
      534. 
        
      
      
        
      
          
    534. 
            
            

            

              # ==> Configuration for :registerable
          
      535. 
        
      
      
        
      
          
    535. 
            
            

            

            
          
      536. 
        
      
      
        
      
          
    536. 
            
            

            

              # When set to false, does not sign a user in automatically after their password is
          
      537. 
        
      
      
        
      
          
    537. 
            
            

            

              # changed. Defaults to true, so a user is signed in automatically after changing a password.
          
      538. 
        
      
      
        
      
          
    538. 
            
            

            

              # config.sign_in_after_change_password = true
          
      539. 
        
      
      
        
      
          
    539. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9bfbd88 (Featire specs)
=======
=======
>>>>>>> 793a6ed (Add login registration pages)
=======
>>>>>>> c5efe8e (Add login registration pages)
=======
=======
>>>>>>> 311e9fa (Rebased)
=======
=======
<<<<<<< HEAD
>>>>>>> 31507b8 (Add login registration pages)
<<<<<<< HEAD
=======
=======
>>>>>>> 730a8ca (Add login registration pages)
=======
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
=======
=======
>>>>>>> c51bf93 (Featire specs)
=======
>>>>>>> 7d58507 (Add login registration pages)
>>>>>>> 31507b8 (Add login registration pages)
              # Configure the parent class to the devise controllers.
          
      540. 
        
      
      
        
      
          
    540. 
            
            

            

              # config.parent_controller = 'DeviseController'
          
      541. 
        
      
      
        
      
          
    541. 
            
            

            

            
          
      542. 
        
      
      
        
      
          
    542. 
            
            

            

              # ==> Mailer Configuration
          
      543. 
        
      
      
        
      
          
    543. 
            
            

            

              # Configure the e-mail address which will be shown in Devise::Mailer,
          
      544. 
        
      
      
        
      
          
    544. 
            
            

            

              # note that it will be overwritten if you use your own mailer class
          
      545. 
        
      
      
        
      
          
    545. 
            
            

            

              # with default "from" parameter.
          
      546. 
        
      
      
        
      
          
    546. 
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> ebcdce06 (Featire specs)
          
    547. 
>>>>>>> c7a726c5 (Rebased)
            1
=======
          
    548. 
            
<<<<<<< HEAD
>>>>>>> 9bfbd88 (Featire specs)
=======
>>>>>>> 1214e1f (Add login registration pages)
=======
          
    549. 
            
>>>>>>> 730a8ca (Add login registration pages)
=======
          
    550. 
            
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 56fd9d41 (Add login registration pages)
=======
=======
>>>>>>> aa3618b (Rebased)
<<<<<<< HEAD
>>>>>>> 11792758 (Rebased)
=======
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
=======
          
    551. 
            
<<<<<<< HEAD
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
=======
=======
>>>>>>> 1214e1f (Add login registration pages)
=======
          
    552. 
            
>>>>>>> 730a8ca (Add login registration pages)
=======
          
    553. 
            
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 7d58507 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 31507b8 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> a8b17c32 (Add login registration pages)
=======
=======
=======
          
    554. 
            1
>>>>>>> 49e8a6c (Rebased)
>>>>>>> 311e9fa (Rebased)
>>>>>>> bc6bc8d2 (Rebased)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.mailer_sender = 'please-change-me-at-config-initializers-devise@example.com'
=======
            # is set to its default value. Note that some are commented out while others
>>>>>>> 9bfbd88 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
              config.mailer_sender = 'please-change-me-at-config-initializers-devise@example.com'
=======
            # is set to its default value. Note that some are commented out while others
>>>>>>> 1214e1f (Add login registration pages)
=======
            # is set to its default value. Note that some are commented out while others
>>>>>>> 730a8ca (Add login registration pages)
=======
            # is set to its default value. Note that some are commented out while others
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 56fd9d41 (Add login registration pages)
=======
              config.mailer_sender = 'please-change-me-at-config-initializers-devise@example.com'
>>>>>>> 11792758 (Rebased)
=======
=======
>>>>>>> a8b17c32 (Add login registration pages)
=======
>>>>>>> bc6bc8d2 (Rebased)
              config.mailer_sender = 'please-change-me-at-config-initializers-devise@example.com'
=======
            # is set to its default value. Note that some are commented out while others
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
              config.mailer_sender = 'please-change-me-at-config-initializers-devise@example.com'
=======
            # is set to its default value. Note that some are commented out while others
>>>>>>> 1214e1f (Add login registration pages)
=======
            # is set to its default value. Note that some are commented out while others
>>>>>>> 730a8ca (Add login registration pages)
=======
            # is set to its default value. Note that some are commented out while others
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 7d58507 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> a8b17c32 (Add login registration pages)
=======
=======
              config.mailer_sender = 'please-change-me-at-config-initializers-devise@example.com'
>>>>>>> 49e8a6c (Rebased)
>>>>>>> bc6bc8d2 (Rebased)
          
      555. 
        
      
      
        
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 56fd9d41 (Add login registration pages)
=======
>>>>>>> 7a08014b (Featire specs)
=======
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 7d58507 (Add login registration pages)
>>>>>>> a8b17c32 (Add login registration pages)
          
    555. 
            1
=======
          
    556. 
            
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9bfbd88 (Featire specs)
=======
>>>>>>> 1214e1f (Add login registration pages)
=======
          
    557. 
            
>>>>>>> 730a8ca (Add login registration pages)
=======
          
    558. 
            
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 56fd9d41 (Add login registration pages)
=======
          
    559. 
            1
>>>>>>> 11792758 (Rebased)
=======
>>>>>>> df37394 (Featire specs)
>>>>>>> 7a08014b (Featire specs)
=======
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 1214e1f (Add login registration pages)
=======
          
    560. 
            
>>>>>>> 730a8ca (Add login registration pages)
=======
          
    561. 
            
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 7d58507 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> a8b17c32 (Add login registration pages)
=======
=======
          
    562. 
            1
>>>>>>> 49e8a6c (Rebased)
>>>>>>> bc6bc8d2 (Rebased)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              require 'devise/orm/active_record'
=======
            # are not: uncommented lines are intended to protect your configuration from
>>>>>>> 9bfbd88 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
              require 'devise/orm/active_record'
=======
            # are not: uncommented lines are intended to protect your configuration from
>>>>>>> 1214e1f (Add login registration pages)
=======
            # are not: uncommented lines are intended to protect your configuration from
>>>>>>> 730a8ca (Add login registration pages)
=======
            # are not: uncommented lines are intended to protect your configuration from
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 56fd9d41 (Add login registration pages)
=======
              require 'devise/orm/active_record'
>>>>>>> 11792758 (Rebased)
=======
=======
>>>>>>> a8b17c32 (Add login registration pages)
=======
>>>>>>> bc6bc8d2 (Rebased)
              require 'devise/orm/active_record'
=======
            # are not: uncommented lines are intended to protect your configuration from
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
              require 'devise/orm/active_record'
=======
            # are not: uncommented lines are intended to protect your configuration from
>>>>>>> 1214e1f (Add login registration pages)
=======
            # are not: uncommented lines are intended to protect your configuration from
>>>>>>> 730a8ca (Add login registration pages)
=======
            # are not: uncommented lines are intended to protect your configuration from
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 7d58507 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> a8b17c32 (Add login registration pages)
=======
=======
              require 'devise/orm/active_record'
>>>>>>> 49e8a6c (Rebased)
>>>>>>> bc6bc8d2 (Rebased)
          
      563. 
        
      
      
        
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 56fd9d41 (Add login registration pages)
=======
>>>>>>> 7a08014b (Featire specs)
=======
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 7d58507 (Add login registration pages)
>>>>>>> a8b17c32 (Add login registration pages)
          
    563. 
            1
=======
          
    564. 
            
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9bfbd88 (Featire specs)
=======
>>>>>>> 1214e1f (Add login registration pages)
=======
          
    565. 
            
>>>>>>> 730a8ca (Add login registration pages)
=======
          
    566. 
            
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 56fd9d41 (Add login registration pages)
=======
          
    567. 
            1
>>>>>>> 11792758 (Rebased)
=======
>>>>>>> df37394 (Featire specs)
>>>>>>> 7a08014b (Featire specs)
=======
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 1214e1f (Add login registration pages)
=======
          
    568. 
            
>>>>>>> 730a8ca (Add login registration pages)
=======
          
    569. 
            
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 7d58507 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> a8b17c32 (Add login registration pages)
=======
=======
          
    570. 
            1
>>>>>>> 49e8a6c (Rebased)
>>>>>>> bc6bc8d2 (Rebased)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.case_insensitive_keys = [:email]
=======
            # breaking changes in upgrades (i.e., in the event that future versions of
>>>>>>> 9bfbd88 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
              config.case_insensitive_keys = [:email]
=======
            # breaking changes in upgrades (i.e., in the event that future versions of
>>>>>>> 1214e1f (Add login registration pages)
=======
            # breaking changes in upgrades (i.e., in the event that future versions of
>>>>>>> 730a8ca (Add login registration pages)
=======
            # breaking changes in upgrades (i.e., in the event that future versions of
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 56fd9d41 (Add login registration pages)
=======
              config.case_insensitive_keys = [:email]
>>>>>>> 11792758 (Rebased)
=======
=======
>>>>>>> a8b17c32 (Add login registration pages)
=======
>>>>>>> bc6bc8d2 (Rebased)
              config.case_insensitive_keys = [:email]
=======
            # breaking changes in upgrades (i.e., in the event that future versions of
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
              config.case_insensitive_keys = [:email]
=======
            # breaking changes in upgrades (i.e., in the event that future versions of
>>>>>>> 1214e1f (Add login registration pages)
=======
            # breaking changes in upgrades (i.e., in the event that future versions of
>>>>>>> 730a8ca (Add login registration pages)
=======
            # breaking changes in upgrades (i.e., in the event that future versions of
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 7d58507 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> a8b17c32 (Add login registration pages)
=======
=======
              config.case_insensitive_keys = [:email]
>>>>>>> 49e8a6c (Rebased)
>>>>>>> bc6bc8d2 (Rebased)
          
      571. 
        
      
      
        
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 56fd9d41 (Add login registration pages)
=======
>>>>>>> 7a08014b (Featire specs)
=======
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 7d58507 (Add login registration pages)
>>>>>>> a8b17c32 (Add login registration pages)
          
    571. 
            1
=======
          
    572. 
            
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9bfbd88 (Featire specs)
=======
>>>>>>> 1214e1f (Add login registration pages)
=======
          
    573. 
            
>>>>>>> 730a8ca (Add login registration pages)
=======
          
    574. 
            
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 56fd9d41 (Add login registration pages)
=======
          
    575. 
            1
>>>>>>> 11792758 (Rebased)
=======
>>>>>>> df37394 (Featire specs)
>>>>>>> 7a08014b (Featire specs)
=======
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 1214e1f (Add login registration pages)
=======
          
    576. 
            
>>>>>>> 730a8ca (Add login registration pages)
=======
          
    577. 
            
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 7d58507 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> a8b17c32 (Add login registration pages)
=======
=======
          
    578. 
            1
>>>>>>> 49e8a6c (Rebased)
>>>>>>> bc6bc8d2 (Rebased)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.strip_whitespace_keys = [:email]
=======
            # Devise change the default values for those options).
>>>>>>> 9bfbd88 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
              config.strip_whitespace_keys = [:email]
=======
            # Devise change the default values for those options).
>>>>>>> 1214e1f (Add login registration pages)
=======
            # Devise change the default values for those options).
>>>>>>> 730a8ca (Add login registration pages)
=======
            # Devise change the default values for those options).
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 56fd9d41 (Add login registration pages)
=======
              config.strip_whitespace_keys = [:email]
>>>>>>> 11792758 (Rebased)
=======
=======
>>>>>>> a8b17c32 (Add login registration pages)
=======
>>>>>>> bc6bc8d2 (Rebased)
              config.strip_whitespace_keys = [:email]
=======
            # Devise change the default values for those options).
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
              config.strip_whitespace_keys = [:email]
=======
            # Devise change the default values for those options).
>>>>>>> 1214e1f (Add login registration pages)
=======
            # Devise change the default values for those options).
>>>>>>> 730a8ca (Add login registration pages)
=======
            # Devise change the default values for those options).
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 7d58507 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> a8b17c32 (Add login registration pages)
=======
=======
              config.strip_whitespace_keys = [:email]
>>>>>>> 49e8a6c (Rebased)
>>>>>>> bc6bc8d2 (Rebased)
          
      579. 
        
      
      
        
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 56fd9d41 (Add login registration pages)
=======
>>>>>>> 7a08014b (Featire specs)
=======
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 7d58507 (Add login registration pages)
>>>>>>> a8b17c32 (Add login registration pages)
          
    579. 
            1
=======
          
    580. 
            
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9bfbd88 (Featire specs)
=======
>>>>>>> 1214e1f (Add login registration pages)
=======
          
    581. 
            
>>>>>>> 730a8ca (Add login registration pages)
=======
          
    582. 
            
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 56fd9d41 (Add login registration pages)
=======
          
    583. 
            1
>>>>>>> 11792758 (Rebased)
=======
>>>>>>> df37394 (Featire specs)
>>>>>>> 7a08014b (Featire specs)
=======
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 1214e1f (Add login registration pages)
=======
          
    584. 
            
>>>>>>> 730a8ca (Add login registration pages)
=======
          
    585. 
            
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 7d58507 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> a8b17c32 (Add login registration pages)
=======
=======
          
    586. 
            1
>>>>>>> 49e8a6c (Rebased)
>>>>>>> bc6bc8d2 (Rebased)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.skip_session_storage = [:http_auth]
=======
            #
>>>>>>> 9bfbd88 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
              config.skip_session_storage = [:http_auth]
=======
            #
>>>>>>> 1214e1f (Add login registration pages)
=======
            #
>>>>>>> 730a8ca (Add login registration pages)
=======
            #
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 56fd9d41 (Add login registration pages)
=======
              config.skip_session_storage = [:http_auth]
>>>>>>> 11792758 (Rebased)
=======
=======
>>>>>>> a8b17c32 (Add login registration pages)
=======
>>>>>>> bc6bc8d2 (Rebased)
              config.skip_session_storage = [:http_auth]
=======
            #
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
              config.skip_session_storage = [:http_auth]
=======
            #
>>>>>>> 1214e1f (Add login registration pages)
=======
            #
>>>>>>> 730a8ca (Add login registration pages)
=======
            #
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 7d58507 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> a8b17c32 (Add login registration pages)
=======
=======
              config.skip_session_storage = [:http_auth]
>>>>>>> 49e8a6c (Rebased)
>>>>>>> bc6bc8d2 (Rebased)
          
      587. 
        
      
      
        
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 56fd9d41 (Add login registration pages)
=======
>>>>>>> 7a08014b (Featire specs)
=======
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 7d58507 (Add login registration pages)
>>>>>>> a8b17c32 (Add login registration pages)
          
    587. 
            1
=======
          
    588. 
            
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9bfbd88 (Featire specs)
=======
>>>>>>> 1214e1f (Add login registration pages)
=======
          
    589. 
            
>>>>>>> 730a8ca (Add login registration pages)
=======
          
    590. 
            
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 56fd9d41 (Add login registration pages)
=======
          
    591. 
            1
>>>>>>> 11792758 (Rebased)
=======
>>>>>>> df37394 (Featire specs)
>>>>>>> 7a08014b (Featire specs)
=======
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 1214e1f (Add login registration pages)
=======
          
    592. 
            
>>>>>>> 730a8ca (Add login registration pages)
=======
          
    593. 
            
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 7d58507 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> a8b17c32 (Add login registration pages)
=======
=======
          
    594. 
            1
>>>>>>> 49e8a6c (Rebased)
>>>>>>> bc6bc8d2 (Rebased)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.stretches = Rails.env.test? ? 1 : 12
=======
            # Use this hook to configure devise mailer, warden hooks and so forth.
>>>>>>> 9bfbd88 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
              config.stretches = Rails.env.test? ? 1 : 12
=======
            # Use this hook to configure devise mailer, warden hooks and so forth.
>>>>>>> 1214e1f (Add login registration pages)
=======
            # Use this hook to configure devise mailer, warden hooks and so forth.
>>>>>>> 730a8ca (Add login registration pages)
=======
            # Use this hook to configure devise mailer, warden hooks and so forth.
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 56fd9d41 (Add login registration pages)
=======
              config.stretches = Rails.env.test? ? 1 : 12
>>>>>>> 11792758 (Rebased)
=======
=======
>>>>>>> a8b17c32 (Add login registration pages)
=======
>>>>>>> bc6bc8d2 (Rebased)
              config.stretches = Rails.env.test? ? 1 : 12
=======
            # Use this hook to configure devise mailer, warden hooks and so forth.
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
              config.stretches = Rails.env.test? ? 1 : 12
=======
            # Use this hook to configure devise mailer, warden hooks and so forth.
>>>>>>> 1214e1f (Add login registration pages)
=======
            # Use this hook to configure devise mailer, warden hooks and so forth.
>>>>>>> 730a8ca (Add login registration pages)
=======
            # Use this hook to configure devise mailer, warden hooks and so forth.
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 7d58507 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> a8b17c32 (Add login registration pages)
=======
=======
              config.stretches = Rails.env.test? ? 1 : 12
>>>>>>> 49e8a6c (Rebased)
>>>>>>> bc6bc8d2 (Rebased)
          
      595. 
        
      
      
        
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 56fd9d41 (Add login registration pages)
=======
>>>>>>> 7a08014b (Featire specs)
=======
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 7d58507 (Add login registration pages)
>>>>>>> a8b17c32 (Add login registration pages)
          
    595. 
            1
=======
          
    596. 
            
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9bfbd88 (Featire specs)
=======
>>>>>>> 1214e1f (Add login registration pages)
=======
          
    597. 
            
>>>>>>> 730a8ca (Add login registration pages)
=======
          
    598. 
            
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 56fd9d41 (Add login registration pages)
=======
          
    599. 
            1
>>>>>>> 11792758 (Rebased)
=======
>>>>>>> df37394 (Featire specs)
>>>>>>> 7a08014b (Featire specs)
=======
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 1214e1f (Add login registration pages)
=======
          
    600. 
            
>>>>>>> 730a8ca (Add login registration pages)
=======
          
    601. 
            
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 7d58507 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> a8b17c32 (Add login registration pages)
=======
=======
          
    602. 
            1
>>>>>>> 49e8a6c (Rebased)
>>>>>>> bc6bc8d2 (Rebased)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.reconfirmable = true
=======
            # Many of these configuration options can be set straight in your model.
>>>>>>> 9bfbd88 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
              config.reconfirmable = true
=======
            # Many of these configuration options can be set straight in your model.
>>>>>>> 1214e1f (Add login registration pages)
=======
            # Many of these configuration options can be set straight in your model.
>>>>>>> 730a8ca (Add login registration pages)
=======
            # Many of these configuration options can be set straight in your model.
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 56fd9d41 (Add login registration pages)
=======
              config.reconfirmable = true
>>>>>>> 11792758 (Rebased)
=======
=======
>>>>>>> a8b17c32 (Add login registration pages)
=======
>>>>>>> bc6bc8d2 (Rebased)
              config.reconfirmable = true
=======
            # Many of these configuration options can be set straight in your model.
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
              config.reconfirmable = true
=======
            # Many of these configuration options can be set straight in your model.
>>>>>>> 1214e1f (Add login registration pages)
=======
            # Many of these configuration options can be set straight in your model.
>>>>>>> 730a8ca (Add login registration pages)
=======
            # Many of these configuration options can be set straight in your model.
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 7d58507 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> a8b17c32 (Add login registration pages)
=======
=======
              config.reconfirmable = true
>>>>>>> 49e8a6c (Rebased)
>>>>>>> bc6bc8d2 (Rebased)
          
      603. 
        
      
      
        
      
          
    603. 
            1
=======
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> 156ffe6 (Add login registration pages)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.expire_all_remember_me_on_sign_out = true
<<<<<<< HEAD
<<<<<<< HEAD
=======
            Devise.setup do |config|
>>>>>>> 9bfbd88 (Featire specs)
=======
            Devise.setup do |config|
<<<<<<< HEAD
=======
            # Assuming you have not yet modified this file, each configuration option below
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> 156ffe6 (Add login registration pages)
=======
>>>>>>> 730a8ca (Add login registration pages)
=======
            Devise.setup do |config|
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 56fd9d41 (Add login registration pages)
=======
>>>>>>> 11792758 (Rebased)
=======
=======
            Devise.setup do |config|
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
              config.expire_all_remember_me_on_sign_out = true
=======
            Devise.setup do |config|
>>>>>>> 1214e1f (Add login registration pages)
=======
            Devise.setup do |config|
>>>>>>> 730a8ca (Add login registration pages)
=======
            Devise.setup do |config|
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 7d58507 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> a8b17c32 (Add login registration pages)
=======
=======
              config.expire_all_remember_me_on_sign_out = true
>>>>>>> 49e8a6c (Rebased)
>>>>>>> bc6bc8d2 (Rebased)
          
      604. 
        
      
      
        
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bae2b7de (Add login registration pages)
=======
<<<<<<< HEAD
>>>>>>> 56fd9d41 (Add login registration pages)
=======
>>>>>>> 7a08014b (Featire specs)
=======
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 7d58507 (Add login registration pages)
>>>>>>> a8b17c32 (Add login registration pages)
          
    604. 
            1
=======
          
    605. 
            
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9bfbd88 (Featire specs)
=======
>>>>>>> 1214e1f (Add login registration pages)
=======
          
    606. 
            
>>>>>>> 730a8ca (Add login registration pages)
=======
          
    607. 
            
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 56fd9d41 (Add login registration pages)
=======
          
    608. 
            1
>>>>>>> 11792758 (Rebased)
=======
>>>>>>> df37394 (Featire specs)
>>>>>>> 7a08014b (Featire specs)
=======
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 1214e1f (Add login registration pages)
=======
          
    609. 
            
>>>>>>> 730a8ca (Add login registration pages)
=======
          
    610. 
            
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 7d58507 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> a8b17c32 (Add login registration pages)
=======
=======
          
    611. 
            1
>>>>>>> 49e8a6c (Rebased)
>>>>>>> bc6bc8d2 (Rebased)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.password_length = 6..128
=======
              # The secret key used by Devise. Devise uses this key to generate
>>>>>>> 9bfbd88 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
              config.password_length = 6..128
=======
              # The secret key used by Devise. Devise uses this key to generate
>>>>>>> 1214e1f (Add login registration pages)
=======
              # The secret key used by Devise. Devise uses this key to generate
>>>>>>> 730a8ca (Add login registration pages)
=======
              # The secret key used by Devise. Devise uses this key to generate
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 56fd9d41 (Add login registration pages)
=======
              config.password_length = 6..128
>>>>>>> 11792758 (Rebased)
=======
=======
>>>>>>> a8b17c32 (Add login registration pages)
=======
>>>>>>> bc6bc8d2 (Rebased)
              config.password_length = 6..128
=======
              # The secret key used by Devise. Devise uses this key to generate
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
              config.password_length = 6..128
=======
              # The secret key used by Devise. Devise uses this key to generate
>>>>>>> 1214e1f (Add login registration pages)
=======
              # The secret key used by Devise. Devise uses this key to generate
>>>>>>> 730a8ca (Add login registration pages)
=======
              # The secret key used by Devise. Devise uses this key to generate
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 7d58507 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> a8b17c32 (Add login registration pages)
=======
=======
              config.password_length = 6..128
>>>>>>> 49e8a6c (Rebased)
>>>>>>> bc6bc8d2 (Rebased)
          
      612. 
        
      
      
        
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 56fd9d41 (Add login registration pages)
=======
>>>>>>> 7a08014b (Featire specs)
=======
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 7d58507 (Add login registration pages)
>>>>>>> a8b17c32 (Add login registration pages)
          
    612. 
            1
=======
          
    613. 
            
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9bfbd88 (Featire specs)
=======
>>>>>>> 1214e1f (Add login registration pages)
=======
          
    614. 
            
>>>>>>> 730a8ca (Add login registration pages)
=======
          
    615. 
            
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 56fd9d41 (Add login registration pages)
=======
          
    616. 
            1
>>>>>>> 11792758 (Rebased)
=======
>>>>>>> df37394 (Featire specs)
>>>>>>> 7a08014b (Featire specs)
=======
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 1214e1f (Add login registration pages)
=======
          
    617. 
            
>>>>>>> 730a8ca (Add login registration pages)
=======
          
    618. 
            
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 7d58507 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> a8b17c32 (Add login registration pages)
=======
=======
          
    619. 
            1
>>>>>>> 49e8a6c (Rebased)
>>>>>>> bc6bc8d2 (Rebased)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.email_regexp = /\A[^@\s]+@[^@\s]+\z/
=======
              # random tokens. Changing this key will render invalid all existing
>>>>>>> 9bfbd88 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
              config.email_regexp = /\A[^@\s]+@[^@\s]+\z/
=======
              # random tokens. Changing this key will render invalid all existing
>>>>>>> 1214e1f (Add login registration pages)
=======
              # random tokens. Changing this key will render invalid all existing
>>>>>>> 730a8ca (Add login registration pages)
=======
              # random tokens. Changing this key will render invalid all existing
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 56fd9d41 (Add login registration pages)
=======
              config.email_regexp = /\A[^@\s]+@[^@\s]+\z/
>>>>>>> 11792758 (Rebased)
=======
=======
>>>>>>> a8b17c32 (Add login registration pages)
=======
>>>>>>> bc6bc8d2 (Rebased)
              config.email_regexp = /\A[^@\s]+@[^@\s]+\z/
=======
              # random tokens. Changing this key will render invalid all existing
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
              config.email_regexp = /\A[^@\s]+@[^@\s]+\z/
=======
              # random tokens. Changing this key will render invalid all existing
>>>>>>> 1214e1f (Add login registration pages)
=======
              # random tokens. Changing this key will render invalid all existing
>>>>>>> 730a8ca (Add login registration pages)
=======
              # random tokens. Changing this key will render invalid all existing
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 7d58507 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> a8b17c32 (Add login registration pages)
=======
=======
              config.email_regexp = /\A[^@\s]+@[^@\s]+\z/
>>>>>>> 49e8a6c (Rebased)
>>>>>>> bc6bc8d2 (Rebased)
          
      620. 
        
      
      
        
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 56fd9d41 (Add login registration pages)
=======
>>>>>>> 7a08014b (Featire specs)
=======
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 7d58507 (Add login registration pages)
>>>>>>> a8b17c32 (Add login registration pages)
          
    620. 
            1
=======
          
    621. 
            
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9bfbd88 (Featire specs)
=======
>>>>>>> 1214e1f (Add login registration pages)
=======
          
    622. 
            
>>>>>>> 730a8ca (Add login registration pages)
=======
          
    623. 
            
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 56fd9d41 (Add login registration pages)
=======
          
    624. 
            1
>>>>>>> 11792758 (Rebased)
=======
>>>>>>> df37394 (Featire specs)
>>>>>>> 7a08014b (Featire specs)
=======
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 1214e1f (Add login registration pages)
=======
          
    625. 
            
>>>>>>> 730a8ca (Add login registration pages)
=======
          
    626. 
            
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 7d58507 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> a8b17c32 (Add login registration pages)
=======
=======
          
    627. 
            1
>>>>>>> 49e8a6c (Rebased)
>>>>>>> bc6bc8d2 (Rebased)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.reset_password_within = 6.hours
=======
              # confirmation, reset password and unlock tokens in the database.
>>>>>>> 9bfbd88 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
              config.reset_password_within = 6.hours
=======
              # confirmation, reset password and unlock tokens in the database.
>>>>>>> 1214e1f (Add login registration pages)
=======
              # confirmation, reset password and unlock tokens in the database.
>>>>>>> 730a8ca (Add login registration pages)
=======
              # confirmation, reset password and unlock tokens in the database.
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 56fd9d41 (Add login registration pages)
=======
              config.reset_password_within = 6.hours
>>>>>>> 11792758 (Rebased)
=======
=======
>>>>>>> a8b17c32 (Add login registration pages)
=======
>>>>>>> bc6bc8d2 (Rebased)
              config.reset_password_within = 6.hours
=======
              # confirmation, reset password and unlock tokens in the database.
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
              config.reset_password_within = 6.hours
=======
              # confirmation, reset password and unlock tokens in the database.
>>>>>>> 1214e1f (Add login registration pages)
=======
              # confirmation, reset password and unlock tokens in the database.
>>>>>>> 730a8ca (Add login registration pages)
=======
              # confirmation, reset password and unlock tokens in the database.
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 7d58507 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> a8b17c32 (Add login registration pages)
=======
=======
              config.reset_password_within = 6.hours
>>>>>>> 49e8a6c (Rebased)
>>>>>>> bc6bc8d2 (Rebased)
          
      628. 
        
      
      
        
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 56fd9d41 (Add login registration pages)
=======
>>>>>>> 7a08014b (Featire specs)
=======
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 7d58507 (Add login registration pages)
>>>>>>> a8b17c32 (Add login registration pages)
          
    628. 
            1
=======
          
    629. 
            
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9bfbd88 (Featire specs)
=======
>>>>>>> 1214e1f (Add login registration pages)
=======
          
    630. 
            
>>>>>>> 730a8ca (Add login registration pages)
=======
          
    631. 
            
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 56fd9d41 (Add login registration pages)
=======
          
    632. 
            1
>>>>>>> 11792758 (Rebased)
=======
>>>>>>> df37394 (Featire specs)
>>>>>>> 7a08014b (Featire specs)
=======
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 1214e1f (Add login registration pages)
=======
          
    633. 
            
>>>>>>> 730a8ca (Add login registration pages)
=======
          
    634. 
            
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 7d58507 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> a8b17c32 (Add login registration pages)
=======
=======
          
    635. 
            1
>>>>>>> 49e8a6c (Rebased)
>>>>>>> bc6bc8d2 (Rebased)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.sign_out_via = :delete
=======
              # Devise will use the `secret_key_base` as its `secret_key`
>>>>>>> 9bfbd88 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
              config.sign_out_via = :delete
=======
              # Devise will use the `secret_key_base` as its `secret_key`
>>>>>>> 1214e1f (Add login registration pages)
=======
              # Devise will use the `secret_key_base` as its `secret_key`
>>>>>>> 730a8ca (Add login registration pages)
=======
              # Devise will use the `secret_key_base` as its `secret_key`
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 56fd9d41 (Add login registration pages)
=======
              config.sign_out_via = :delete
>>>>>>> 11792758 (Rebased)
=======
=======
>>>>>>> a8b17c32 (Add login registration pages)
=======
>>>>>>> bc6bc8d2 (Rebased)
              config.sign_out_via = :delete
=======
              # Devise will use the `secret_key_base` as its `secret_key`
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
              config.sign_out_via = :delete
=======
              # Devise will use the `secret_key_base` as its `secret_key`
>>>>>>> 1214e1f (Add login registration pages)
=======
              # Devise will use the `secret_key_base` as its `secret_key`
>>>>>>> 730a8ca (Add login registration pages)
=======
              # Devise will use the `secret_key_base` as its `secret_key`
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 7d58507 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> a8b17c32 (Add login registration pages)
=======
=======
              config.sign_out_via = :delete
>>>>>>> 49e8a6c (Rebased)
>>>>>>> bc6bc8d2 (Rebased)
          
      636. 
        
      
      
        
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 56fd9d41 (Add login registration pages)
=======
>>>>>>> 7a08014b (Featire specs)
=======
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 7d58507 (Add login registration pages)
>>>>>>> a8b17c32 (Add login registration pages)
          
    636. 
            1
=======
          
    637. 
            
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9bfbd88 (Featire specs)
=======
>>>>>>> 1214e1f (Add login registration pages)
=======
          
    638. 
            
>>>>>>> 730a8ca (Add login registration pages)
=======
          
    639. 
            
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 56fd9d41 (Add login registration pages)
=======
          
    640. 
            1
>>>>>>> 11792758 (Rebased)
=======
>>>>>>> df37394 (Featire specs)
>>>>>>> 7a08014b (Featire specs)
=======
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 1214e1f (Add login registration pages)
=======
          
    641. 
            
>>>>>>> 730a8ca (Add login registration pages)
=======
          
    642. 
            
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 7d58507 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> a8b17c32 (Add login registration pages)
=======
=======
          
    643. 
            1
>>>>>>> 49e8a6c (Rebased)
>>>>>>> bc6bc8d2 (Rebased)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.omniauth :facebook,
=======
              # by default. You can change it below and use your own secret key.
>>>>>>> 9bfbd88 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
              config.omniauth :facebook,
=======
              # by default. You can change it below and use your own secret key.
>>>>>>> 1214e1f (Add login registration pages)
=======
              # by default. You can change it below and use your own secret key.
>>>>>>> 730a8ca (Add login registration pages)
=======
              # by default. You can change it below and use your own secret key.
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 56fd9d41 (Add login registration pages)
=======
              config.omniauth :facebook,
>>>>>>> 11792758 (Rebased)
=======
=======
>>>>>>> a8b17c32 (Add login registration pages)
=======
>>>>>>> bc6bc8d2 (Rebased)
              config.omniauth :facebook,
=======
              # by default. You can change it below and use your own secret key.
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
              config.omniauth :facebook,
=======
              # by default. You can change it below and use your own secret key.
>>>>>>> 1214e1f (Add login registration pages)
=======
              # by default. You can change it below and use your own secret key.
>>>>>>> 730a8ca (Add login registration pages)
=======
              # by default. You can change it below and use your own secret key.
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 7d58507 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> a8b17c32 (Add login registration pages)
=======
=======
              config.omniauth :facebook,
>>>>>>> 49e8a6c (Rebased)
>>>>>>> bc6bc8d2 (Rebased)
          
      644. 
        
      
      
        
      
          
    644. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                              Rails.application.credentials.dig(:facebook, :FACEBOOK_ID),
=======
              # config.secret_key = 'b0412bb2e70b23477c2527471c87d55e4ca905e45d6533ac6a021ef302571810a86cd1b0c244fc8e83ef34f986e1b646bcd9cb7867b14799f6042ffc17267c24'
>>>>>>> 9bfbd88 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
                              Rails.application.credentials.dig(:facebook, :FACEBOOK_ID),
=======
              # config.secret_key = 'b0412bb2e70b23477c2527471c87d55e4ca905e45d6533ac6a021ef302571810a86cd1b0c244fc8e83ef34f986e1b646bcd9cb7867b14799f6042ffc17267c24'
>>>>>>> 1214e1f (Add login registration pages)
=======
              # config.secret_key = 'b0412bb2e70b23477c2527471c87d55e4ca905e45d6533ac6a021ef302571810a86cd1b0c244fc8e83ef34f986e1b646bcd9cb7867b14799f6042ffc17267c24'
>>>>>>> 730a8ca (Add login registration pages)
=======
              # config.secret_key = 'b0412bb2e70b23477c2527471c87d55e4ca905e45d6533ac6a021ef302571810a86cd1b0c244fc8e83ef34f986e1b646bcd9cb7867b14799f6042ffc17267c24'
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 56fd9d41 (Add login registration pages)
=======
                              Rails.application.credentials.dig(:facebook, :FACEBOOK_ID),
>>>>>>> 11792758 (Rebased)
=======
=======
>>>>>>> a8b17c32 (Add login registration pages)
=======
>>>>>>> bc6bc8d2 (Rebased)
                              Rails.application.credentials.dig(:facebook, :FACEBOOK_ID),
=======
              # config.secret_key = 'b0412bb2e70b23477c2527471c87d55e4ca905e45d6533ac6a021ef302571810a86cd1b0c244fc8e83ef34f986e1b646bcd9cb7867b14799f6042ffc17267c24'
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
                              Rails.application.credentials.dig(:facebook, :FACEBOOK_ID),
=======
              # config.secret_key = 'b0412bb2e70b23477c2527471c87d55e4ca905e45d6533ac6a021ef302571810a86cd1b0c244fc8e83ef34f986e1b646bcd9cb7867b14799f6042ffc17267c24'
>>>>>>> 1214e1f (Add login registration pages)
=======
              # config.secret_key = 'b0412bb2e70b23477c2527471c87d55e4ca905e45d6533ac6a021ef302571810a86cd1b0c244fc8e83ef34f986e1b646bcd9cb7867b14799f6042ffc17267c24'
>>>>>>> 730a8ca (Add login registration pages)
=======
              # config.secret_key = 'b0412bb2e70b23477c2527471c87d55e4ca905e45d6533ac6a021ef302571810a86cd1b0c244fc8e83ef34f986e1b646bcd9cb7867b14799f6042ffc17267c24'
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 7d58507 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> a8b17c32 (Add login registration pages)
=======
=======
                              Rails.application.credentials.dig(:facebook, :FACEBOOK_ID),
>>>>>>> 49e8a6c (Rebased)
>>>>>>> bc6bc8d2 (Rebased)
          
      645. 
        
      
      
        
      
          
    645. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                              Rails.application.credentials.dig(:facebook, :FACEBOOK_SECRET),
=======
            
>>>>>>> 9bfbd88 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
                              Rails.application.credentials.dig(:facebook, :FACEBOOK_SECRET),
=======
            
>>>>>>> 1214e1f (Add login registration pages)
=======
            
>>>>>>> 730a8ca (Add login registration pages)
=======
            
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 56fd9d41 (Add login registration pages)
=======
                              Rails.application.credentials.dig(:facebook, :FACEBOOK_SECRET),
>>>>>>> 11792758 (Rebased)
=======
=======
>>>>>>> a8b17c32 (Add login registration pages)
=======
>>>>>>> bc6bc8d2 (Rebased)
                              Rails.application.credentials.dig(:facebook, :FACEBOOK_SECRET),
=======
            
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
                              Rails.application.credentials.dig(:facebook, :FACEBOOK_SECRET),
=======
            
>>>>>>> 1214e1f (Add login registration pages)
=======
            
>>>>>>> 730a8ca (Add login registration pages)
=======
            
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 7d58507 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> a8b17c32 (Add login registration pages)
=======
=======
                              Rails.application.credentials.dig(:facebook, :FACEBOOK_SECRET),
>>>>>>> 49e8a6c (Rebased)
>>>>>>> bc6bc8d2 (Rebased)
          
      646. 
        
      
      
        
      
          
    646. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                              scope: 'email', info_fields: 'email,name'
=======
              # ==> Controller configuration
>>>>>>> 9bfbd88 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
                              scope: 'email', info_fields: 'email,name'
=======
              # ==> Controller configuration
>>>>>>> 1214e1f (Add login registration pages)
=======
              # ==> Controller configuration
>>>>>>> 730a8ca (Add login registration pages)
=======
              # ==> Controller configuration
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 56fd9d41 (Add login registration pages)
=======
                              scope: 'email', info_fields: 'email,name'
>>>>>>> 11792758 (Rebased)
=======
=======
>>>>>>> a8b17c32 (Add login registration pages)
=======
>>>>>>> bc6bc8d2 (Rebased)
                              scope: 'email', info_fields: 'email,name'
=======
              # ==> Controller configuration
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
                              scope: 'email', info_fields: 'email,name'
=======
              # ==> Controller configuration
>>>>>>> 1214e1f (Add login registration pages)
=======
              # ==> Controller configuration
>>>>>>> 730a8ca (Add login registration pages)
=======
              # ==> Controller configuration
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 7d58507 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> a8b17c32 (Add login registration pages)
=======
=======
                              scope: 'email', info_fields: 'email,name'
>>>>>>> 49e8a6c (Rebased)
>>>>>>> bc6bc8d2 (Rebased)
          
      647. 
        
      
      
        
      
          
    647. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 11792758 (Rebased)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 7a08014b (Featire specs)
=======
>>>>>>> a8b17c32 (Add login registration pages)
=======
>>>>>>> bc6bc8d2 (Rebased)
<<<<<<< HEAD
>>>>>>> 9bfbd88 (Featire specs)
=======
=======
>>>>>>> 793a6ed (Add login registration pages)
=======
>>>>>>> c5efe8e (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 56fd9d41 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 156ffe6 (Add login registration pages)
=======
=======
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 793a6ed (Add login registration pages)
=======
=======
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> c5efe8e (Add login registration pages)
=======
>>>>>>> aa3618b (Rebased)
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> df37394 (Featire specs)
>>>>>>> c51bf93 (Featire specs)
=======
>>>>>>> df37394 (Featire specs)
=======
<<<<<<< HEAD
=======
=======
=======
>>>>>>> 311e9fa (Rebased)
=======
=======
<<<<<<< HEAD
>>>>>>> 31507b8 (Add login registration pages)
>>>>>>> a8b17c32 (Add login registration pages)
<<<<<<< HEAD
=======
>>>>>>> e60833c (Add login registration pages)
=======
>>>>>>> f416f45 (Add login registration pages)
>>>>>>> 1214e1f (Add login registration pages)
=======
>>>>>>> 730a8ca (Add login registration pages)
=======
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 7d58507 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 31507b8 (Add login registration pages)
=======
=======
>>>>>>> 49e8a6c (Rebased)
>>>>>>> 311e9fa (Rebased)
=======
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 1214e1f (Add login registration pages)
=======
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 2fef4a0 (Add login registration pages)
=======
>>>>>>> 1214e1f (Add login registration pages)
=======
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> e60833c (Add login registration pages)
=======
=======
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> f416f45 (Add login registration pages)
=======
>>>>>>> 5b7749a (Fix)
=======
=======
>>>>>>> 0561be1d (Add login registration pages)
=======
>>>>>>> 512d1d87 (Add login registration pages)
=======
>>>>>>> 4976a174 (Add login registration pages)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> e6fc67c7 (Featire specs)
=======
>>>>>>> e011b0df (Add login registration pages)
=======
>>>>>>> bdc24a1a (Rebased)
=======
=======
>>>>>>> 730a8ca (Add login registration pages)
=======
>>>>>>> e1f4d17 (Add login registration pages)
=======
>>>>>>> 26b462d (Add login registration pages)
=======
=======
>>>>>>> f92a45b (Featire specs)
=======
=======
>>>>>>> e055dd0 (Rebased)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 730a8ca (Add login registration pages)
=======
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 7d58507 (Add login registration pages)
>>>>>>> c871248 (Add login registration pages)
              # Configure the parent class to the devise controllers.
          
      648. 
        
      
      
        
      
          
    648. 
            
            

            

              # config.parent_controller = 'DeviseController'
          
      649. 
        
      
      
        
      
          
    649. 
            
            

            

            
          
      650. 
        
      
      
        
      
          
    650. 
            
            

            

              # ==> Mailer Configuration
          
      651. 
        
      
      
        
      
          
    651. 
            
            

            

              # Configure the e-mail address which will be shown in Devise::Mailer,
          
      652. 
        
      
      
        
      
          
    652. 
            
            

            

              # note that it will be overwritten if you use your own mailer class
          
      653. 
        
      
      
        
      
          
    653. 
            
            

            

              # with default "from" parameter.
          
      654. 
        
      
      
        
      
          
    654. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
=======
>>>>>>> 156ffe6 (Add login registration pages)
          
    655. 
>>>>>>> 9a49b7b (Rebased)
>>>>>>> bae2b7de (Add login registration pages)
            1
=======
          
    656. 
            
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
=======
=======
          
    657. 
            
>>>>>>> 730a8ca (Add login registration pages)
=======
          
    658. 
            
>>>>>>> e1f4d17 (Add login registration pages)
=======
>>>>>>> aa3618b (Rebased)
=======
>>>>>>> 824bb2b (Featire specs)
=======
=======
          
    659. 
            
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
=======
=======
>>>>>>> 1214e1f (Add login registration pages)
=======
          
    660. 
            
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ccec311 (Add login registration pages)
=======
          
    661. 
            
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 7d58507 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 31507b8 (Add login registration pages)
=======
=======
          
    662. 
            1
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
=======
=======
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> 852864e (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 1d11874 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> ff4c2fe0 (Add login registration pages)
=======
=======
=======
>>>>>>> 551f3c1 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 06e5e41 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 8f1baf1c (Add login registration pages)
=======
=======
=======
>>>>>>> ccec311 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 385136b (Add login registration pages)
<<<<<<< HEAD
>>>>>>> dda81aa9 (Add login registration pages)
=======
=======
=======
=======
          
    663. 
            
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 8c3e531 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 1c33e01 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 40a3d25f (Add login registration pages)
=======
=======
=======
          
    664. 
            1
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
=======
          
    665. 
            
>>>>>>> 715fac2 (Featire specs)
>>>>>>> fb61c5a (Featire specs)
>>>>>>> 73f364d8 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.mailer_sender = 'please-change-me-at-config-initializers-devise@example.com'
=======
            # is set to its default value. Note that some are commented out while others
>>>>>>> df37394 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ff4c2fe0 (Add login registration pages)
=======
=======
>>>>>>> 551f3c1 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 8f1baf1c (Add login registration pages)
=======
=======
>>>>>>> ccec311 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> dda81aa9 (Add login registration pages)
=======
=======
>>>>>>> 8c3e531 (Add login registration pages)
>>>>>>> 40a3d25f (Add login registration pages)
              config.mailer_sender = 'please-change-me-at-config-initializers-devise@example.com'
=======
            # is set to its default value. Note that some are commented out while others
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
=======
=======
            # is set to its default value. Note that some are commented out while others
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
=======
            # is set to its default value. Note that some are commented out while others
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 7d58507 (Add login registration pages)
=======
              config.mailer_sender = 'please-change-me-at-config-initializers-devise@example.com'
>>>>>>> 49e8a6c (Rebased)
=======
              config.mailer_sender = 'please-change-me-at-config-initializers-devise@example.com'
=======
            # is set to its default value. Note that some are commented out while others
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> 852864e (Add login registration pages)
<<<<<<< HEAD
>>>>>>> ff4c2fe0 (Add login registration pages)
=======
=======
>>>>>>> 551f3c1 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 8f1baf1c (Add login registration pages)
=======
=======
=======
            # is set to its default value. Note that some are commented out while others
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> ccec311 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> dda81aa9 (Add login registration pages)
=======
=======
=======
            # is set to its default value. Note that some are commented out while others
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 8c3e531 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 40a3d25f (Add login registration pages)
=======
=======
              config.mailer_sender = 'please-change-me-at-config-initializers-devise@example.com'
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
            # is set to its default value. Note that some are commented out while others
>>>>>>> 715fac2 (Featire specs)
>>>>>>> 73f364d8 (Featire specs)
          
      666. 
        
      
      
        
      
<<<<<<< HEAD
<<<<<<< HEAD
          
    666. 
            
            

            

            
          
      667. 
        
      
      
        
      
          
    667. 
            
            

            

              # Configure the class responsible to send e-mails.
          
      668. 
        
      
      
        
      
          
    668. 
            
            

            

              # config.mailer = 'Devise::Mailer'
          
      669. 
        
      
      
        
      
          
    669. 
            
            

            

            
          
      670. 
        
      
      
        
      
          
    670. 
            
            

            

              # Configure the parent class responsible to send e-mails.
          
      671. 
        
      
      
        
      
          
    671. 
            
            

            

              # config.parent_mailer = 'ActionMailer::Base'
          
      672. 
        
      
      
        
      
          
    672. 
            
            

            

            
          
      673. 
        
      
      
        
      
          
    673. 
            
            

            

              # ==> ORM configuration
          
      674. 
        
      
      
        
      
          
    674. 
            
            

            

              # Load and configure the ORM. Supports :active_record (default) and
          
      675. 
        
      
      
        
      
          
    675. 
            
            

            

              # :mongoid (bson_ext recommended) by default. Other ORMs may be
          
      676. 
        
      
      
        
      
          
    676. 
            
            

            

              # available as additional gems.
          
      677. 
        
      
      
        
      
          
    677. 
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 7d58507 (Add login registration pages)
=======
>>>>>>> 852864e (Add login registration pages)
<<<<<<< HEAD
>>>>>>> ff4c2fe0 (Add login registration pages)
=======
=======
>>>>>>> 551f3c1 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 8f1baf1c (Add login registration pages)
=======
=======
>>>>>>> ccec311 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> dda81aa9 (Add login registration pages)
=======
=======
>>>>>>> 8c3e531 (Add login registration pages)
>>>>>>> 40a3d25f (Add login registration pages)
          
    678. 
>>>>>>> bae2b7de (Add login registration pages)
            1
=======
          
    679. 
            
<<<<<<< HEAD
>>>>>>> 1214e1f (Add login registration pages)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 1214e1f (Add login registration pages)
=======
          
    680. 
            
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ccec311 (Add login registration pages)
=======
          
    681. 
            
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 7d58507 (Add login registration pages)
=======
          
    682. 
            1
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> 852864e (Add login registration pages)
<<<<<<< HEAD
>>>>>>> ff4c2fe0 (Add login registration pages)
=======
=======
>>>>>>> 551f3c1 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 8f1baf1c (Add login registration pages)
=======
=======
>>>>>>> ccec311 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> dda81aa9 (Add login registration pages)
=======
=======
=======
          
    683. 
            
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 8c3e531 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 40a3d25f (Add login registration pages)
=======
=======
          
    684. 
            1
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
          
    685. 
            
>>>>>>> 715fac2 (Featire specs)
>>>>>>> 73f364d8 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              require 'devise/orm/active_record'
=======
            # are not: uncommented lines are intended to protect your configuration from
>>>>>>> df37394 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ff4c2fe0 (Add login registration pages)
=======
=======
>>>>>>> 551f3c1 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 8f1baf1c (Add login registration pages)
=======
=======
>>>>>>> ccec311 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> dda81aa9 (Add login registration pages)
=======
=======
>>>>>>> 8c3e531 (Add login registration pages)
>>>>>>> 40a3d25f (Add login registration pages)
              require 'devise/orm/active_record'
=======
            # are not: uncommented lines are intended to protect your configuration from
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
=======
=======
            # are not: uncommented lines are intended to protect your configuration from
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
=======
            # are not: uncommented lines are intended to protect your configuration from
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 7d58507 (Add login registration pages)
=======
              require 'devise/orm/active_record'
>>>>>>> 49e8a6c (Rebased)
=======
              require 'devise/orm/active_record'
=======
            # are not: uncommented lines are intended to protect your configuration from
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> 852864e (Add login registration pages)
<<<<<<< HEAD
>>>>>>> ff4c2fe0 (Add login registration pages)
=======
=======
>>>>>>> 551f3c1 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 8f1baf1c (Add login registration pages)
=======
=======
=======
            # are not: uncommented lines are intended to protect your configuration from
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> ccec311 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> dda81aa9 (Add login registration pages)
=======
=======
=======
            # are not: uncommented lines are intended to protect your configuration from
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 8c3e531 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 40a3d25f (Add login registration pages)
=======
=======
              require 'devise/orm/active_record'
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
            # are not: uncommented lines are intended to protect your configuration from
>>>>>>> 715fac2 (Featire specs)
>>>>>>> 73f364d8 (Featire specs)
          
      686. 
        
      
      
        
      
<<<<<<< HEAD
<<<<<<< HEAD
          
    686. 
            
            

            

            
          
      687. 
        
      
      
        
      
          
    687. 
            
            

            

              # ==> Configuration for any authentication mechanism
          
      688. 
        
      
      
        
      
          
    688. 
            
            

            

              # Configure which keys are used when authenticating a user. The default is
          
      689. 
        
      
      
        
      
          
    689. 
            
            

            

              # just :email. You can configure it to use [:username, :subdomain], so for
          
      690. 
        
      
      
        
      
          
    690. 
            
            

            

              # authenticating a user, both parameters are required. Remember that those
          
      691. 
        
      
      
        
      
          
    691. 
            
            

            

              # parameters are used only when authenticating and not when retrieving from
          
      692. 
        
      
      
        
      
          
    692. 
            
            

            

              # session. If you need permissions, you should implement that in a before filter.
          
      693. 
        
      
      
        
      
          
    693. 
            
            

            

              # You can also supply a hash where the value is a boolean determining whether
          
      694. 
        
      
      
        
      
          
    694. 
            
            

            

              # or not authentication should be aborted when the value is not present.
          
      695. 
        
      
      
        
      
          
    695. 
            
            

            

              # config.authentication_keys = [:email]
          
      696. 
        
      
      
        
      
          
    696. 
            
            

            

            
          
      697. 
        
      
      
        
      
          
    697. 
            
            

            

              # Configure parameters from the request object used for authentication. Each entry
          
      698. 
        
      
      
        
      
          
    698. 
            
            

            

              # given should be a request method and it will automatically be passed to the
          
      699. 
        
      
      
        
      
          
    699. 
            
            

            

              # find_for_authentication method and considered in your model lookup. For instance,
          
      700. 
        
      
      
        
      
          
    700. 
            
            

            

              # if you set :request_keys to [:subdomain], :subdomain will be used on authentication.
          
      701. 
        
      
      
        
      
          
    701. 
            
            

            

              # The same considerations mentioned for authentication_keys also apply to request_keys.
          
      702. 
        
      
      
        
      
          
    702. 
            
            

            

              # config.request_keys = []
          
      703. 
        
      
      
        
      
          
    703. 
            
            

            

            
          
      704. 
        
      
      
        
      
          
    704. 
            
            

            

              # Configure which authentication keys should be case-insensitive.
          
      705. 
        
      
      
        
      
          
    705. 
            
            

            

              # These keys will be downcased upon creating or modifying a user and when used
          
      706. 
        
      
      
        
      
          
    706. 
            
            

            

              # to authenticate or find a user. Default is :email.
          
      707. 
        
      
      
        
      
          
    707. 
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 7d58507 (Add login registration pages)
=======
>>>>>>> 852864e (Add login registration pages)
<<<<<<< HEAD
>>>>>>> ff4c2fe0 (Add login registration pages)
=======
=======
>>>>>>> 551f3c1 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 8f1baf1c (Add login registration pages)
=======
=======
>>>>>>> ccec311 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> dda81aa9 (Add login registration pages)
=======
=======
>>>>>>> 8c3e531 (Add login registration pages)
>>>>>>> 40a3d25f (Add login registration pages)
          
    708. 
>>>>>>> bae2b7de (Add login registration pages)
            1
=======
          
    709. 
            
<<<<<<< HEAD
>>>>>>> 1214e1f (Add login registration pages)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 1214e1f (Add login registration pages)
=======
          
    710. 
            
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ccec311 (Add login registration pages)
=======
          
    711. 
            
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 7d58507 (Add login registration pages)
=======
          
    712. 
            1
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> 852864e (Add login registration pages)
<<<<<<< HEAD
>>>>>>> ff4c2fe0 (Add login registration pages)
=======
=======
>>>>>>> 551f3c1 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 8f1baf1c (Add login registration pages)
=======
=======
>>>>>>> ccec311 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> dda81aa9 (Add login registration pages)
=======
=======
=======
          
    713. 
            
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 8c3e531 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 40a3d25f (Add login registration pages)
=======
=======
          
    714. 
            1
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
          
    715. 
            
>>>>>>> 715fac2 (Featire specs)
>>>>>>> 73f364d8 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.case_insensitive_keys = [:email]
=======
            # breaking changes in upgrades (i.e., in the event that future versions of
>>>>>>> df37394 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ff4c2fe0 (Add login registration pages)
=======
=======
>>>>>>> 551f3c1 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 8f1baf1c (Add login registration pages)
=======
=======
>>>>>>> ccec311 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> dda81aa9 (Add login registration pages)
=======
=======
>>>>>>> 8c3e531 (Add login registration pages)
>>>>>>> 40a3d25f (Add login registration pages)
              config.case_insensitive_keys = [:email]
=======
            # breaking changes in upgrades (i.e., in the event that future versions of
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
=======
=======
            # breaking changes in upgrades (i.e., in the event that future versions of
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
=======
            # breaking changes in upgrades (i.e., in the event that future versions of
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 7d58507 (Add login registration pages)
=======
              config.case_insensitive_keys = [:email]
>>>>>>> 49e8a6c (Rebased)
=======
              config.case_insensitive_keys = [:email]
=======
            # breaking changes in upgrades (i.e., in the event that future versions of
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> 852864e (Add login registration pages)
<<<<<<< HEAD
>>>>>>> ff4c2fe0 (Add login registration pages)
=======
=======
>>>>>>> 551f3c1 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 8f1baf1c (Add login registration pages)
=======
=======
=======
            # breaking changes in upgrades (i.e., in the event that future versions of
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> ccec311 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> dda81aa9 (Add login registration pages)
=======
=======
=======
            # breaking changes in upgrades (i.e., in the event that future versions of
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 8c3e531 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 40a3d25f (Add login registration pages)
=======
=======
              config.case_insensitive_keys = [:email]
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
            # breaking changes in upgrades (i.e., in the event that future versions of
>>>>>>> 715fac2 (Featire specs)
>>>>>>> 73f364d8 (Featire specs)
          
      716. 
        
      
      
        
      
<<<<<<< HEAD
<<<<<<< HEAD
          
    716. 
            
            

            

            
          
      717. 
        
      
      
        
      
          
    717. 
            
            

            

              # Configure which authentication keys should have whitespace stripped.
          
      718. 
        
      
      
        
      
          
    718. 
            
            

            

              # These keys will have whitespace before and after removed upon creating or
          
      719. 
        
      
      
        
      
          
    719. 
            
            

            

              # modifying a user and when used to authenticate or find a user. Default is :email.
          
      720. 
        
      
      
        
      
          
    720. 
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 7d58507 (Add login registration pages)
=======
>>>>>>> 852864e (Add login registration pages)
<<<<<<< HEAD
>>>>>>> ff4c2fe0 (Add login registration pages)
=======
=======
>>>>>>> 551f3c1 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 8f1baf1c (Add login registration pages)
=======
=======
>>>>>>> ccec311 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> dda81aa9 (Add login registration pages)
=======
=======
>>>>>>> 8c3e531 (Add login registration pages)
>>>>>>> 40a3d25f (Add login registration pages)
          
    721. 
>>>>>>> bae2b7de (Add login registration pages)
            1
=======
          
    722. 
            
<<<<<<< HEAD
>>>>>>> 1214e1f (Add login registration pages)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 1214e1f (Add login registration pages)
=======
          
    723. 
            
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ccec311 (Add login registration pages)
=======
          
    724. 
            
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 7d58507 (Add login registration pages)
=======
          
    725. 
            1
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> 852864e (Add login registration pages)
<<<<<<< HEAD
>>>>>>> ff4c2fe0 (Add login registration pages)
=======
=======
>>>>>>> 551f3c1 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 8f1baf1c (Add login registration pages)
=======
=======
>>>>>>> ccec311 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> dda81aa9 (Add login registration pages)
=======
=======
=======
          
    726. 
            
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 8c3e531 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 40a3d25f (Add login registration pages)
=======
=======
          
    727. 
            1
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
          
    728. 
            
>>>>>>> 715fac2 (Featire specs)
>>>>>>> 73f364d8 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.strip_whitespace_keys = [:email]
=======
            # Devise change the default values for those options).
>>>>>>> df37394 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ff4c2fe0 (Add login registration pages)
=======
=======
>>>>>>> 551f3c1 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 8f1baf1c (Add login registration pages)
=======
=======
>>>>>>> ccec311 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> dda81aa9 (Add login registration pages)
=======
=======
>>>>>>> 8c3e531 (Add login registration pages)
>>>>>>> 40a3d25f (Add login registration pages)
              config.strip_whitespace_keys = [:email]
=======
            # Devise change the default values for those options).
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
=======
=======
            # Devise change the default values for those options).
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
=======
            # Devise change the default values for those options).
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 7d58507 (Add login registration pages)
=======
              config.strip_whitespace_keys = [:email]
>>>>>>> 49e8a6c (Rebased)
=======
              config.strip_whitespace_keys = [:email]
=======
            # Devise change the default values for those options).
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> 852864e (Add login registration pages)
<<<<<<< HEAD
>>>>>>> ff4c2fe0 (Add login registration pages)
=======
=======
>>>>>>> 551f3c1 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 8f1baf1c (Add login registration pages)
=======
=======
=======
            # Devise change the default values for those options).
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> ccec311 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> dda81aa9 (Add login registration pages)
=======
=======
=======
            # Devise change the default values for those options).
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 8c3e531 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 40a3d25f (Add login registration pages)
=======
=======
              config.strip_whitespace_keys = [:email]
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
            # Devise change the default values for those options).
>>>>>>> 715fac2 (Featire specs)
>>>>>>> 73f364d8 (Featire specs)
          
      729. 
        
      
      
        
      
<<<<<<< HEAD
<<<<<<< HEAD
          
    729. 
            
            

            

            
          
      730. 
        
      
      
        
      
          
    730. 
            
            

            

              # Tell if authentication through request.params is enabled. True by default.
          
      731. 
        
      
      
        
      
          
    731. 
            
            

            

              # It can be set to an array that will enable params authentication only for the
          
      732. 
        
      
      
        
      
          
    732. 
            
            

            

              # given strategies, for example, `config.params_authenticatable = [:database]` will
          
      733. 
        
      
      
        
      
          
    733. 
            
            

            

              # enable it only for database (email + password) authentication.
          
      734. 
        
      
      
        
      
          
    734. 
            
            

            

              # config.params_authenticatable = true
          
      735. 
        
      
      
        
      
          
    735. 
            
            

            

            
          
      736. 
        
      
      
        
      
          
    736. 
            
            

            

              # Tell if authentication through HTTP Auth is enabled. False by default.
          
      737. 
        
      
      
        
      
          
    737. 
            
            

            

              # It can be set to an array that will enable http authentication only for the
          
      738. 
        
      
      
        
      
          
    738. 
            
            

            

              # given strategies, for example, `config.http_authenticatable = [:database]` will
          
      739. 
        
      
      
        
      
          
    739. 
            
            

            

              # enable it only for database authentication.
          
      740. 
        
      
      
        
      
          
    740. 
            
            

            

              # For API-only applications to support authentication "out-of-the-box", you will likely want to
          
      741. 
        
      
      
        
      
          
    741. 
            
            

            

              # enable this with :database unless you are using a custom strategy.
          
      742. 
        
      
      
        
      
          
    742. 
            
            

            

              # The supported strategies are:
          
      743. 
        
      
      
        
      
          
    743. 
            
            

            

              # :database      = Support basic authentication with authentication key + password
          
      744. 
        
      
      
        
      
          
    744. 
            
            

            

              # config.http_authenticatable = false
          
      745. 
        
      
      
        
      
          
    745. 
            
            

            

            
          
      746. 
        
      
      
        
      
          
    746. 
            
            

            

              # If 401 status code should be returned for AJAX requests. True by default.
          
      747. 
        
      
      
        
      
          
    747. 
            
            

            

              # config.http_authenticatable_on_xhr = true
          
      748. 
        
      
      
        
      
          
    748. 
            
            

            

            
          
      749. 
        
      
      
        
      
          
    749. 
            
            

            

              # The realm used in Http Basic Authentication. 'Application' by default.
          
      750. 
        
      
      
        
      
          
    750. 
            
            

            

              # config.http_authentication_realm = 'Application'
          
      751. 
        
      
      
        
      
          
    751. 
            
            

            

            
          
      752. 
        
      
      
        
      
          
    752. 
            
            

            

              # It will change confirmation, password recovery and other workflows
          
      753. 
        
      
      
        
      
          
    753. 
            
            

            

              # to behave the same regardless if the e-mail provided was right or wrong.
          
      754. 
        
      
      
        
      
          
    754. 
            
            

            

              # Does not affect registerable.
          
      755. 
        
      
      
        
      
          
    755. 
            
            

            

              # config.paranoid = true
          
      756. 
        
      
      
        
      
          
    756. 
            
            

            

            
          
      757. 
        
      
      
        
      
          
    757. 
            
            

            

              # By default Devise will store the user in session. You can skip storage for
          
      758. 
        
      
      
        
      
          
    758. 
            
            

            

              # particular strategies by setting this option.
          
      759. 
        
      
      
        
      
          
    759. 
            
            

            

              # Notice that if you are skipping storage for all authentication paths, you
          
      760. 
        
      
      
        
      
          
    760. 
            
            

            

              # may want to disable generating routes to Devise's sessions controller by
          
      761. 
        
      
      
        
      
          
    761. 
            
            

            

              # passing skip: :sessions to `devise_for` in your config/routes.rb
          
      762. 
        
      
      
        
      
          
    762. 
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 7d58507 (Add login registration pages)
=======
>>>>>>> 852864e (Add login registration pages)
<<<<<<< HEAD
>>>>>>> ff4c2fe0 (Add login registration pages)
=======
=======
>>>>>>> 551f3c1 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 8f1baf1c (Add login registration pages)
=======
=======
>>>>>>> ccec311 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> dda81aa9 (Add login registration pages)
=======
=======
>>>>>>> 8c3e531 (Add login registration pages)
>>>>>>> 40a3d25f (Add login registration pages)
          
    763. 
>>>>>>> bae2b7de (Add login registration pages)
            1
=======
          
    764. 
            
<<<<<<< HEAD
>>>>>>> 1214e1f (Add login registration pages)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 1214e1f (Add login registration pages)
=======
          
    765. 
            
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ccec311 (Add login registration pages)
=======
          
    766. 
            
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 7d58507 (Add login registration pages)
=======
          
    767. 
            1
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> 852864e (Add login registration pages)
<<<<<<< HEAD
>>>>>>> ff4c2fe0 (Add login registration pages)
=======
=======
>>>>>>> 551f3c1 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 8f1baf1c (Add login registration pages)
=======
=======
>>>>>>> ccec311 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> dda81aa9 (Add login registration pages)
=======
=======
=======
          
    768. 
            
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 8c3e531 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 40a3d25f (Add login registration pages)
=======
=======
          
    769. 
            1
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
          
    770. 
            
>>>>>>> 715fac2 (Featire specs)
>>>>>>> 73f364d8 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.skip_session_storage = [:http_auth]
=======
            #
>>>>>>> df37394 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ff4c2fe0 (Add login registration pages)
=======
=======
>>>>>>> 551f3c1 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 8f1baf1c (Add login registration pages)
=======
=======
>>>>>>> ccec311 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> dda81aa9 (Add login registration pages)
=======
=======
>>>>>>> 8c3e531 (Add login registration pages)
>>>>>>> 40a3d25f (Add login registration pages)
              config.skip_session_storage = [:http_auth]
=======
            #
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
=======
=======
            #
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
=======
            #
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 7d58507 (Add login registration pages)
=======
              config.skip_session_storage = [:http_auth]
>>>>>>> 49e8a6c (Rebased)
=======
              config.skip_session_storage = [:http_auth]
=======
            #
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> 852864e (Add login registration pages)
<<<<<<< HEAD
>>>>>>> ff4c2fe0 (Add login registration pages)
=======
=======
>>>>>>> 551f3c1 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 8f1baf1c (Add login registration pages)
=======
=======
=======
            #
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> ccec311 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> dda81aa9 (Add login registration pages)
=======
=======
=======
            #
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 8c3e531 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 40a3d25f (Add login registration pages)
=======
=======
              config.skip_session_storage = [:http_auth]
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
            #
>>>>>>> 715fac2 (Featire specs)
>>>>>>> 73f364d8 (Featire specs)
          
      771. 
        
      
      
        
      
<<<<<<< HEAD
<<<<<<< HEAD
          
    771. 
            
            

            

            
          
      772. 
        
      
      
        
      
          
    772. 
            
            

            

              # By default, Devise cleans up the CSRF token on authentication to
          
      773. 
        
      
      
        
      
          
    773. 
            
            

            

              # avoid CSRF token fixation attacks. This means that, when using AJAX
          
      774. 
        
      
      
        
      
          
    774. 
            
            

            

              # requests for sign in and sign up, you need to get a new CSRF token
          
      775. 
        
      
      
        
      
          
    775. 
            
            

            

              # from the server. You can disable this option at your own risk.
          
      776. 
        
      
      
        
      
          
    776. 
            
            

            

              # config.clean_up_csrf_token_on_authentication = true
          
      777. 
        
      
      
        
      
          
    777. 
            
            

            

            
          
      778. 
        
      
      
        
      
          
    778. 
            
            

            

              # When false, Devise will not attempt to reload routes on eager load.
          
      779. 
        
      
      
        
      
          
    779. 
            
            

            

              # This can reduce the time taken to boot the app but if your application
          
      780. 
        
      
      
        
      
          
    780. 
            
            

            

              # requires the Devise mappings to be loaded during boot time the application
          
      781. 
        
      
      
        
      
          
    781. 
            
            

            

              # won't boot properly.
          
      782. 
        
      
      
        
      
          
    782. 
            
            

            

              # config.reload_routes = true
          
      783. 
        
      
      
        
      
          
    783. 
            
            

            

            
          
      784. 
        
      
      
        
      
          
    784. 
            
            

            

              # ==> Configuration for :database_authenticatable
          
      785. 
        
      
      
        
      
          
    785. 
            
            

            

              # For bcrypt, this is the cost for hashing the password and defaults to 12. If
          
      786. 
        
      
      
        
      
          
    786. 
            
            

            

              # using other algorithms, it sets how many times you want the password to be hashed.
          
      787. 
        
      
      
        
      
          
    787. 
            
            

            

              # The number of stretches used for generating the hashed password are stored
          
      788. 
        
      
      
        
      
          
    788. 
            
            

            

              # with the hashed password. This allows you to change the stretches without
          
      789. 
        
      
      
        
      
          
    789. 
            
            

            

              # invalidating existing passwords.
          
      790. 
        
      
      
        
      
          
    790. 
            
            

            

              #
          
      791. 
        
      
      
        
      
          
    791. 
            
            

            

              # Limiting the stretches to just one in testing will increase the performance of
          
      792. 
        
      
      
        
      
          
    792. 
            
            

            

              # your test suite dramatically. However, it is STRONGLY RECOMMENDED to not use
          
      793. 
        
      
      
        
      
          
    793. 
            
            

            

              # a value less than 10 in other environments. Note that, for bcrypt (the default
          
      794. 
        
      
      
        
      
          
    794. 
            
            

            

              # algorithm), the cost increases exponentially with the number of stretches (e.g.
          
      795. 
        
      
      
        
      
          
    795. 
            
            

            

              # a value of 20 is already extremely slow: approx. 60 seconds for 1 calculation).
          
      796. 
        
      
      
        
      
          
    796. 
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 7d58507 (Add login registration pages)
=======
>>>>>>> 852864e (Add login registration pages)
<<<<<<< HEAD
>>>>>>> ff4c2fe0 (Add login registration pages)
=======
=======
>>>>>>> 551f3c1 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 8f1baf1c (Add login registration pages)
=======
=======
>>>>>>> ccec311 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> dda81aa9 (Add login registration pages)
=======
=======
>>>>>>> 8c3e531 (Add login registration pages)
>>>>>>> 40a3d25f (Add login registration pages)
          
    797. 
>>>>>>> bae2b7de (Add login registration pages)
            1
=======
          
    798. 
            
<<<<<<< HEAD
>>>>>>> 1214e1f (Add login registration pages)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 1214e1f (Add login registration pages)
=======
          
    799. 
            
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ccec311 (Add login registration pages)
=======
          
    800. 
            
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 7d58507 (Add login registration pages)
=======
          
    801. 
            1
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> 852864e (Add login registration pages)
<<<<<<< HEAD
>>>>>>> ff4c2fe0 (Add login registration pages)
=======
=======
>>>>>>> 551f3c1 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 8f1baf1c (Add login registration pages)
=======
=======
>>>>>>> ccec311 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> dda81aa9 (Add login registration pages)
=======
=======
=======
          
    802. 
            
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 8c3e531 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 40a3d25f (Add login registration pages)
=======
=======
          
    803. 
            1
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
          
    804. 
            
>>>>>>> 715fac2 (Featire specs)
>>>>>>> 73f364d8 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.stretches = Rails.env.test? ? 1 : 12
=======
            # Use this hook to configure devise mailer, warden hooks and so forth.
>>>>>>> df37394 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ff4c2fe0 (Add login registration pages)
=======
=======
>>>>>>> 551f3c1 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 8f1baf1c (Add login registration pages)
=======
=======
>>>>>>> ccec311 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> dda81aa9 (Add login registration pages)
=======
=======
>>>>>>> 8c3e531 (Add login registration pages)
>>>>>>> 40a3d25f (Add login registration pages)
              config.stretches = Rails.env.test? ? 1 : 12
=======
            # Use this hook to configure devise mailer, warden hooks and so forth.
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
=======
=======
            # Use this hook to configure devise mailer, warden hooks and so forth.
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
=======
            # Use this hook to configure devise mailer, warden hooks and so forth.
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 7d58507 (Add login registration pages)
=======
              config.stretches = Rails.env.test? ? 1 : 12
>>>>>>> 49e8a6c (Rebased)
=======
              config.stretches = Rails.env.test? ? 1 : 12
=======
            # Use this hook to configure devise mailer, warden hooks and so forth.
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> 852864e (Add login registration pages)
<<<<<<< HEAD
>>>>>>> ff4c2fe0 (Add login registration pages)
=======
=======
>>>>>>> 551f3c1 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 8f1baf1c (Add login registration pages)
=======
=======
=======
            # Use this hook to configure devise mailer, warden hooks and so forth.
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> ccec311 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> dda81aa9 (Add login registration pages)
=======
=======
=======
            # Use this hook to configure devise mailer, warden hooks and so forth.
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 8c3e531 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 40a3d25f (Add login registration pages)
=======
=======
              config.stretches = Rails.env.test? ? 1 : 12
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
            # Use this hook to configure devise mailer, warden hooks and so forth.
>>>>>>> 715fac2 (Featire specs)
>>>>>>> 73f364d8 (Featire specs)
          
      805. 
        
      
      
        
      
<<<<<<< HEAD
<<<<<<< HEAD
          
    805. 
            
            

            

            
          
      806. 
        
      
      
        
      
          
    806. 
            
            

            

              # Set up a pepper to generate the hashed password.
          
      807. 
        
      
      
        
      
          
    807. 
            
            

            

              # config.pepper = 'ceca2dd0db4a8ea4b0604585575dbae22182ecf60d97a87f4914cc23cfe747f8ff22aac7e416e94240a6fe3cfe3cea929d0a8278c66c5388d059bf5bcfdc8a27'
          
      808. 
        
      
      
        
      
          
    808. 
            
            

            

            
          
      809. 
        
      
      
        
      
          
    809. 
            
            

            

              # Send a notification to the original email when the user's email is changed.
          
      810. 
        
      
      
        
      
          
    810. 
            
            

            

              # config.send_email_changed_notification = false
          
      811. 
        
      
      
        
      
          
    811. 
            
            

            

            
          
      812. 
        
      
      
        
      
          
    812. 
            
            

            

              # Send a notification email when the user's password is changed.
          
      813. 
        
      
      
        
      
          
    813. 
            
            

            

              # config.send_password_change_notification = false
          
      814. 
        
      
      
        
      
          
    814. 
            
            

            

            
          
      815. 
        
      
      
        
      
          
    815. 
            
            

            

              # ==> Configuration for :confirmable
          
      816. 
        
      
      
        
      
          
    816. 
            
            

            

              # A period that the user is allowed to access the website even without
          
      817. 
        
      
      
        
      
          
    817. 
            
            

            

              # confirming their account. For instance, if set to 2.days, the user will be
          
      818. 
        
      
      
        
      
          
    818. 
            
            

            

              # able to access the website for two days without confirming their account,
          
      819. 
        
      
      
        
      
          
    819. 
            
            

            

              # access will be blocked just in the third day.
          
      820. 
        
      
      
        
      
          
    820. 
            
            

            

              # You can also set it to nil, which will allow the user to access the website
          
      821. 
        
      
      
        
      
          
    821. 
            
            

            

              # without confirming their account.
          
      822. 
        
      
      
        
      
          
    822. 
            
            

            

              # Default is 0.days, meaning the user cannot access the website without
          
      823. 
        
      
      
        
      
          
    823. 
            
            

            

              # confirming their account.
          
      824. 
        
      
      
        
      
          
    824. 
            
            

            

              # config.allow_unconfirmed_access_for = 2.days
          
      825. 
        
      
      
        
      
          
    825. 
            
            

            

            
          
      826. 
        
      
      
        
      
          
    826. 
            
            

            

              # A period that the user is allowed to confirm their account before their
          
      827. 
        
      
      
        
      
          
    827. 
            
            

            

              # token becomes invalid. For example, if set to 3.days, the user can confirm
          
      828. 
        
      
      
        
      
          
    828. 
            
            

            

              # their account within 3 days after the mail was sent, but on the fourth day
          
      829. 
        
      
      
        
      
          
    829. 
            
            

            

              # their account can't be confirmed with the token any more.
          
      830. 
        
      
      
        
      
          
    830. 
            
            

            

              # Default is nil, meaning there is no restriction on how long a user can take
          
      831. 
        
      
      
        
      
          
    831. 
            
            

            

              # before confirming their account.
          
      832. 
        
      
      
        
      
          
    832. 
            
            

            

              # config.confirm_within = 3.days
          
      833. 
        
      
      
        
      
          
    833. 
            
            

            

            
          
      834. 
        
      
      
        
      
          
    834. 
            
            

            

              # If true, requires any email changes to be confirmed (exactly the same way as
          
      835. 
        
      
      
        
      
          
    835. 
            
            

            

              # initial account confirmation) to be applied. Requires additional unconfirmed_email
          
      836. 
        
      
      
        
      
          
    836. 
            
            

            

              # db field (see migrations). Until confirmed, new email is stored in
          
      837. 
        
      
      
        
      
          
    837. 
            
            

            

              # unconfirmed_email column, and copied to email column on successful confirmation.
          
      838. 
        
      
      
        
      
          
    838. 
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 7d58507 (Add login registration pages)
=======
>>>>>>> 852864e (Add login registration pages)
<<<<<<< HEAD
>>>>>>> ff4c2fe0 (Add login registration pages)
=======
=======
>>>>>>> 551f3c1 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 8f1baf1c (Add login registration pages)
=======
=======
>>>>>>> ccec311 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> dda81aa9 (Add login registration pages)
=======
=======
>>>>>>> 8c3e531 (Add login registration pages)
>>>>>>> 40a3d25f (Add login registration pages)
          
    839. 
>>>>>>> bae2b7de (Add login registration pages)
            1
=======
          
    840. 
            
<<<<<<< HEAD
>>>>>>> 1214e1f (Add login registration pages)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 1214e1f (Add login registration pages)
=======
          
    841. 
            
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ccec311 (Add login registration pages)
=======
          
    842. 
            
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 7d58507 (Add login registration pages)
=======
          
    843. 
            1
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> 852864e (Add login registration pages)
<<<<<<< HEAD
>>>>>>> ff4c2fe0 (Add login registration pages)
=======
=======
>>>>>>> 551f3c1 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 8f1baf1c (Add login registration pages)
=======
=======
>>>>>>> ccec311 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> dda81aa9 (Add login registration pages)
=======
=======
=======
          
    844. 
            
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 8c3e531 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 40a3d25f (Add login registration pages)
=======
=======
          
    845. 
            1
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
          
    846. 
            
>>>>>>> 715fac2 (Featire specs)
>>>>>>> 73f364d8 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.reconfirmable = true
=======
            # Many of these configuration options can be set straight in your model.
>>>>>>> df37394 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ff4c2fe0 (Add login registration pages)
=======
=======
>>>>>>> 551f3c1 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 8f1baf1c (Add login registration pages)
=======
=======
>>>>>>> ccec311 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> dda81aa9 (Add login registration pages)
=======
=======
>>>>>>> 8c3e531 (Add login registration pages)
>>>>>>> 40a3d25f (Add login registration pages)
              config.reconfirmable = true
=======
            # Many of these configuration options can be set straight in your model.
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
=======
=======
            # Many of these configuration options can be set straight in your model.
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
=======
            # Many of these configuration options can be set straight in your model.
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 7d58507 (Add login registration pages)
=======
              config.reconfirmable = true
>>>>>>> 49e8a6c (Rebased)
=======
              config.reconfirmable = true
=======
            # Many of these configuration options can be set straight in your model.
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> 852864e (Add login registration pages)
<<<<<<< HEAD
>>>>>>> ff4c2fe0 (Add login registration pages)
=======
=======
>>>>>>> 551f3c1 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 8f1baf1c (Add login registration pages)
=======
=======
=======
            # Many of these configuration options can be set straight in your model.
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> ccec311 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> dda81aa9 (Add login registration pages)
=======
=======
=======
            # Many of these configuration options can be set straight in your model.
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 8c3e531 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 40a3d25f (Add login registration pages)
=======
=======
              config.reconfirmable = true
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
            # Many of these configuration options can be set straight in your model.
>>>>>>> 715fac2 (Featire specs)
>>>>>>> 73f364d8 (Featire specs)
          
      847. 
        
      
      
        
      
          
    847. 
            
            

            

            
          
      848. 
        
      
      
        
      
          
    848. 
            
            

            

              # Defines which key will be used when confirming an account
          
      849. 
        
      
      
        
      
          
    849. 
            
            

            

              # config.confirmation_keys = [:email]
          
      850. 
        
      
      
        
      
          
    850. 
            
            

            

            
          
      851. 
        
      
      
        
      
          
    851. 
            
            

            

              # ==> Configuration for :rememberable
          
      852. 
        
      
      
        
      
          
    852. 
            
            

            

              # The time the user will be remembered without asking for credentials again.
          
      853. 
        
      
      
        
      
          
    853. 
            
            

            

              # config.remember_for = 2.weeks
          
      854. 
        
      
      
        
      
          
    854. 
            
            

            

            
          
      855. 
        
      
      
        
      
          
    855. 
            
            

            

              # Invalidates all the remember me tokens when the user signs out.
          
      856. 
        
      
      
        
      
          
    856. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.expire_all_remember_me_on_sign_out = true
=======
            Devise.setup do |config|
>>>>>>> df37394 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ff4c2fe0 (Add login registration pages)
=======
=======
>>>>>>> 551f3c1 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 8f1baf1c (Add login registration pages)
=======
=======
>>>>>>> ccec311 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> dda81aa9 (Add login registration pages)
=======
=======
>>>>>>> 8c3e531 (Add login registration pages)
>>>>>>> 40a3d25f (Add login registration pages)
              config.expire_all_remember_me_on_sign_out = true
=======
            Devise.setup do |config|
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
=======
=======
            Devise.setup do |config|
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
=======
            Devise.setup do |config|
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 7d58507 (Add login registration pages)
=======
              config.expire_all_remember_me_on_sign_out = true
>>>>>>> 49e8a6c (Rebased)
=======
              config.expire_all_remember_me_on_sign_out = true
=======
            Devise.setup do |config|
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> 852864e (Add login registration pages)
<<<<<<< HEAD
>>>>>>> ff4c2fe0 (Add login registration pages)
=======
=======
>>>>>>> 551f3c1 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 8f1baf1c (Add login registration pages)
=======
=======
=======
            Devise.setup do |config|
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> ccec311 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> dda81aa9 (Add login registration pages)
=======
=======
=======
            Devise.setup do |config|
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 8c3e531 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 40a3d25f (Add login registration pages)
=======
=======
              config.expire_all_remember_me_on_sign_out = true
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
            Devise.setup do |config|
>>>>>>> 715fac2 (Featire specs)
>>>>>>> 73f364d8 (Featire specs)
          
      857. 
        
      
      
        
      
<<<<<<< HEAD
<<<<<<< HEAD
          
    857. 
            
            

            

            
          
      858. 
        
      
      
        
      
          
    858. 
            
            

            

              # If true, extends the user's remember period when remembered via cookie.
          
      859. 
        
      
      
        
      
          
    859. 
            
            

            

              # config.extend_remember_period = false
          
      860. 
        
      
      
        
      
          
    860. 
            
            

            

            
          
      861. 
        
      
      
        
      
          
    861. 
            
            

            

              # Options to be passed to the created cookie. For instance, you can set
          
      862. 
        
      
      
        
      
          
    862. 
            
            

            

              # secure: true in order to force SSL only cookies.
          
      863. 
        
      
      
        
      
          
    863. 
            
            

            

              # config.rememberable_options = {}
          
      864. 
        
      
      
        
      
          
    864. 
            
            

            

            
          
      865. 
        
      
      
        
      
          
    865. 
            
            

            

              # ==> Configuration for :validatable
          
      866. 
        
      
      
        
      
          
    866. 
            
            

            

              # Range for password length.
          
      867. 
        
      
      
        
      
          
    867. 
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 7d58507 (Add login registration pages)
=======
>>>>>>> 852864e (Add login registration pages)
<<<<<<< HEAD
>>>>>>> ff4c2fe0 (Add login registration pages)
=======
=======
>>>>>>> 551f3c1 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 8f1baf1c (Add login registration pages)
=======
=======
>>>>>>> ccec311 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> dda81aa9 (Add login registration pages)
=======
=======
>>>>>>> 8c3e531 (Add login registration pages)
>>>>>>> 40a3d25f (Add login registration pages)
          
    868. 
>>>>>>> bae2b7de (Add login registration pages)
            1
=======
          
    869. 
            
<<<<<<< HEAD
>>>>>>> 1214e1f (Add login registration pages)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 1214e1f (Add login registration pages)
=======
          
    870. 
            
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ccec311 (Add login registration pages)
=======
          
    871. 
            
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 7d58507 (Add login registration pages)
=======
          
    872. 
            1
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> 852864e (Add login registration pages)
<<<<<<< HEAD
>>>>>>> ff4c2fe0 (Add login registration pages)
=======
=======
>>>>>>> 551f3c1 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 8f1baf1c (Add login registration pages)
=======
=======
>>>>>>> ccec311 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> dda81aa9 (Add login registration pages)
=======
=======
=======
          
    873. 
            
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 8c3e531 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 40a3d25f (Add login registration pages)
=======
=======
          
    874. 
            1
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
          
    875. 
            
>>>>>>> 715fac2 (Featire specs)
>>>>>>> 73f364d8 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.password_length = 6..128
=======
              # The secret key used by Devise. Devise uses this key to generate
>>>>>>> df37394 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ff4c2fe0 (Add login registration pages)
=======
=======
>>>>>>> 551f3c1 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 8f1baf1c (Add login registration pages)
=======
=======
>>>>>>> ccec311 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> dda81aa9 (Add login registration pages)
=======
=======
>>>>>>> 8c3e531 (Add login registration pages)
>>>>>>> 40a3d25f (Add login registration pages)
              config.password_length = 6..128
=======
              # The secret key used by Devise. Devise uses this key to generate
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
=======
=======
              # The secret key used by Devise. Devise uses this key to generate
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
=======
              # The secret key used by Devise. Devise uses this key to generate
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 7d58507 (Add login registration pages)
=======
              config.password_length = 6..128
>>>>>>> 49e8a6c (Rebased)
=======
              config.password_length = 6..128
=======
              # The secret key used by Devise. Devise uses this key to generate
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> 852864e (Add login registration pages)
<<<<<<< HEAD
>>>>>>> ff4c2fe0 (Add login registration pages)
=======
=======
>>>>>>> 551f3c1 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 8f1baf1c (Add login registration pages)
=======
=======
=======
              # The secret key used by Devise. Devise uses this key to generate
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> ccec311 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> dda81aa9 (Add login registration pages)
=======
=======
=======
              # The secret key used by Devise. Devise uses this key to generate
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 8c3e531 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 40a3d25f (Add login registration pages)
=======
=======
              config.password_length = 6..128
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
              # The secret key used by Devise. Devise uses this key to generate
>>>>>>> 715fac2 (Featire specs)
>>>>>>> 73f364d8 (Featire specs)
          
      876. 
        
      
      
        
      
<<<<<<< HEAD
<<<<<<< HEAD
          
    876. 
            
            

            

            
          
      877. 
        
      
      
        
      
          
    877. 
            
            

            

              # Email regex used to validate email formats. It simply asserts that
          
      878. 
        
      
      
        
      
          
    878. 
            
            

            

              # one (and only one) @ exists in the given string. This is mainly
          
      879. 
        
      
      
        
      
          
    879. 
            
            

            

              # to give user feedback and not to assert the e-mail validity.
          
      880. 
        
      
      
        
      
          
    880. 
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 7d58507 (Add login registration pages)
=======
>>>>>>> 852864e (Add login registration pages)
<<<<<<< HEAD
>>>>>>> ff4c2fe0 (Add login registration pages)
=======
=======
>>>>>>> 551f3c1 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 8f1baf1c (Add login registration pages)
=======
=======
>>>>>>> ccec311 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> dda81aa9 (Add login registration pages)
=======
=======
>>>>>>> 8c3e531 (Add login registration pages)
>>>>>>> 40a3d25f (Add login registration pages)
          
    881. 
>>>>>>> bae2b7de (Add login registration pages)
            1
=======
          
    882. 
            
<<<<<<< HEAD
>>>>>>> 1214e1f (Add login registration pages)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 1214e1f (Add login registration pages)
=======
          
    883. 
            
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ccec311 (Add login registration pages)
=======
          
    884. 
            
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 7d58507 (Add login registration pages)
=======
          
    885. 
            1
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> 852864e (Add login registration pages)
<<<<<<< HEAD
>>>>>>> ff4c2fe0 (Add login registration pages)
=======
=======
>>>>>>> 551f3c1 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 8f1baf1c (Add login registration pages)
=======
=======
>>>>>>> ccec311 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> dda81aa9 (Add login registration pages)
=======
=======
=======
          
    886. 
            
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 8c3e531 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 40a3d25f (Add login registration pages)
=======
=======
          
    887. 
            1
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
          
    888. 
            
>>>>>>> 715fac2 (Featire specs)
>>>>>>> 73f364d8 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.email_regexp = /\A[^@\s]+@[^@\s]+\z/
=======
              # random tokens. Changing this key will render invalid all existing
>>>>>>> df37394 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ff4c2fe0 (Add login registration pages)
=======
=======
>>>>>>> 551f3c1 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 8f1baf1c (Add login registration pages)
=======
=======
>>>>>>> ccec311 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> dda81aa9 (Add login registration pages)
=======
=======
>>>>>>> 8c3e531 (Add login registration pages)
>>>>>>> 40a3d25f (Add login registration pages)
              config.email_regexp = /\A[^@\s]+@[^@\s]+\z/
=======
              # random tokens. Changing this key will render invalid all existing
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
=======
=======
              # random tokens. Changing this key will render invalid all existing
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
=======
              # random tokens. Changing this key will render invalid all existing
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 7d58507 (Add login registration pages)
=======
              config.email_regexp = /\A[^@\s]+@[^@\s]+\z/
>>>>>>> 49e8a6c (Rebased)
=======
              config.email_regexp = /\A[^@\s]+@[^@\s]+\z/
=======
              # random tokens. Changing this key will render invalid all existing
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> 852864e (Add login registration pages)
<<<<<<< HEAD
>>>>>>> ff4c2fe0 (Add login registration pages)
=======
=======
>>>>>>> 551f3c1 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 8f1baf1c (Add login registration pages)
=======
=======
=======
              # random tokens. Changing this key will render invalid all existing
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> ccec311 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> dda81aa9 (Add login registration pages)
=======
=======
=======
              # random tokens. Changing this key will render invalid all existing
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 8c3e531 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 40a3d25f (Add login registration pages)
=======
=======
              config.email_regexp = /\A[^@\s]+@[^@\s]+\z/
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
              # random tokens. Changing this key will render invalid all existing
>>>>>>> 715fac2 (Featire specs)
>>>>>>> 73f364d8 (Featire specs)
          
      889. 
        
      
      
        
      
<<<<<<< HEAD
<<<<<<< HEAD
          
    889. 
            
            

            

            
          
      890. 
        
      
      
        
      
          
    890. 
            
            

            

              # ==> Configuration for :timeoutable
          
      891. 
        
      
      
        
      
          
    891. 
            
            

            

              # The time you want to timeout the user session without activity. After this
          
      892. 
        
      
      
        
      
          
    892. 
            
            

            

              # time the user will be asked for credentials again. Default is 30 minutes.
          
      893. 
        
      
      
        
      
          
    893. 
            
            

            

              # config.timeout_in = 30.minutes
          
      894. 
        
      
      
        
      
          
    894. 
            
            

            

            
          
      895. 
        
      
      
        
      
          
    895. 
            
            

            

              # ==> Configuration for :lockable
          
      896. 
        
      
      
        
      
          
    896. 
            
            

            

              # Defines which strategy will be used to lock an account.
          
      897. 
        
      
      
        
      
          
    897. 
            
            

            

              # :failed_attempts = Locks an account after a number of failed attempts to sign in.
          
      898. 
        
      
      
        
      
          
    898. 
            
            

            

              # :none            = No lock strategy. You should handle locking by yourself.
          
      899. 
        
      
      
        
      
          
    899. 
            
            

            

              # config.lock_strategy = :failed_attempts
          
      900. 
        
      
      
        
      
          
    900. 
            
            

            

            
          
      901. 
        
      
      
        
      
          
    901. 
            
            

            

              # Defines which key will be used when locking and unlocking an account
          
      902. 
        
      
      
        
      
          
    902. 
            
            

            

              # config.unlock_keys = [:email]
          
      903. 
        
      
      
        
      
          
    903. 
            
            

            

            
          
      904. 
        
      
      
        
      
          
    904. 
            
            

            

              # Defines which strategy will be used to unlock an account.
          
      905. 
        
      
      
        
      
          
    905. 
            
            

            

              # :email = Sends an unlock link to the user email
          
      906. 
        
      
      
        
      
          
    906. 
            
            

            

              # :time  = Re-enables login after a certain amount of time (see :unlock_in below)
          
      907. 
        
      
      
        
      
          
    907. 
            
            

            

              # :both  = Enables both strategies
          
      908. 
        
      
      
        
      
          
    908. 
            
            

            

              # :none  = No unlock strategy. You should handle unlocking by yourself.
          
      909. 
        
      
      
        
      
          
    909. 
            
            

            

              # config.unlock_strategy = :both
          
      910. 
        
      
      
        
      
          
    910. 
            
            

            

            
          
      911. 
        
      
      
        
      
          
    911. 
            
            

            

              # Number of authentication tries before locking an account if lock_strategy
          
      912. 
        
      
      
        
      
          
    912. 
            
            

            

              # is failed attempts.
          
      913. 
        
      
      
        
      
          
    913. 
            
            

            

              # config.maximum_attempts = 20
          
      914. 
        
      
      
        
      
          
    914. 
            
            

            

            
          
      915. 
        
      
      
        
      
          
    915. 
            
            

            

              # Time interval to unlock the account if :time is enabled as unlock_strategy.
          
      916. 
        
      
      
        
      
          
    916. 
            
            

            

              # config.unlock_in = 1.hour
          
      917. 
        
      
      
        
      
          
    917. 
            
            

            

            
          
      918. 
        
      
      
        
      
          
    918. 
            
            

            

              # Warn on the last attempt before the account is locked.
          
      919. 
        
      
      
        
      
          
    919. 
            
            

            

              # config.last_attempt_warning = true
          
      920. 
        
      
      
        
      
          
    920. 
            
            

            

            
          
      921. 
        
      
      
        
      
          
    921. 
            
            

            

              # ==> Configuration for :recoverable
          
      922. 
        
      
      
        
      
          
    922. 
            
            

            

              #
          
      923. 
        
      
      
        
      
          
    923. 
            
            

            

              # Defines which key will be used when recovering the password for an account
          
      924. 
        
      
      
        
      
          
    924. 
            
            

            

              # config.reset_password_keys = [:email]
          
      925. 
        
      
      
        
      
          
    925. 
            
            

            

            
          
      926. 
        
      
      
        
      
          
    926. 
            
            

            

              # Time interval you can reset your password with a reset password key.
          
      927. 
        
      
      
        
      
          
    927. 
            
            

            

              # Don't put a too small interval or your users won't have the time to
          
      928. 
        
      
      
        
      
          
    928. 
            
            

            

              # change their passwords.
          
      929. 
        
      
      
        
      
          
    929. 
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 7d58507 (Add login registration pages)
=======
>>>>>>> 852864e (Add login registration pages)
<<<<<<< HEAD
>>>>>>> ff4c2fe0 (Add login registration pages)
=======
=======
>>>>>>> 551f3c1 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 8f1baf1c (Add login registration pages)
=======
=======
>>>>>>> ccec311 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> dda81aa9 (Add login registration pages)
=======
=======
>>>>>>> 8c3e531 (Add login registration pages)
>>>>>>> 40a3d25f (Add login registration pages)
          
    930. 
>>>>>>> bae2b7de (Add login registration pages)
            1
=======
          
    931. 
            
<<<<<<< HEAD
>>>>>>> 1214e1f (Add login registration pages)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 1214e1f (Add login registration pages)
=======
          
    932. 
            
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ccec311 (Add login registration pages)
=======
          
    933. 
            
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 7d58507 (Add login registration pages)
=======
          
    934. 
            1
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> 852864e (Add login registration pages)
<<<<<<< HEAD
>>>>>>> ff4c2fe0 (Add login registration pages)
=======
=======
>>>>>>> 551f3c1 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 8f1baf1c (Add login registration pages)
=======
=======
>>>>>>> ccec311 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> dda81aa9 (Add login registration pages)
=======
=======
=======
          
    935. 
            
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 8c3e531 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 40a3d25f (Add login registration pages)
=======
=======
          
    936. 
            1
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
          
    937. 
            
>>>>>>> 715fac2 (Featire specs)
>>>>>>> 73f364d8 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.reset_password_within = 6.hours
=======
              # confirmation, reset password and unlock tokens in the database.
>>>>>>> df37394 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ff4c2fe0 (Add login registration pages)
=======
=======
>>>>>>> 551f3c1 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 8f1baf1c (Add login registration pages)
=======
=======
>>>>>>> ccec311 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> dda81aa9 (Add login registration pages)
=======
=======
>>>>>>> 8c3e531 (Add login registration pages)
>>>>>>> 40a3d25f (Add login registration pages)
              config.reset_password_within = 6.hours
=======
              # confirmation, reset password and unlock tokens in the database.
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
=======
=======
              # confirmation, reset password and unlock tokens in the database.
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
=======
              # confirmation, reset password and unlock tokens in the database.
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 7d58507 (Add login registration pages)
=======
              config.reset_password_within = 6.hours
>>>>>>> 49e8a6c (Rebased)
=======
              config.reset_password_within = 6.hours
=======
              # confirmation, reset password and unlock tokens in the database.
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> 852864e (Add login registration pages)
<<<<<<< HEAD
>>>>>>> ff4c2fe0 (Add login registration pages)
=======
=======
>>>>>>> 551f3c1 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 8f1baf1c (Add login registration pages)
=======
=======
=======
              # confirmation, reset password and unlock tokens in the database.
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> ccec311 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> dda81aa9 (Add login registration pages)
=======
=======
=======
              # confirmation, reset password and unlock tokens in the database.
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 8c3e531 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 40a3d25f (Add login registration pages)
=======
=======
              config.reset_password_within = 6.hours
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
              # confirmation, reset password and unlock tokens in the database.
>>>>>>> 715fac2 (Featire specs)
>>>>>>> 73f364d8 (Featire specs)
          
      938. 
        
      
      
        
      
<<<<<<< HEAD
<<<<<<< HEAD
          
    938. 
            
            

            

            
          
      939. 
        
      
      
        
      
          
    939. 
            
            

            

              # When set to false, does not sign a user in automatically after their password is
          
      940. 
        
      
      
        
      
          
    940. 
            
            

            

              # reset. Defaults to true, so a user is signed in automatically after a reset.
          
      941. 
        
      
      
        
      
          
    941. 
            
            

            

              # config.sign_in_after_reset_password = true
          
      942. 
        
      
      
        
      
          
    942. 
            
            

            

            
          
      943. 
        
      
      
        
      
          
    943. 
            
            

            

              # ==> Configuration for :encryptable
          
      944. 
        
      
      
        
      
          
    944. 
            
            

            

              # Allow you to use another hashing or encryption algorithm besides bcrypt (default).
          
      945. 
        
      
      
        
      
          
    945. 
            
            

            

              # You can use :sha1, :sha512 or algorithms from others authentication tools as
          
      946. 
        
      
      
        
      
          
    946. 
            
            

            

              # :clearance_sha1, :authlogic_sha512 (then you should set stretches above to 20
          
      947. 
        
      
      
        
      
          
    947. 
            
            

            

              # for default behavior) and :restful_authentication_sha1 (then you should set
          
      948. 
        
      
      
        
      
          
    948. 
            
            

            

              # stretches to 10, and copy REST_AUTH_SITE_KEY to pepper).
          
      949. 
        
      
      
        
      
          
    949. 
            
            

            

              #
          
      950. 
        
      
      
        
      
          
    950. 
            
            

            

              # Require the `devise-encryptable` gem when using anything other than bcrypt
          
      951. 
        
      
      
        
      
          
    951. 
            
            

            

              # config.encryptor = :sha512
          
      952. 
        
      
      
        
      
          
    952. 
            
            

            

            
          
      953. 
        
      
      
        
      
          
    953. 
            
            

            

              # ==> Scopes configuration
          
      954. 
        
      
      
        
      
          
    954. 
            
            

            

              # Turn scoped views on. Before rendering "sessions/new", it will first check for
          
      955. 
        
      
      
        
      
          
    955. 
            
            

            

              # "users/sessions/new". It's turned off by default because it's slower if you
          
      956. 
        
      
      
        
      
          
    956. 
            
            

            

              # are using only default views.
          
      957. 
        
      
      
        
      
          
    957. 
            
            

            

              # config.scoped_views = false
          
      958. 
        
      
      
        
      
          
    958. 
            
            

            

            
          
      959. 
        
      
      
        
      
          
    959. 
            
            

            

              # Configure the default scope given to Warden. By default it's the first
          
      960. 
        
      
      
        
      
          
    960. 
            
            

            

              # devise role declared in your routes (usually :user).
          
      961. 
        
      
      
        
      
          
    961. 
            
            

            

              # config.default_scope = :user
          
      962. 
        
      
      
        
      
          
    962. 
            
            

            

            
          
      963. 
        
      
      
        
      
          
    963. 
            
            

            

              # Set this configuration to false if you want /users/sign_out to sign out
          
      964. 
        
      
      
        
      
          
    964. 
            
            

            

              # only the current scope. By default, Devise signs out all scopes.
          
      965. 
        
      
      
        
      
          
    965. 
            
            

            

              # config.sign_out_all_scopes = true
          
      966. 
        
      
      
        
      
          
    966. 
            
            

            

            
          
      967. 
        
      
      
        
      
          
    967. 
            
            

            

              # ==> Navigation configuration
          
      968. 
        
      
      
        
      
          
    968. 
            
            

            

              # Lists the formats that should be treated as navigational. Formats like
          
      969. 
        
      
      
        
      
          
    969. 
            
            

            

              # :html, should redirect to the sign in page when the user does not have
          
      970. 
        
      
      
        
      
          
    970. 
            
            

            

              # access, but formats like :xml or :json, should return 401.
          
      971. 
        
      
      
        
      
          
    971. 
            
            

            

              #
          
      972. 
        
      
      
        
      
          
    972. 
            
            

            

              # If you have any extra navigational formats, like :iphone or :mobile, you
          
      973. 
        
      
      
        
      
          
    973. 
            
            

            

              # should add them to the navigational formats lists.
          
      974. 
        
      
      
        
      
          
    974. 
            
            

            

              #
          
      975. 
        
      
      
        
      
          
    975. 
            
            

            

              # The "*/*" below is required to match Internet Explorer requests.
          
      976. 
        
      
      
        
      
          
    976. 
            
            

            

              # config.navigational_formats = ['*/*', :html]
          
      977. 
        
      
      
        
      
          
    977. 
            
            

            

            
          
      978. 
        
      
      
        
      
          
    978. 
            
            

            

              # The default HTTP method used to sign out a resource. Default is :delete.
          
      979. 
        
      
      
        
      
          
    979. 
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 7d58507 (Add login registration pages)
=======
>>>>>>> 852864e (Add login registration pages)
<<<<<<< HEAD
>>>>>>> ff4c2fe0 (Add login registration pages)
=======
=======
>>>>>>> 551f3c1 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 8f1baf1c (Add login registration pages)
=======
=======
>>>>>>> ccec311 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> dda81aa9 (Add login registration pages)
=======
=======
>>>>>>> 8c3e531 (Add login registration pages)
>>>>>>> 40a3d25f (Add login registration pages)
          
    980. 
>>>>>>> bae2b7de (Add login registration pages)
            1
=======
          
    981. 
            
<<<<<<< HEAD
>>>>>>> 1214e1f (Add login registration pages)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 1214e1f (Add login registration pages)
=======
          
    982. 
            
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ccec311 (Add login registration pages)
=======
          
    983. 
            
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 7d58507 (Add login registration pages)
=======
          
    984. 
            1
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> 852864e (Add login registration pages)
<<<<<<< HEAD
>>>>>>> ff4c2fe0 (Add login registration pages)
=======
=======
>>>>>>> 551f3c1 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 8f1baf1c (Add login registration pages)
=======
=======
>>>>>>> ccec311 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> dda81aa9 (Add login registration pages)
=======
=======
=======
          
    985. 
            
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 8c3e531 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 40a3d25f (Add login registration pages)
=======
=======
          
    986. 
            1
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
          
    987. 
            
>>>>>>> 715fac2 (Featire specs)
>>>>>>> 73f364d8 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.sign_out_via = :delete
=======
              # Devise will use the `secret_key_base` as its `secret_key`
>>>>>>> df37394 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ff4c2fe0 (Add login registration pages)
=======
=======
>>>>>>> 551f3c1 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 8f1baf1c (Add login registration pages)
=======
=======
>>>>>>> ccec311 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> dda81aa9 (Add login registration pages)
=======
=======
>>>>>>> 8c3e531 (Add login registration pages)
>>>>>>> 40a3d25f (Add login registration pages)
              config.sign_out_via = :delete
=======
              # Devise will use the `secret_key_base` as its `secret_key`
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
=======
=======
              # Devise will use the `secret_key_base` as its `secret_key`
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
=======
              # Devise will use the `secret_key_base` as its `secret_key`
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 7d58507 (Add login registration pages)
=======
              config.sign_out_via = :delete
>>>>>>> 49e8a6c (Rebased)
=======
              config.sign_out_via = :delete
=======
              # Devise will use the `secret_key_base` as its `secret_key`
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> 852864e (Add login registration pages)
<<<<<<< HEAD
>>>>>>> ff4c2fe0 (Add login registration pages)
=======
=======
>>>>>>> 551f3c1 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 8f1baf1c (Add login registration pages)
=======
=======
=======
              # Devise will use the `secret_key_base` as its `secret_key`
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> ccec311 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> dda81aa9 (Add login registration pages)
=======
=======
=======
              # Devise will use the `secret_key_base` as its `secret_key`
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 8c3e531 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 40a3d25f (Add login registration pages)
=======
=======
              config.sign_out_via = :delete
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
              # Devise will use the `secret_key_base` as its `secret_key`
>>>>>>> 715fac2 (Featire specs)
>>>>>>> 73f364d8 (Featire specs)
          
      988. 
        
      
      
        
      
<<<<<<< HEAD
<<<<<<< HEAD
          
    988. 
            
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 7d58507 (Add login registration pages)
=======
>>>>>>> 852864e (Add login registration pages)
<<<<<<< HEAD
>>>>>>> ff4c2fe0 (Add login registration pages)
=======
=======
>>>>>>> 551f3c1 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 8f1baf1c (Add login registration pages)
=======
=======
>>>>>>> ccec311 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> dda81aa9 (Add login registration pages)
=======
=======
>>>>>>> 8c3e531 (Add login registration pages)
>>>>>>> 40a3d25f (Add login registration pages)
          
    989. 
            1
=======
          
    990. 
            
<<<<<<< HEAD
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> bae2b7de (Add login registration pages)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 1214e1f (Add login registration pages)
=======
          
    991. 
            
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ccec311 (Add login registration pages)
=======
          
    992. 
            
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 7d58507 (Add login registration pages)
=======
          
    993. 
            1
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> 852864e (Add login registration pages)
<<<<<<< HEAD
>>>>>>> ff4c2fe0 (Add login registration pages)
=======
=======
>>>>>>> 551f3c1 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 8f1baf1c (Add login registration pages)
=======
=======
>>>>>>> ccec311 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> dda81aa9 (Add login registration pages)
=======
=======
=======
          
    994. 
            
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 8c3e531 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 40a3d25f (Add login registration pages)
=======
=======
          
    995. 
            1
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
          
    996. 
            
>>>>>>> 715fac2 (Featire specs)
>>>>>>> 73f364d8 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
            
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.omniauth :facebook,
>>>>>>> ff4c2fe0 (Add login registration pages)
=======
<<<<<<< HEAD
=======
>>>>>>> 551f3c1 (Add login registration pages)
=======
>>>>>>> ccec311 (Add login registration pages)
=======
>>>>>>> 8c3e531 (Add login registration pages)
              config.omniauth :facebook,
=======
              # by default. You can change it below and use your own secret key.
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
>>>>>>> bae2b7de (Add login registration pages)
=======
=======
              # by default. You can change it below and use your own secret key.
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
=======
              # by default. You can change it below and use your own secret key.
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 7d58507 (Add login registration pages)
=======
              config.omniauth :facebook,
>>>>>>> 49e8a6c (Rebased)
=======
              config.omniauth :facebook,
=======
              # by default. You can change it below and use your own secret key.
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> 852864e (Add login registration pages)
<<<<<<< HEAD
>>>>>>> ff4c2fe0 (Add login registration pages)
=======
=======
>>>>>>> 551f3c1 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 8f1baf1c (Add login registration pages)
=======
=======
=======
              # by default. You can change it below and use your own secret key.
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> ccec311 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> dda81aa9 (Add login registration pages)
=======
=======
=======
              # by default. You can change it below and use your own secret key.
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 8c3e531 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 40a3d25f (Add login registration pages)
=======
=======
              config.omniauth :facebook,
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
              # by default. You can change it below and use your own secret key.
>>>>>>> 715fac2 (Featire specs)
>>>>>>> 73f364d8 (Featire specs)
          
      997. 
        
      
      
        
      
          
    997. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
              # ==> OmniAuth
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                              Rails.application.credentials.dig(:facebook, :FACEBOOK_ID),
>>>>>>> ff4c2fe0 (Add login registration pages)
=======
<<<<<<< HEAD
=======
>>>>>>> 551f3c1 (Add login registration pages)
=======
>>>>>>> ccec311 (Add login registration pages)
=======
>>>>>>> 8c3e531 (Add login registration pages)
                              Rails.application.credentials.dig(:facebook, :FACEBOOK_ID),
=======
              # config.secret_key = 'b0412bb2e70b23477c2527471c87d55e4ca905e45d6533ac6a021ef302571810a86cd1b0c244fc8e83ef34f986e1b646bcd9cb7867b14799f6042ffc17267c24'
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
>>>>>>> bae2b7de (Add login registration pages)
=======
=======
              # config.secret_key = 'b0412bb2e70b23477c2527471c87d55e4ca905e45d6533ac6a021ef302571810a86cd1b0c244fc8e83ef34f986e1b646bcd9cb7867b14799f6042ffc17267c24'
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
=======
              # config.secret_key = 'b0412bb2e70b23477c2527471c87d55e4ca905e45d6533ac6a021ef302571810a86cd1b0c244fc8e83ef34f986e1b646bcd9cb7867b14799f6042ffc17267c24'
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 7d58507 (Add login registration pages)
=======
                              Rails.application.credentials.dig(:facebook, :FACEBOOK_ID),
>>>>>>> 49e8a6c (Rebased)
=======
                              Rails.application.credentials.dig(:facebook, :FACEBOOK_ID),
=======
              # config.secret_key = 'b0412bb2e70b23477c2527471c87d55e4ca905e45d6533ac6a021ef302571810a86cd1b0c244fc8e83ef34f986e1b646bcd9cb7867b14799f6042ffc17267c24'
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> 852864e (Add login registration pages)
<<<<<<< HEAD
>>>>>>> ff4c2fe0 (Add login registration pages)
=======
=======
>>>>>>> 551f3c1 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 8f1baf1c (Add login registration pages)
=======
=======
=======
              # config.secret_key = 'b0412bb2e70b23477c2527471c87d55e4ca905e45d6533ac6a021ef302571810a86cd1b0c244fc8e83ef34f986e1b646bcd9cb7867b14799f6042ffc17267c24'
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> ccec311 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> dda81aa9 (Add login registration pages)
=======
=======
=======
              # config.secret_key = 'b0412bb2e70b23477c2527471c87d55e4ca905e45d6533ac6a021ef302571810a86cd1b0c244fc8e83ef34f986e1b646bcd9cb7867b14799f6042ffc17267c24'
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 8c3e531 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 40a3d25f (Add login registration pages)
=======
=======
                              Rails.application.credentials.dig(:facebook, :FACEBOOK_ID),
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
              # config.secret_key = 'b0412bb2e70b23477c2527471c87d55e4ca905e45d6533ac6a021ef302571810a86cd1b0c244fc8e83ef34f986e1b646bcd9cb7867b14799f6042ffc17267c24'
>>>>>>> 715fac2 (Featire specs)
>>>>>>> 73f364d8 (Featire specs)
          
      998. 
        
      
      
        
      
          
    998. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
              # Add a new OmniAuth provider. Check the wiki for more information on setting
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                              Rails.application.credentials.dig(:facebook, :FACEBOOK_SECRET),
>>>>>>> ff4c2fe0 (Add login registration pages)
=======
<<<<<<< HEAD
=======
>>>>>>> 551f3c1 (Add login registration pages)
=======
>>>>>>> ccec311 (Add login registration pages)
=======
>>>>>>> 8c3e531 (Add login registration pages)
                              Rails.application.credentials.dig(:facebook, :FACEBOOK_SECRET),
=======
            
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
>>>>>>> bae2b7de (Add login registration pages)
=======
=======
            
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
=======
            
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 7d58507 (Add login registration pages)
=======
                              Rails.application.credentials.dig(:facebook, :FACEBOOK_SECRET),
>>>>>>> 49e8a6c (Rebased)
=======
                              Rails.application.credentials.dig(:facebook, :FACEBOOK_SECRET),
=======
            
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> 852864e (Add login registration pages)
<<<<<<< HEAD
>>>>>>> ff4c2fe0 (Add login registration pages)
=======
=======
>>>>>>> 551f3c1 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 8f1baf1c (Add login registration pages)
=======
=======
=======
            
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> ccec311 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> dda81aa9 (Add login registration pages)
=======
=======
=======
            
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 8c3e531 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 40a3d25f (Add login registration pages)
=======
=======
                              Rails.application.credentials.dig(:facebook, :FACEBOOK_SECRET),
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
            
>>>>>>> 715fac2 (Featire specs)
>>>>>>> 73f364d8 (Featire specs)
          
      999. 
        
      
      
        
      
          
    999. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
              # up on your models and hooks.
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                              scope: 'email', info_fields: 'email,name'
>>>>>>> ff4c2fe0 (Add login registration pages)
=======
<<<<<<< HEAD
=======
>>>>>>> 551f3c1 (Add login registration pages)
=======
>>>>>>> ccec311 (Add login registration pages)
=======
>>>>>>> 8c3e531 (Add login registration pages)
                              scope: 'email', info_fields: 'email,name'
=======
              # ==> Controller configuration
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
>>>>>>> bae2b7de (Add login registration pages)
=======
=======
              # ==> Controller configuration
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
=======
              # ==> Controller configuration
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 7d58507 (Add login registration pages)
=======
                              scope: 'email', info_fields: 'email,name'
>>>>>>> 49e8a6c (Rebased)
=======
                              scope: 'email', info_fields: 'email,name'
=======
              # ==> Controller configuration
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> 852864e (Add login registration pages)
<<<<<<< HEAD
>>>>>>> ff4c2fe0 (Add login registration pages)
=======
=======
>>>>>>> 551f3c1 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 8f1baf1c (Add login registration pages)
=======
=======
=======
              # ==> Controller configuration
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> ccec311 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> dda81aa9 (Add login registration pages)
=======
=======
=======
              # ==> Controller configuration
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 8c3e531 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 40a3d25f (Add login registration pages)
=======
=======
                              scope: 'email', info_fields: 'email,name'
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
              # ==> Controller configuration
>>>>>>> 715fac2 (Featire specs)
>>>>>>> 73f364d8 (Featire specs)
          
      1000. 
        
      
      
        
      
          
    1000. 
            
            

            

              # config.omniauth :github, 'APP_ID', 'APP_SECRET', scope: 'user,public_repo'
          
      1001. 
        
      
      
        
      
          
    1001. 
            
            

            

            
          
      1002. 
        
      
      
        
      
          
    1002. 
            
            

            

              # ==> Warden configuration
          
      1003. 
        
      
      
        
      
          
    1003. 
            
            

            

              # If you want to use other strategies, that are not supported by Devise, or
          
      1004. 
        
      
      
        
      
          
    1004. 
            
            

            

              # change the failure app, you can configure them inside the config.warden block.
          
      1005. 
        
      
      
        
      
          
    1005. 
            
            

            

              #
          
      1006. 
        
      
      
        
      
          
    1006. 
            
            

            

              # config.warden do |manager|
          
      1007. 
        
      
      
        
      
          
    1007. 
            
            

            

              #   manager.intercept_401 = false
          
      1008. 
        
      
      
        
      
          
    1008. 
            
            

            

              #   manager.default_strategies(scope: :user).unshift :some_external_strategy
          
      1009. 
        
      
      
        
      
          
    1009. 
            
            

            

              # end
          
      1010. 
        
      
      
        
      
          
    1010. 
            
            

            

            
          
      1011. 
        
      
      
        
      
          
    1011. 
            
            

            

              # ==> Mountable engine configurations
          
      1012. 
        
      
      
        
      
          
    1012. 
            
            

            

              # When using Devise inside an engine, let's call it `MyEngine`, and this engine
          
      1013. 
        
      
      
        
      
          
    1013. 
            
            

            

              # is mountable, there are some extra configurations to be taken into account.
          
      1014. 
        
      
      
        
      
          
    1014. 
            
            

            

              # The following options are available, assuming the engine is mounted as:
          
      1015. 
        
      
      
        
      
          
    1015. 
            
            

            

              #
          
      1016. 
        
      
      
        
      
          
    1016. 
            
            

            

              #     mount MyEngine, at: '/my_engine'
          
      1017. 
        
      
      
        
      
          
    1017. 
            
            

            

              #
          
      1018. 
        
      
      
        
      
          
    1018. 
            
            

            

              # The router that invoked `devise_for`, in the example above, would be:
          
      1019. 
        
      
      
        
      
          
    1019. 
            
            

            

              # config.router_name = :my_engine
          
      1020. 
        
      
      
        
      
          
    1020. 
            
            

            

              #
          
      1021. 
        
      
      
        
      
          
    1021. 
            
            

            

              # When using OmniAuth, Devise cannot automatically set OmniAuth path,
          
      1022. 
        
      
      
        
      
          
    1022. 
            
            

            

              # so you need to do it manually. For the users scope, it would be:
          
      1023. 
        
      
      
        
      
          
    1023. 
            
            

            

              # config.omniauth_path_prefix = '/my_engine/users/auth'
          
      1024. 
        
      
      
        
      
          
    1024. 
            
            

            

            
          
      1025. 
        
      
      
        
      
          
    1025. 
            
            

            

              # ==> Turbolinks configuration
          
      1026. 
        
      
      
        
      
          
    1026. 
            
            

            

              # If your app is using Turbolinks, Turbolinks::Controller needs to be included to make redirection work correctly:
          
      1027. 
        
      
      
        
      
          
    1027. 
            
            

            

              #
          
      1028. 
        
      
      
        
      
          
    1028. 
            
            

            

              # ActiveSupport.on_load(:devise_failure_app) do
          
      1029. 
        
      
      
        
      
          
    1029. 
            
            

            

              #   include Turbolinks::Controller
          
      1030. 
        
      
      
        
      
          
    1030. 
            
            

            

              # end
          
      1031. 
        
      
      
        
      
          
    1031. 
            
            

            

            
          
      1032. 
        
      
      
        
      
          
    1032. 
            
            

            

              # ==> Configuration for :registerable
          
      1033. 
        
      
      
        
      
          
    1033. 
            
            

            

            
          
      1034. 
        
      
      
        
      
          
    1034. 
            
            

            

              # When set to false, does not sign a user in automatically after their password is
          
      1035. 
        
      
      
        
      
          
    1035. 
            
            

            

              # changed. Defaults to true, so a user is signed in automatically after changing a password.
          
      1036. 
        
      
      
        
      
          
    1036. 
            
            

            

              # config.sign_in_after_change_password = true
          
      1037. 
        
      
      
        
      
          
    1037. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9bfbd88 (Featire specs)
<<<<<<< HEAD
>>>>>>> ebcdce06 (Featire specs)
=======
>>>>>>> 1d11874 (Add login registration pages)
=======
>>>>>>> 06e5e41 (Add login registration pages)
=======
>>>>>>> 385136b (Add login registration pages)
=======
>>>>>>> 1c33e01 (Add login registration pages)
=======
>>>>>>> 9e081dc (Fix)
=======
>>>>>>> fb61c5a (Featire specs)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> ccec311 (Add login registration pages)
=======
>>>>>>> 8c3e531 (Add login registration pages)
=======
=======
=======
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 56fd9d41 (Add login registration pages)
=======
=======
=======
>>>>>>> c51bf93 (Featire specs)
>>>>>>> 7a08014b (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> dda81aa9 (Add login registration pages)
=======
>>>>>>> 40a3d25f (Add login registration pages)
=======
=======
>>>>>>> c51bf93 (Featire specs)
=======
=======
>>>>>>> 385136b (Add login registration pages)
=======
>>>>>>> 1c33e01 (Add login registration pages)
>>>>>>> 7d58507 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 31507b8 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> a8b17c32 (Add login registration pages)
=======
=======
=======
=======
>>>>>>> 852864e (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 1d11874 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> ff4c2fe0 (Add login registration pages)
=======
=======
=======
=======
=======
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 551f3c1 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 06e5e41 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 8f1baf1c (Add login registration pages)
=======
=======
=======
>>>>>>> ccec311 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 385136b (Add login registration pages)
<<<<<<< HEAD
>>>>>>> dda81aa9 (Add login registration pages)
=======
=======
=======
=======
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 8c3e531 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 1c33e01 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 40a3d25f (Add login registration pages)
=======
=======
=======
>>>>>>> 715fac2 (Featire specs)
>>>>>>> fb61c5a (Featire specs)
>>>>>>> 73f364d8 (Featire specs)
              # Configure the parent class to the devise controllers.
          
      1038. 
        
      
      
        
      
          
    1038. 
            
            

            

              # config.parent_controller = 'DeviseController'
          
      1039. 
        
      
      
        
      
          
    1039. 
            
            

            

            
          
      1040. 
        
      
      
        
      
          
    1040. 
            
            

            

              # ==> Mailer Configuration
          
      1041. 
        
      
      
        
      
          
    1041. 
            
            

            

              # Configure the e-mail address which will be shown in Devise::Mailer,
          
      1042. 
        
      
      
        
      
          
    1042. 
            
            

            

              # note that it will be overwritten if you use your own mailer class
          
      1043. 
        
      
      
        
      
          
    1043. 
            
            

            

              # with default "from" parameter.
          
      1044. 
        
      
      
        
      
          
    1044. 
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> f92a45b (Featire specs)
            1
            

            

              config.mailer_sender = 'please-change-me-at-config-initializers-devise@example.com'
          
      1045. 
        
      
      
        
      
          
    1045. 
            
            

            

            
          
      1046. 
        
      
      
        
      
          
    1046. 
            
            

            

              # Configure the class responsible to send e-mails.
          
      1047. 
        
      
      
        
      
          
    1047. 
            
            

            

              # config.mailer = 'Devise::Mailer'
          
      1048. 
        
      
      
        
      
          
    1048. 
            
            

            

            
          
      1049. 
        
      
      
        
      
          
    1049. 
            
            

            

              # Configure the parent class responsible to send e-mails.
          
      1050. 
        
      
      
        
      
          
    1050. 
            
            

            

              # config.parent_mailer = 'ActionMailer::Base'
          
      1051. 
        
      
      
        
      
          
    1051. 
            
            

            

            
          
      1052. 
        
      
      
        
      
          
    1052. 
            
            

            

              # ==> ORM configuration
          
      1053. 
        
      
      
        
      
          
    1053. 
            
            

            

              # Load and configure the ORM. Supports :active_record (default) and
          
      1054. 
        
      
      
        
      
          
    1054. 
            
            

            

              # :mongoid (bson_ext recommended) by default. Other ORMs may be
          
      1055. 
        
      
      
        
      
          
    1055. 
            
            

            

              # available as additional gems.
          
      1056. 
        
      
      
        
      
          
    1056. 
            1
            

            

              require 'devise/orm/active_record'
          
      1057. 
        
      
      
        
      
          
    1057. 
            
            

            

            
          
      1058. 
        
      
      
        
      
          
    1058. 
            
            

            

              # ==> Configuration for any authentication mechanism
          
      1059. 
        
      
      
        
      
          
    1059. 
            
            

            

              # Configure which keys are used when authenticating a user. The default is
          
      1060. 
        
      
      
        
      
          
    1060. 
            
            

            

              # just :email. You can configure it to use [:username, :subdomain], so for
          
      1061. 
        
      
      
        
      
          
    1061. 
            
            

            

              # authenticating a user, both parameters are required. Remember that those
          
      1062. 
        
      
      
        
      
          
    1062. 
            
            

            

              # parameters are used only when authenticating and not when retrieving from
          
      1063. 
        
      
      
        
      
          
    1063. 
            
            

            

              # session. If you need permissions, you should implement that in a before filter.
          
      1064. 
        
      
      
        
      
          
    1064. 
            
            

            

              # You can also supply a hash where the value is a boolean determining whether
          
      1065. 
        
      
      
        
      
          
    1065. 
            
            

            

              # or not authentication should be aborted when the value is not present.
          
      1066. 
        
      
      
        
      
          
    1066. 
            
            

            

              # config.authentication_keys = [:email]
          
      1067. 
        
      
      
        
      
          
    1067. 
            
            

            

            
          
      1068. 
        
      
      
        
      
          
    1068. 
            
            

            

              # Configure parameters from the request object used for authentication. Each entry
          
      1069. 
        
      
      
        
      
          
    1069. 
            
            

            

              # given should be a request method and it will automatically be passed to the
          
      1070. 
        
      
      
        
      
          
    1070. 
            
            

            

              # find_for_authentication method and considered in your model lookup. For instance,
          
      1071. 
        
      
      
        
      
          
    1071. 
            
            

            

              # if you set :request_keys to [:subdomain], :subdomain will be used on authentication.
          
      1072. 
        
      
      
        
      
          
    1072. 
            
            

            

              # The same considerations mentioned for authentication_keys also apply to request_keys.
          
      1073. 
        
      
      
        
      
          
    1073. 
            
            

            

              # config.request_keys = []
          
      1074. 
        
      
      
        
      
          
    1074. 
            
            

            

            
          
      1075. 
        
      
      
        
      
          
    1075. 
            
            

            

              # Configure which authentication keys should be case-insensitive.
          
      1076. 
        
      
      
        
      
          
    1076. 
            
            

            

              # These keys will be downcased upon creating or modifying a user and when used
          
      1077. 
        
      
      
        
      
          
    1077. 
            
            

            

              # to authenticate or find a user. Default is :email.
          
      1078. 
        
      
      
        
      
          
    1078. 
            1
            

            

              config.case_insensitive_keys = [:email]
          
      1079. 
        
      
      
        
      
          
    1079. 
            
            

            

            
          
      1080. 
        
      
      
        
      
          
    1080. 
            
            

            

              # Configure which authentication keys should have whitespace stripped.
          
      1081. 
        
      
      
        
      
          
    1081. 
            
            

            

              # These keys will have whitespace before and after removed upon creating or
          
      1082. 
        
      
      
        
      
          
    1082. 
            
            

            

              # modifying a user and when used to authenticate or find a user. Default is :email.
          
      1083. 
        
      
      
        
      
          
    1083. 
            1
            

            

              config.strip_whitespace_keys = [:email]
          
      1084. 
        
      
      
        
      
          
    1084. 
            
            

            

            
          
      1085. 
        
      
      
        
      
          
    1085. 
            
            

            

              # Tell if authentication through request.params is enabled. True by default.
          
      1086. 
        
      
      
        
      
          
    1086. 
            
            

            

              # It can be set to an array that will enable params authentication only for the
          
      1087. 
        
      
      
        
      
          
    1087. 
            
            

            

              # given strategies, for example, `config.params_authenticatable = [:database]` will
          
      1088. 
        
      
      
        
      
          
    1088. 
            
            

            

              # enable it only for database (email + password) authentication.
          
      1089. 
        
      
      
        
      
          
    1089. 
            
            

            

              # config.params_authenticatable = true
          
      1090. 
        
      
      
        
      
          
    1090. 
            
            

            

            
          
      1091. 
        
      
      
        
      
          
    1091. 
            
            

            

              # Tell if authentication through HTTP Auth is enabled. False by default.
          
      1092. 
        
      
      
        
      
          
    1092. 
            
            

            

              # It can be set to an array that will enable http authentication only for the
          
      1093. 
        
      
      
        
      
          
    1093. 
            
            

            

              # given strategies, for example, `config.http_authenticatable = [:database]` will
          
      1094. 
        
      
      
        
      
          
    1094. 
            
            

            

              # enable it only for database authentication.
          
      1095. 
        
      
      
        
      
          
    1095. 
            
            

            

              # For API-only applications to support authentication "out-of-the-box", you will likely want to
          
      1096. 
        
      
      
        
      
          
    1096. 
            
            

            

              # enable this with :database unless you are using a custom strategy.
          
      1097. 
        
      
      
        
      
          
    1097. 
            
            

            

              # The supported strategies are:
          
      1098. 
        
      
      
        
      
          
    1098. 
            
            

            

              # :database      = Support basic authentication with authentication key + password
          
      1099. 
        
      
      
        
      
          
    1099. 
            
            

            

              # config.http_authenticatable = false
          
      1100. 
        
      
      
        
      
          
    1100. 
            
            

            

            
          
      1101. 
        
      
      
        
      
          
    1101. 
            
            

            

              # If 401 status code should be returned for AJAX requests. True by default.
          
      1102. 
        
      
      
        
      
          
    1102. 
            
            

            

              # config.http_authenticatable_on_xhr = true
          
      1103. 
        
      
      
        
      
          
    1103. 
            
            

            

            
          
      1104. 
        
      
      
        
      
          
    1104. 
            
            

            

              # The realm used in Http Basic Authentication. 'Application' by default.
          
      1105. 
        
      
      
        
      
          
    1105. 
            
            

            

              # config.http_authentication_realm = 'Application'
          
      1106. 
        
      
      
        
      
          
    1106. 
            
            

            

            
          
      1107. 
        
      
      
        
      
          
    1107. 
            
            

            

              # It will change confirmation, password recovery and other workflows
          
      1108. 
        
      
      
        
      
          
    1108. 
            
            

            

              # to behave the same regardless if the e-mail provided was right or wrong.
          
      1109. 
        
      
      
        
      
          
    1109. 
            
            

            

              # Does not affect registerable.
          
      1110. 
        
      
      
        
      
          
    1110. 
            
            

            

              # config.paranoid = true
          
      1111. 
        
      
      
        
      
          
    1111. 
            
            

            

            
          
      1112. 
        
      
      
        
      
          
    1112. 
            
            

            

              # By default Devise will store the user in session. You can skip storage for
          
      1113. 
        
      
      
        
      
          
    1113. 
            
            

            

              # particular strategies by setting this option.
          
      1114. 
        
      
      
        
      
          
    1114. 
            
            

            

              # Notice that if you are skipping storage for all authentication paths, you
          
      1115. 
        
      
      
        
      
          
    1115. 
            
            

            

              # may want to disable generating routes to Devise's sessions controller by
          
      1116. 
        
      
      
        
      
          
    1116. 
            
            

            

              # passing skip: :sessions to `devise_for` in your config/routes.rb
          
      1117. 
        
      
      
        
      
          
    1117. 
            1
            

            

              config.skip_session_storage = [:http_auth]
          
      1118. 
        
      
      
        
      
          
    1118. 
            
            

            

            
          
      1119. 
        
      
      
        
      
          
    1119. 
            
            

            

              # By default, Devise cleans up the CSRF token on authentication to
          
      1120. 
        
      
      
        
      
          
    1120. 
            
            

            

              # avoid CSRF token fixation attacks. This means that, when using AJAX
          
      1121. 
        
      
      
        
      
          
    1121. 
            
            

            

              # requests for sign in and sign up, you need to get a new CSRF token
          
      1122. 
        
      
      
        
      
          
    1122. 
            
            

            

              # from the server. You can disable this option at your own risk.
          
      1123. 
        
      
      
        
      
          
    1123. 
            
            

            

              # config.clean_up_csrf_token_on_authentication = true
          
      1124. 
        
      
      
        
      
          
    1124. 
            
            

            

            
          
      1125. 
        
      
      
        
      
          
    1125. 
            
            

            

              # When false, Devise will not attempt to reload routes on eager load.
          
      1126. 
        
      
      
        
      
          
    1126. 
            
            

            

              # This can reduce the time taken to boot the app but if your application
          
      1127. 
        
      
      
        
      
          
    1127. 
            
            

            

              # requires the Devise mappings to be loaded during boot time the application
          
      1128. 
        
      
      
        
      
          
    1128. 
            
            

            

              # won't boot properly.
          
      1129. 
        
      
      
        
      
          
    1129. 
            
            

            

              # config.reload_routes = true
          
      1130. 
        
      
      
        
      
          
    1130. 
            
            

            

            
          
      1131. 
        
      
      
        
      
          
    1131. 
            
            

            

              # ==> Configuration for :database_authenticatable
          
      1132. 
        
      
      
        
      
          
    1132. 
            
            

            

              # For bcrypt, this is the cost for hashing the password and defaults to 12. If
          
      1133. 
        
      
      
        
      
          
    1133. 
            
            

            

              # using other algorithms, it sets how many times you want the password to be hashed.
          
      1134. 
        
      
      
        
      
          
    1134. 
            
            

            

              # The number of stretches used for generating the hashed password are stored
          
      1135. 
        
      
      
        
      
          
    1135. 
            
            

            

              # with the hashed password. This allows you to change the stretches without
          
      1136. 
        
      
      
        
      
          
    1136. 
            
            

            

              # invalidating existing passwords.
          
      1137. 
        
      
      
        
      
          
    1137. 
            
            

            

              #
          
      1138. 
        
      
      
        
      
          
    1138. 
            
            

            

              # Limiting the stretches to just one in testing will increase the performance of
          
      1139. 
        
      
      
        
      
          
    1139. 
            
            

            

              # your test suite dramatically. However, it is STRONGLY RECOMMENDED to not use
          
      1140. 
        
      
      
        
      
          
    1140. 
            
            

            

              # a value less than 10 in other environments. Note that, for bcrypt (the default
          
      1141. 
        
      
      
        
      
          
    1141. 
            
            

            

              # algorithm), the cost increases exponentially with the number of stretches (e.g.
          
      1142. 
        
      
      
        
      
          
    1142. 
            
            

            

              # a value of 20 is already extremely slow: approx. 60 seconds for 1 calculation).
          
      1143. 
        
      
      
        
      
          
    1143. 
            1
            

            

              config.stretches = Rails.env.test? ? 1 : 12
          
      1144. 
        
      
      
        
      
          
    1144. 
            
            

            

            
          
      1145. 
        
      
      
        
      
          
    1145. 
            
            

            

              # Set up a pepper to generate the hashed password.
          
      1146. 
        
      
      
        
      
          
    1146. 
            
            

            

              # config.pepper = 'ceca2dd0db4a8ea4b0604585575dbae22182ecf60d97a87f4914cc23cfe747f8ff22aac7e416e94240a6fe3cfe3cea929d0a8278c66c5388d059bf5bcfdc8a27'
          
      1147. 
        
      
      
        
      
          
    1147. 
            
            

            

            
          
      1148. 
        
      
      
        
      
          
    1148. 
            
            

            

              # Send a notification to the original email when the user's email is changed.
          
      1149. 
        
      
      
        
      
          
    1149. 
            
            

            

              # config.send_email_changed_notification = false
          
      1150. 
        
      
      
        
      
          
    1150. 
            
            

            

            
          
      1151. 
        
      
      
        
      
          
    1151. 
            
            

            

              # Send a notification email when the user's password is changed.
          
      1152. 
        
      
      
        
      
          
    1152. 
            
            

            

              # config.send_password_change_notification = false
          
      1153. 
        
      
      
        
      
          
    1153. 
            
            

            

            
          
      1154. 
        
      
      
        
      
          
    1154. 
            
            

            

              # ==> Configuration for :confirmable
          
      1155. 
        
      
      
        
      
          
    1155. 
            
            

            

              # A period that the user is allowed to access the website even without
          
      1156. 
        
      
      
        
      
          
    1156. 
            
            

            

              # confirming their account. For instance, if set to 2.days, the user will be
          
      1157. 
        
      
      
        
      
          
    1157. 
            
            

            

              # able to access the website for two days without confirming their account,
          
      1158. 
        
      
      
        
      
          
    1158. 
            
            

            

              # access will be blocked just in the third day.
          
      1159. 
        
      
      
        
      
          
    1159. 
            
            

            

              # You can also set it to nil, which will allow the user to access the website
          
      1160. 
        
      
      
        
      
          
    1160. 
            
            

            

              # without confirming their account.
          
      1161. 
        
      
      
        
      
          
    1161. 
            
            

            

              # Default is 0.days, meaning the user cannot access the website without
          
      1162. 
        
      
      
        
      
          
    1162. 
            
            

            

              # confirming their account.
          
      1163. 
        
      
      
        
      
          
    1163. 
            
            

            

              # config.allow_unconfirmed_access_for = 2.days
          
      1164. 
        
      
      
        
      
          
    1164. 
            
            

            

            
          
      1165. 
        
      
      
        
      
          
    1165. 
            
            

            

              # A period that the user is allowed to confirm their account before their
          
      1166. 
        
      
      
        
      
          
    1166. 
            
            

            

              # token becomes invalid. For example, if set to 3.days, the user can confirm
          
      1167. 
        
      
      
        
      
          
    1167. 
            
            

            

              # their account within 3 days after the mail was sent, but on the fourth day
          
      1168. 
        
      
      
        
      
          
    1168. 
            
            

            

              # their account can't be confirmed with the token any more.
          
      1169. 
        
      
      
        
      
          
    1169. 
            
            

            

              # Default is nil, meaning there is no restriction on how long a user can take
          
      1170. 
        
      
      
        
      
          
    1170. 
            
            

            

              # before confirming their account.
          
      1171. 
        
      
      
        
      
          
    1171. 
            
            

            

              # config.confirm_within = 3.days
          
      1172. 
        
      
      
        
      
          
    1172. 
            
            

            

            
          
      1173. 
        
      
      
        
      
          
    1173. 
            
            

            

              # If true, requires any email changes to be confirmed (exactly the same way as
          
      1174. 
        
      
      
        
      
          
    1174. 
            
            

            

              # initial account confirmation) to be applied. Requires additional unconfirmed_email
          
      1175. 
        
      
      
        
      
          
    1175. 
            
            

            

              # db field (see migrations). Until confirmed, new email is stored in
          
      1176. 
        
      
      
        
      
          
    1176. 
            
            

            

              # unconfirmed_email column, and copied to email column on successful confirmation.
          
      1177. 
        
      
      
        
      
          
    1177. 
            1
            

            

              config.reconfirmable = true
          
      1178. 
        
      
      
        
      
          
    1178. 
            
            

            

            
          
      1179. 
        
      
      
        
      
          
    1179. 
            
            

            

              # Defines which key will be used when confirming an account
          
      1180. 
        
      
      
        
      
          
    1180. 
            
            

            

              # config.confirmation_keys = [:email]
          
      1181. 
        
      
      
        
      
          
    1181. 
            
            

            

            
          
      1182. 
        
      
      
        
      
          
    1182. 
            
            

            

              # ==> Configuration for :rememberable
          
      1183. 
        
      
      
        
      
          
    1183. 
            
            

            

              # The time the user will be remembered without asking for credentials again.
          
      1184. 
        
      
      
        
      
          
    1184. 
            
            

            

              # config.remember_for = 2.weeks
          
      1185. 
        
      
      
        
      
          
    1185. 
            
            

            

            
          
      1186. 
        
      
      
        
      
          
    1186. 
            
            

            

              # Invalidates all the remember me tokens when the user signs out.
          
      1187. 
        
      
      
        
      
          
    1187. 
            1
            

            

              config.expire_all_remember_me_on_sign_out = true
          
      1188. 
        
      
      
        
      
          
    1188. 
            
            

            

            
          
      1189. 
        
      
      
        
      
          
    1189. 
            
            

            

              # If true, extends the user's remember period when remembered via cookie.
          
      1190. 
        
      
      
        
      
          
    1190. 
            
            

            

              # config.extend_remember_period = false
          
      1191. 
        
      
      
        
      
          
    1191. 
            
            

            

            
          
      1192. 
        
      
      
        
      
          
    1192. 
            
            

            

              # Options to be passed to the created cookie. For instance, you can set
          
      1193. 
        
      
      
        
      
          
    1193. 
            
            

            

              # secure: true in order to force SSL only cookies.
          
      1194. 
        
      
      
        
      
          
    1194. 
            
            

            

              # config.rememberable_options = {}
          
      1195. 
        
      
      
        
      
          
    1195. 
            
            

            

            
          
      1196. 
        
      
      
        
      
          
    1196. 
            
            

            

              # ==> Configuration for :validatable
          
      1197. 
        
      
      
        
      
          
    1197. 
            
            

            

              # Range for password length.
          
      1198. 
        
      
      
        
      
          
    1198. 
            1
            

            

              config.password_length = 6..128
          
      1199. 
        
      
      
        
      
          
    1199. 
            
            

            

            
          
      1200. 
        
      
      
        
      
          
    1200. 
            
            

            

              # Email regex used to validate email formats. It simply asserts that
          
      1201. 
        
      
      
        
      
          
    1201. 
            
            

            

              # one (and only one) @ exists in the given string. This is mainly
          
      1202. 
        
      
      
        
      
          
    1202. 
            
            

            

              # to give user feedback and not to assert the e-mail validity.
          
      1203. 
        
      
      
        
      
          
    1203. 
            1
            

            

              config.email_regexp = /\A[^@\s]+@[^@\s]+\z/
          
      1204. 
        
      
      
        
      
          
    1204. 
            
            

            

            
          
      1205. 
        
      
      
        
      
          
    1205. 
            
            

            

              # ==> Configuration for :timeoutable
          
      1206. 
        
      
      
        
      
          
    1206. 
            
            

            

              # The time you want to timeout the user session without activity. After this
          
      1207. 
        
      
      
        
      
          
    1207. 
            
            

            

              # time the user will be asked for credentials again. Default is 30 minutes.
          
      1208. 
        
      
      
        
      
          
    1208. 
            
            

            

              # config.timeout_in = 30.minutes
          
      1209. 
        
      
      
        
      
          
    1209. 
            
            

            

            
          
      1210. 
        
      
      
        
      
          
    1210. 
            
            

            

              # ==> Configuration for :lockable
          
      1211. 
        
      
      
        
      
          
    1211. 
            
            

            

              # Defines which strategy will be used to lock an account.
          
      1212. 
        
      
      
        
      
          
    1212. 
            
            

            

              # :failed_attempts = Locks an account after a number of failed attempts to sign in.
          
      1213. 
        
      
      
        
      
          
    1213. 
            
            

            

              # :none            = No lock strategy. You should handle locking by yourself.
          
      1214. 
        
      
      
        
      
          
    1214. 
            
            

            

              # config.lock_strategy = :failed_attempts
          
      1215. 
        
      
      
        
      
          
    1215. 
            
            

            

            
          
      1216. 
        
      
      
        
      
          
    1216. 
            
            

            

              # Defines which key will be used when locking and unlocking an account
          
      1217. 
        
      
      
        
      
          
    1217. 
            
            

            

              # config.unlock_keys = [:email]
          
      1218. 
        
      
      
        
      
          
    1218. 
            
            

            

            
          
      1219. 
        
      
      
        
      
          
    1219. 
            
            

            

              # Defines which strategy will be used to unlock an account.
          
      1220. 
        
      
      
        
      
          
    1220. 
            
            

            

              # :email = Sends an unlock link to the user email
          
      1221. 
        
      
      
        
      
          
    1221. 
            
            

            

              # :time  = Re-enables login after a certain amount of time (see :unlock_in below)
          
      1222. 
        
      
      
        
      
          
    1222. 
            
            

            

              # :both  = Enables both strategies
          
      1223. 
        
      
      
        
      
          
    1223. 
            
            

            

              # :none  = No unlock strategy. You should handle unlocking by yourself.
          
      1224. 
        
      
      
        
      
          
    1224. 
            
            

            

              # config.unlock_strategy = :both
          
      1225. 
        
      
      
        
      
          
    1225. 
            
            

            

            
          
      1226. 
        
      
      
        
      
          
    1226. 
            
            

            

              # Number of authentication tries before locking an account if lock_strategy
          
      1227. 
        
      
      
        
      
          
    1227. 
            
            

            

              # is failed attempts.
          
      1228. 
        
      
      
        
      
          
    1228. 
            
            

            

              # config.maximum_attempts = 20
          
      1229. 
        
      
      
        
      
          
    1229. 
            
            

            

            
          
      1230. 
        
      
      
        
      
          
    1230. 
            
            

            

              # Time interval to unlock the account if :time is enabled as unlock_strategy.
          
      1231. 
        
      
      
        
      
          
    1231. 
            
            

            

              # config.unlock_in = 1.hour
          
      1232. 
        
      
      
        
      
          
    1232. 
            
            

            

            
          
      1233. 
        
      
      
        
      
          
    1233. 
            
            

            

              # Warn on the last attempt before the account is locked.
          
      1234. 
        
      
      
        
      
          
    1234. 
            
            

            

              # config.last_attempt_warning = true
          
      1235. 
        
      
      
        
      
          
    1235. 
            
            

            

            
          
      1236. 
        
      
      
        
      
          
    1236. 
            
            

            

              # ==> Configuration for :recoverable
          
      1237. 
        
      
      
        
      
          
    1237. 
            
            

            

              #
          
      1238. 
        
      
      
        
      
          
    1238. 
            
            

            

              # Defines which key will be used when recovering the password for an account
          
      1239. 
        
      
      
        
      
          
    1239. 
            
            

            

              # config.reset_password_keys = [:email]
          
      1240. 
        
      
      
        
      
          
    1240. 
            
            

            

            
          
      1241. 
        
      
      
        
      
          
    1241. 
            
            

            

              # Time interval you can reset your password with a reset password key.
          
      1242. 
        
      
      
        
      
          
    1242. 
            
            

            

              # Don't put a too small interval or your users won't have the time to
          
      1243. 
        
      
      
        
      
          
    1243. 
            
            

            

              # change their passwords.
          
      1244. 
        
      
      
        
      
          
    1244. 
            1
            

            

              config.reset_password_within = 6.hours
          
      1245. 
        
      
      
        
      
          
    1245. 
            
            

            

            
          
      1246. 
        
      
      
        
      
          
    1246. 
            
            

            

              # When set to false, does not sign a user in automatically after their password is
          
      1247. 
        
      
      
        
      
          
    1247. 
            
            

            

              # reset. Defaults to true, so a user is signed in automatically after a reset.
          
      1248. 
        
      
      
        
      
          
    1248. 
            
            

            

              # config.sign_in_after_reset_password = true
          
      1249. 
        
      
      
        
      
          
    1249. 
            
            

            

            
          
      1250. 
        
      
      
        
      
          
    1250. 
            
            

            

              # ==> Configuration for :encryptable
          
      1251. 
        
      
      
        
      
          
    1251. 
            
            

            

              # Allow you to use another hashing or encryption algorithm besides bcrypt (default).
          
      1252. 
        
      
      
        
      
          
    1252. 
            
            

            

              # You can use :sha1, :sha512 or algorithms from others authentication tools as
          
      1253. 
        
      
      
        
      
          
    1253. 
            
            

            

              # :clearance_sha1, :authlogic_sha512 (then you should set stretches above to 20
          
      1254. 
        
      
      
        
      
          
    1254. 
            
            

            

              # for default behavior) and :restful_authentication_sha1 (then you should set
          
      1255. 
        
      
      
        
      
          
    1255. 
            
            

            

              # stretches to 10, and copy REST_AUTH_SITE_KEY to pepper).
          
      1256. 
        
      
      
        
      
          
    1256. 
            
            

            

              #
          
      1257. 
        
      
      
        
      
          
    1257. 
            
            

            

              # Require the `devise-encryptable` gem when using anything other than bcrypt
          
      1258. 
        
      
      
        
      
          
    1258. 
            
            

            

              # config.encryptor = :sha512
          
      1259. 
        
      
      
        
      
          
    1259. 
            
            

            

            
          
      1260. 
        
      
      
        
      
          
    1260. 
            
            

            

              # ==> Scopes configuration
          
      1261. 
        
      
      
        
      
          
    1261. 
            
            

            

              # Turn scoped views on. Before rendering "sessions/new", it will first check for
          
      1262. 
        
      
      
        
      
          
    1262. 
            
            

            

              # "users/sessions/new". It's turned off by default because it's slower if you
          
      1263. 
        
      
      
        
      
          
    1263. 
            
            

            

              # are using only default views.
          
      1264. 
        
      
      
        
      
          
    1264. 
            
            

            

              # config.scoped_views = false
          
      1265. 
        
      
      
        
      
          
    1265. 
            
            

            

            
          
      1266. 
        
      
      
        
      
          
    1266. 
            
            

            

              # Configure the default scope given to Warden. By default it's the first
          
      1267. 
        
      
      
        
      
          
    1267. 
            
            

            

              # devise role declared in your routes (usually :user).
          
      1268. 
        
      
      
        
      
          
    1268. 
            
            

            

              # config.default_scope = :user
          
      1269. 
        
      
      
        
      
          
    1269. 
            
            

            

            
          
      1270. 
        
      
      
        
      
          
    1270. 
            
            

            

              # Set this configuration to false if you want /users/sign_out to sign out
          
      1271. 
        
      
      
        
      
          
    1271. 
            
            

            

              # only the current scope. By default, Devise signs out all scopes.
          
      1272. 
        
      
      
        
      
          
    1272. 
            
            

            

              # config.sign_out_all_scopes = true
          
      1273. 
        
      
      
        
      
          
    1273. 
            
            

            

            
          
      1274. 
        
      
      
        
      
          
    1274. 
            
            

            

              # ==> Navigation configuration
          
      1275. 
        
      
      
        
      
          
    1275. 
            
            

            

              # Lists the formats that should be treated as navigational. Formats like
          
      1276. 
        
      
      
        
      
          
    1276. 
            
            

            

              # :html, should redirect to the sign in page when the user does not have
          
      1277. 
        
      
      
        
      
          
    1277. 
            
            

            

              # access, but formats like :xml or :json, should return 401.
          
      1278. 
        
      
      
        
      
          
    1278. 
            
            

            

              #
          
      1279. 
        
      
      
        
      
          
    1279. 
            
            

            

              # If you have any extra navigational formats, like :iphone or :mobile, you
          
      1280. 
        
      
      
        
      
          
    1280. 
            
            

            

              # should add them to the navigational formats lists.
          
      1281. 
        
      
      
        
      
          
    1281. 
            
            

            

              #
          
      1282. 
        
      
      
        
      
          
    1282. 
            
            

            

              # The "*/*" below is required to match Internet Explorer requests.
          
      1283. 
        
      
      
        
      
          
    1283. 
            
            

            

              # config.navigational_formats = ['*/*', :html]
          
      1284. 
        
      
      
        
      
          
    1284. 
            
            

            

            
          
      1285. 
        
      
      
        
      
          
    1285. 
            
            

            

              # The default HTTP method used to sign out a resource. Default is :delete.
          
      1286. 
        
      
      
        
      
          
    1286. 
            1
            

            

              config.sign_out_via = :delete
          
      1287. 
        
      
      
        
      
          
    1287. 
            
            

            

            
          
      1288. 
        
      
      
        
      
          
    1288. 
            
            

            

              # ==> OmniAuth
          
      1289. 
        
      
      
        
      
          
    1289. 
            
            

            

              # Add a new OmniAuth provider. Check the wiki for more information on setting
          
      1290. 
        
      
      
        
      
          
    1290. 
            
            

            

              # up on your models and hooks.
          
      1291. 
        
      
      
        
      
          
    1291. 
            
            

            

              # config.omniauth :github, 'APP_ID', 'APP_SECRET', scope: 'user,public_repo'
          
      1292. 
        
      
      
        
      
          
    1292. 
            
            

            

            
          
      1293. 
        
      
      
        
      
          
    1293. 
            
            

            

              # ==> Warden configuration
          
      1294. 
        
      
      
        
      
          
    1294. 
            
            

            

              # If you want to use other strategies, that are not supported by Devise, or
          
      1295. 
        
      
      
        
      
          
    1295. 
            
            

            

              # change the failure app, you can configure them inside the config.warden block.
          
      1296. 
        
      
      
        
      
          
    1296. 
            
            

            

              #
          
      1297. 
        
      
      
        
      
          
    1297. 
            
            

            

              # config.warden do |manager|
          
      1298. 
        
      
      
        
      
          
    1298. 
            
            

            

              #   manager.intercept_401 = false
          
      1299. 
        
      
      
        
      
          
    1299. 
            
            

            

              #   manager.default_strategies(scope: :user).unshift :some_external_strategy
          
      1300. 
        
      
      
        
      
          
    1300. 
            
            

            

              # end
          
      1301. 
        
      
      
        
      
          
    1301. 
            
            

            

            
          
      1302. 
        
      
      
        
      
          
    1302. 
            
            

            

              # ==> Mountable engine configurations
          
      1303. 
        
      
      
        
      
          
    1303. 
            
            

            

              # When using Devise inside an engine, let's call it `MyEngine`, and this engine
          
      1304. 
        
      
      
        
      
          
    1304. 
            
            

            

              # is mountable, there are some extra configurations to be taken into account.
          
      1305. 
        
      
      
        
      
          
    1305. 
            
            

            

              # The following options are available, assuming the engine is mounted as:
          
      1306. 
        
      
      
        
      
          
    1306. 
            
            

            

              #
          
      1307. 
        
      
      
        
      
          
    1307. 
            
            

            

              #     mount MyEngine, at: '/my_engine'
          
      1308. 
        
      
      
        
      
          
    1308. 
            
            

            

              #
          
      1309. 
        
      
      
        
      
          
    1309. 
            
            

            

              # The router that invoked `devise_for`, in the example above, would be:
          
      1310. 
        
      
      
        
      
          
    1310. 
            
            

            

              # config.router_name = :my_engine
          
      1311. 
        
      
      
        
      
          
    1311. 
            
            

            

              #
          
      1312. 
        
      
      
        
      
          
    1312. 
            
            

            

              # When using OmniAuth, Devise cannot automatically set OmniAuth path,
          
      1313. 
        
      
      
        
      
          
    1313. 
            
            

            

              # so you need to do it manually. For the users scope, it would be:
          
      1314. 
        
      
      
        
      
          
    1314. 
            
            

            

              # config.omniauth_path_prefix = '/my_engine/users/auth'
          
      1315. 
        
      
      
        
      
          
    1315. 
            
            

            

            
          
      1316. 
        
      
      
        
      
          
    1316. 
            
            

            

              # ==> Turbolinks configuration
          
      1317. 
        
      
      
        
      
          
    1317. 
            
            

            

              # If your app is using Turbolinks, Turbolinks::Controller needs to be included to make redirection work correctly:
          
      1318. 
        
      
      
        
      
          
    1318. 
            
            

            

              #
          
      1319. 
        
      
      
        
      
          
    1319. 
            
            

            

              # ActiveSupport.on_load(:devise_failure_app) do
          
      1320. 
        
      
      
        
      
          
    1320. 
            
            

            

              #   include Turbolinks::Controller
          
      1321. 
        
      
      
        
      
          
    1321. 
            
            

            

              # end
          
      1322. 
        
      
      
        
      
          
    1322. 
            
            

            

            
          
      1323. 
        
      
      
        
      
          
    1323. 
            
            

            

              # ==> Configuration for :registerable
          
      1324. 
        
      
      
        
      
          
    1324. 
            
            

            

            
          
      1325. 
        
      
      
        
      
          
    1325. 
            
            

            

              # When set to false, does not sign a user in automatically after their password is
          
      1326. 
        
      
      
        
      
          
    1326. 
            
            

            

              # changed. Defaults to true, so a user is signed in automatically after changing a password.
          
      1327. 
        
      
      
        
      
          
    1327. 
            
            

            

              # config.sign_in_after_change_password = true
          
      1328. 
        
      
      
        
      
          
    1328. 
            
            

            

<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 56fd9d41 (Add login registration pages)
=======
>>>>>>> 7a08014b (Featire specs)
=======
>>>>>>> a8b17c32 (Add login registration pages)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> 0561be1d (Add login registration pages)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 512d1d87 (Add login registration pages)
=======
>>>>>>> 4976a174 (Add login registration pages)
=======
>>>>>>> e6fc67c7 (Featire specs)
=======
>>>>>>> e011b0df (Add login registration pages)
=======
>>>>>>> ff4c2fe0 (Add login registration pages)
=======
>>>>>>> 8f1baf1c (Add login registration pages)
=======
>>>>>>> dda81aa9 (Add login registration pages)
=======
>>>>>>> 40a3d25f (Add login registration pages)
=======
>>>>>>> 73f364d8 (Featire specs)
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> 156ffe6 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> bae2b7de (Add login registration pages)
=======
=======
=======
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 793a6ed (Add login registration pages)
=======
=======
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> c5efe8e (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 56fd9d41 (Add login registration pages)
=======
=======
>>>>>>> aa3618b (Rebased)
<<<<<<< HEAD
>>>>>>> 11792758 (Rebased)
=======
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> df37394 (Featire specs)
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
=======
=======
>>>>>>> 1d11874 (Add login registration pages)
=======
>>>>>>> 06e5e41 (Add login registration pages)
=======
>>>>>>> 385136b (Add login registration pages)
=======
>>>>>>> 1c33e01 (Add login registration pages)
=======
>>>>>>> fb61c5a (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> e60833c (Add login registration pages)
=======
>>>>>>> f416f45 (Add login registration pages)
=======
>>>>>>> df37394 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c871248 (Add login registration pages)
=======
>>>>>>> ccec311 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 385136b (Add login registration pages)
=======
=======
>>>>>>> 8c3e531 (Add login registration pages)
>>>>>>> 1c33e01 (Add login registration pages)
>>>>>>> 1214e1f (Add login registration pages)
=======
>>>>>>> 730a8ca (Add login registration pages)
=======
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 385136b (Add login registration pages)
=======
>>>>>>> 1c33e01 (Add login registration pages)
>>>>>>> 7d58507 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 31507b8 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> a8b17c32 (Add login registration pages)
=======
=======
=======
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> bc6bc8d2 (Rebased)
=======
=======
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> 1214e1f (Add login registration pages)
=======
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 2fef4a0 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 0561be1d (Add login registration pages)
=======
=======
>>>>>>> 1214e1f (Add login registration pages)
=======
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> e60833c (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 512d1d87 (Add login registration pages)
=======
=======
=======
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> f416f45 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 4976a174 (Add login registration pages)
=======
=======
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
>>>>>>> ef483b6d (Fix)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> df37394 (Featire specs)
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
>>>>>>> 7d58507 (Add login registration pages)
>>>>>>> c871248 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e011b0df (Add login registration pages)
=======
=======
=======
>>>>>>> 49e8a6c (Rebased)
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
=======
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> 852864e (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 1d11874 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> ff4c2fe0 (Add login registration pages)
=======
=======
=======
>>>>>>> 1214e1f (Add login registration pages)
=======
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 551f3c1 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 06e5e41 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 8f1baf1c (Add login registration pages)
=======
=======
=======
>>>>>>> ccec311 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 385136b (Add login registration pages)
<<<<<<< HEAD
>>>>>>> dda81aa9 (Add login registration pages)
=======
=======
=======
=======
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 8c3e531 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 1c33e01 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 40a3d25f (Add login registration pages)
=======
=======
=======
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
=======
>>>>>>> 715fac2 (Featire specs)
>>>>>>> fb61c5a (Featire specs)
>>>>>>> 73f364d8 (Featire specs)
            end
          
      1329.
    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> e989024d (Add login registration pages) ======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> 29e1af94 (Add login registration pages) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f6e20266 (Add login registration pages) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ed8ea634 (Add login registration pages) ======= >>>>>>> 2be0d057 (Add login registration pages) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> e011b0df (Add login registration pages) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> ff4c2fe0 (Add login registration pages) ======= >>>>>>> 8f1baf1c (Add login registration pages) ======= >>>>>>> dda81aa9 (Add login registration pages) ======= >>>>>>> 40a3d25f (Add login registration pages) ======= >>>>>>> 1049b80c (Fix) ======= >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> 73dcd461 (Add login registration pages) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> aca90e3 (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> 156ffe6 (Add login registration pages) ======= <<<<<<< HEAD ======= >>>>>>> c5efe8e (Add login registration pages) ======= >>>>>>> aa3618b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> c871248 (Add login registration pages) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 1d11874 (Add login registration pages) ======= >>>>>>> 06e5e41 (Add login registration pages) ======= >>>>>>> 385136b (Add login registration pages) ======= >>>>>>> 1c33e01 (Add login registration pages) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> fb61c5a (Featire specs) ======= >>>>>>> 8d4ec55 (Add login registration pages) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> f92a45b (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> bae2b7de (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= >>>>>>> 793a6ed (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> c5efe8e (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= >>>>>>> aa3618b (Rebased) ======= <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> c51bf93 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> e60833c (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> ed8ea634 (Add login registration pages) ======= >>>>>>> f416f45 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 2be0d057 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> d9d85ca6 (Fix) >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> 0f8241bb (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 88d49ad (Add login registration pages) ======= ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) >>>>>>> c033601 (Rebased) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> c033601 (Rebased) >>>>>>> e3e66f3 (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> ae409ca (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 379a979 (Featire specs) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> 56fd9d41 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 37e48018 (Featire specs) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> aa3618b (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> aa4361fd (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0ed7f7c (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> cacbab9 (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f182ac7 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> 57da3ff (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> a624084 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 6a9fede (Add login registration pages) ======= >>>>>>> f416f45 (Add login registration pages) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> 57a2e05 (Add login registration pages) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> ed8ea634 (Add login registration pages) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD >>>>>>> 2be0d057 (Add login registration pages) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 610b6138 (Featire specs) >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> bae2b7de (Add login registration pages) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 56fd9d41 (Add login registration pages) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> aa3618b (Rebased) >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> cacbab9 (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f182ac7 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> 57da3ff (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> a624084 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 6a9fede (Add login registration pages) ======= >>>>>>> f416f45 (Add login registration pages) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> 57a2e05 (Add login registration pages) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> 0561be1d (Add login registration pages) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> 512d1d87 (Add login registration pages) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD >>>>>>> 4976a174 (Add login registration pages) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 0676508 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 6a9fede (Add login registration pages) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 57a2e05 (Add login registration pages) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> c871248 (Add login registration pages) <<<<<<< HEAD >>>>>>> e011b0df (Add login registration pages) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD >>>>>>> 852864e (Add login registration pages) <<<<<<< HEAD >>>>>>> 1d11874 (Add login registration pages) <<<<<<< HEAD >>>>>>> ff4c2fe0 (Add login registration pages) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 551f3c1 (Add login registration pages) <<<<<<< HEAD >>>>>>> 06e5e41 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8f1baf1c (Add login registration pages) ======= ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> ccec311 (Add login registration pages) <<<<<<< HEAD >>>>>>> 385136b (Add login registration pages) <<<<<<< HEAD >>>>>>> dda81aa9 (Add login registration pages) ======= ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> 8c3e531 (Add login registration pages) <<<<<<< HEAD >>>>>>> 1c33e01 (Add login registration pages) <<<<<<< HEAD >>>>>>> 40a3d25f (Add login registration pages) ======= ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= ======= >>>>>>> 03c0867 (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 03c0867 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8d4ec55 (Add login registration pages) <<<<<<< HEAD >>>>>>> 73dcd461 (Add login registration pages) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)

    config/initializers/filter_parameter_logging.rb

    100.0% lines covered

    1 relevant lines. 1 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            
            

            

            # Be sure to restart your server when you modify this file.
          
      2. 
        
      
      
        
      
          
    2. 
            
            

            

            
          
      3. 
        
      
      
        
      
          
    3. 
            
            

            

            # Configure sensitive parameters which will be filtered from the log file.
          
      4. 
        
      
      
        
      
          
    4. 
            1
            

            

            Rails.application.config.filter_parameters += %i[
          
      5. 
        
      
      
        
      
          
    5. 
            
            

            

              passw secret token _key crypt salt certificate otp ssn
          
      6. 
        
      
      
        
      
          
    6. 
            
            

            

            ]
          
      7.

    config/initializers/inflections.rb

    100.0% lines covered

    0 relevant lines. 0 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            
            

            

            # Be sure to restart your server when you modify this file.
          
      2. 
        
      
      
        
      
          
    2. 
            
            

            

            
          
      3. 
        
      
      
        
      
          
    3. 
            
            

            

            # Add new inflection rules using the following format. Inflections
          
      4. 
        
      
      
        
      
          
    4. 
            
            

            

            # are locale specific, and you may define rules for as many different
          
      5. 
        
      
      
        
      
          
    5. 
            
            

            

            # locales as you wish. All of these examples are active by default:
          
      6. 
        
      
      
        
      
          
    6. 
            
            

            

            # ActiveSupport::Inflector.inflections(:en) do |inflect|
          
      7. 
        
      
      
        
      
          
    7. 
            
            

            

            #   inflect.plural /^(ox)$/i, '\1en'
          
      8. 
        
      
      
        
      
          
    8. 
            
            

            

            #   inflect.singular /^(ox)en/i, '\1'
          
      9. 
        
      
      
        
      
          
    9. 
            
            

            

            #   inflect.irregular 'person', 'people'
          
      10. 
        
      
      
        
      
          
    10. 
            
            

            

            #   inflect.uncountable %w( fish sheep )
          
      11. 
        
      
      
        
      
          
    11. 
            
            

            

            # end
          
      12. 
        
      
      
        
      
          
    12. 
            
            

            

            
          
      13. 
        
      
      
        
      
          
    13. 
            
            

            

            # These inflection rules are supported but not enabled by default:
          
      14. 
        
      
      
        
      
          
    14. 
            
            

            

            # ActiveSupport::Inflector.inflections(:en) do |inflect|
          
      15. 
        
      
      
        
      
          
    15. 
            
            

            

            #   inflect.acronym 'RESTful'
          
      16. 
        
      
      
        
      
          
    16. 
            
            

            

            # end
          
      17.
    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 75fa7e1b (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> b97bb382 (Featire specs) ======= >>>>>>> 4a2f2ad8 (Featire specs) ======= >>>>>>> 21873de0 (Featire specs) ======= >>>>>>> 392646b5 (Featire specs) ======= >>>>>>> 1049b80c (Fix) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> 15c51b7 (Featire specs) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)

    config/initializers/kaminari.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            Kaminari.configure do |config|
          
      2. 
        
      
      
        
      
          
    2. 
            1
            

            

              config.page_method_name = :per_page_kaminari
          
      3. 
        
      
      
        
      
          
    3. 
            
            

            

            end
          
      4.
    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 1049b80c (Fix) ======= >>>>>>> f3d746cb (Featire specs) ======= ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) ======= ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)

    config/initializers/mime_types.rb

    100.0% lines covered

    0 relevant lines. 0 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            
            

            

            # Be sure to restart your server when you modify this file.
          
      2. 
        
      
      
        
      
          
    2. 
            
            

            

            
          
      3. 
        
      
      
        
      
          
    3. 
            
            

            

            # Add new mime types for use in respond_to blocks:
          
      4. 
        
      
      
        
      
          
    4. 
            
            

            

            # Mime::Type.register "text/richtext", :rtf
          
      5.
    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> c871248 (Add login registration pages) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 1d11874 (Add login registration pages) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 06e5e41 (Add login registration pages) ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> 385136b (Add login registration pages) ======= >>>>>>> 15c51b7 (Featire specs) ======= >>>>>>> 1c33e01 (Add login registration pages) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> fb61c5a (Featire specs) ======= >>>>>>> 8d4ec55 (Add login registration pages) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) ======= <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) ======= >>>>>>> 0ed7f7c (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD >>>>>>> bae2b7de (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 88d49ad (Add login registration pages) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 03c0867 (Add login registration pages) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) ======= <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages)
    ======= ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD ======= ======= >>>>>>> 3723aad (Featire specs)
    >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD =======
    >>>>>>> bae2b7de (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD ======= ======= >>>>>>> 9c0d812 (Featire specs)
    >>>>>>> 37e48018 (Featire specs) <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= <<<<<<< HEAD
    >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true)
    >>>>>>> aca90e3 (Rebased) <<<<<<< HEAD ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 9a49b7b (Rebased) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD
    >>>>>>> 56fd9d41 (Add login registration pages) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs)
    >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD
    >>>>>>> c033601 (Rebased) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 6a9fede (Add login registration pages) ======= >>>>>>> 7c4ea7f (Fix)
    >>>>>>> c033601 (Rebased) >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> ebcdce06 (Featire specs)
    =======
    >>>>>>> aca90e3 (Rebased) >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 9a49b7b (Rebased) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0ed7f7c (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) ======= ======= ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) ======= ======= ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> c871248 (Add login registration pages) ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> 973ba8c (Featire specs) ======= ======= ======= >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD >>>>>>> 852864e (Add login registration pages) <<<<<<< HEAD >>>>>>> 1d11874 (Add login registration pages) ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) ======= ======= ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 551f3c1 (Add login registration pages) <<<<<<< HEAD >>>>>>> 06e5e41 (Add login registration pages) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) ======= ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> ccec311 (Add login registration pages) <<<<<<< HEAD >>>>>>> 385136b (Add login registration pages) ======= ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) ======= ======= ======= >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> 8c3e531 (Add login registration pages) <<<<<<< HEAD >>>>>>> 1c33e01 (Add login registration pages) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs)
    >>>>>>> c033601 (Rebased) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD
    >>>>>>> c033601 (Rebased) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 6a9fede (Add login registration pages) ======= >>>>>>> 7c4ea7f (Fix)
    >>>>>>> c033601 (Rebased) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= =======
    >>>>>>> c033601 (Rebased) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)

    config/initializers/money.rb

    100.0% lines covered

    3 relevant lines. 3 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            Money.locale_backend = :i18n
          
      2. 
        
      
      
        
      
          
    2. 
            1
            

            

            Money.rounding_mode = BigDecimal::ROUND_HALF_EVEN
          
      3. 
        
      
      
        
      
          
    3. 
            1
            

            

            Money.default_currency = Money::Currency.new('EUR')
          
      4.
    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> ff4c2fe0 (Add login registration pages) ======= >>>>>>> 1049b80c (Fix) ======= ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9a49b7b (Rebased) ======= ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0561be1d (Add login registration pages) >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= >>>>>>> aa3618b (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 1d11874 (Add login registration pages) ======= >>>>>>> 9e081dc (Fix) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> ed8ea634 (Add login registration pages) ======= ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2be0d057 (Add login registration pages) ======= ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 156ffe6 (Add login registration pages) >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= >>>>>>> aa3618b (Rebased) >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> 311e9fa (Rebased) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> 0561be1d (Add login registration pages) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> 512d1d87 (Add login registration pages) ======= ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) >>>>>>> 4976a174 (Add login registration pages) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> c871248 (Add login registration pages) <<<<<<< HEAD >>>>>>> e011b0df (Add login registration pages) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 852864e (Add login registration pages) <<<<<<< HEAD >>>>>>> 1d11874 (Add login registration pages) <<<<<<< HEAD >>>>>>> ff4c2fe0 (Add login registration pages) ======= ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 551f3c1 (Add login registration pages) <<<<<<< HEAD >>>>>>> 06e5e41 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8f1baf1c (Add login registration pages) ======= ======= ======= >>>>>>> ccec311 (Add login registration pages) <<<<<<< HEAD >>>>>>> 385136b (Add login registration pages) <<<<<<< HEAD >>>>>>> dda81aa9 (Add login registration pages) ======= ======= ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 8c3e531 (Add login registration pages) <<<<<<< HEAD >>>>>>> 1c33e01 (Add login registration pages) <<<<<<< HEAD >>>>>>> 40a3d25f (Add login registration pages) ======= ======= ======= >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> 715fac2 (Featire specs) >>>>>>> fb61c5a (Featire specs) >>>>>>> 73f364d8 (Featire specs)

    config/initializers/omniauth.rb

    100.0% lines covered

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> e011b0df (Add login registration pages) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> ff4c2fe0 (Add login registration pages) ======= >>>>>>> 8f1baf1c (Add login registration pages) ======= >>>>>>> dda81aa9 (Add login registration pages) ======= >>>>>>> 40a3d25f (Add login registration pages) ======= >>>>>>> 1049b80c (Fix) ======= >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> 311e9fa (Rebased) ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> c871248 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> e011b0df (Add login registration pages) ======= >>>>>>> e055dd0 (Rebased) ======= <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 1d11874 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> ff4c2fe0 (Add login registration pages) ======= >>>>>>> 06e5e41 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 8f1baf1c (Add login registration pages) ======= >>>>>>> 385136b (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> dda81aa9 (Add login registration pages) ======= >>>>>>> 1c33e01 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 40a3d25f (Add login registration pages) ======= >>>>>>> 9e081dc (Fix) ======= <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= >>>>>>> fb61c5a (Featire specs) ======= >>>>>>> 73f364d8 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ed8ea634 (Add login registration pages) ======= ======= >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD >>>>>>> 2be0d057 (Add login registration pages) ======= >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 156ffe6 (Add login registration pages) >>>>>>> bae2b7de (Add login registration pages) ======= ======= >>>>>>> c5efe8e (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> a8b17c32 (Add login registration pages) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> 2fef4a0 (Add login registration pages) >>>>>>> 0561be1d (Add login registration pages) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> e60833c (Add login registration pages) >>>>>>> 512d1d87 (Add login registration pages) ======= ======= >>>>>>> f416f45 (Add login registration pages) >>>>>>> 4976a174 (Add login registration pages) ======= ======= >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= >>>>>>> c871248 (Add login registration pages) <<<<<<< HEAD >>>>>>> e011b0df (Add login registration pages) ======= ======= ======= >>>>>>> 852864e (Add login registration pages) <<<<<<< HEAD >>>>>>> 1d11874 (Add login registration pages) <<<<<<< HEAD >>>>>>> ff4c2fe0 (Add login registration pages) ======= ======= ======= >>>>>>> 551f3c1 (Add login registration pages) <<<<<<< HEAD >>>>>>> 06e5e41 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8f1baf1c (Add login registration pages) ======= ======= ======= >>>>>>> ccec311 (Add login registration pages) <<<<<<< HEAD >>>>>>> 385136b (Add login registration pages) <<<<<<< HEAD >>>>>>> dda81aa9 (Add login registration pages) ======= ======= ======= >>>>>>> 8c3e531 (Add login registration pages) >>>>>>> 1c33e01 (Add login registration pages) >>>>>>> 40a3d25f (Add login registration pages) 3 relevant lines. 3 lines covered and ======= 2 relevant lines. 2 lines covered and <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> e011b0df (Add login registration pages) ======= >>>>>>> ff4c2fe0 (Add login registration pages) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= 3 relevant lines. 3 lines covered and >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0561be1d (Add login registration pages) >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> 0561be1d (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) ======= 2 relevant lines. 2 lines covered and >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0561be1d (Add login registration pages) >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 793a6ed (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= 2 relevant lines. 2 lines covered and >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= >>>>>>> 11792758 (Rebased) ======= 3 relevant lines. 3 lines covered and >>>>>>> aa3618b (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 84003439 (Featire specs) ======= 3 relevant lines. 3 lines covered and >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 1d11874 (Add login registration pages) >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> c871248 (Add login registration pages) >>>>>>> e011b0df (Add login registration pages) >>>>>>> 1214e1f (Add login registration pages) ======= 2 relevant lines. 2 lines covered and >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> e60833c (Add login registration pages) >>>>>>> 512d1d87 (Add login registration pages) ======= ======= >>>>>>> 8f1baf1c (Add login registration pages) ======= >>>>>>> dda81aa9 (Add login registration pages) ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> c871248 (Add login registration pages) >>>>>>> e011b0df (Add login registration pages) ======= >>>>>>> 06e5e41 (Add login registration pages) ======= ======= >>>>>>> ccec311 (Add login registration pages) >>>>>>> 385136b (Add login registration pages) ======= 2 relevant lines. 2 lines covered and >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> e011b0df (Add login registration pages) ======= ======= >>>>>>> 385136b (Add login registration pages) >>>>>>> dda81aa9 (Add login registration pages) ======= ======= >>>>>>> 385136b (Add login registration pages) ======= >>>>>>> 1c33e01 (Add login registration pages) >>>>>>> 40a3d25f (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= ======= >>>>>>> e055dd0 (Rebased) ======= 3 relevant lines. 3 lines covered and >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ed8ea634 (Add login registration pages) ======= ======= >>>>>>> 4976a174 (Add login registration pages) ======= ======= 2 relevant lines. 2 lines covered and >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2be0d057 (Add login registration pages) ======= ======= >>>>>>> ef483b6d (Fix) ======= 3 relevant lines. 3 lines covered and >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= 3 relevant lines. 3 lines covered and >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 156ffe6 (Add login registration pages) >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= ======= 3 relevant lines. 3 lines covered and >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) >>>>>>> bc6bc8d2 (Rebased) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> 2fef4a0 (Add login registration pages) >>>>>>> 0561be1d (Add login registration pages) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> e60833c (Add login registration pages) >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> ef483b6d (Fix) ======= ======= 3 relevant lines. 3 lines covered and >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= >>>>>>> 7d58507 (Add login registration pages) >>>>>>> c871248 (Add login registration pages) <<<<<<< HEAD >>>>>>> e011b0df (Add login registration pages) ======= ======= >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 852864e (Add login registration pages) <<<<<<< HEAD >>>>>>> 1d11874 (Add login registration pages) <<<<<<< HEAD >>>>>>> ff4c2fe0 (Add login registration pages) ======= ======= ======= >>>>>>> 551f3c1 (Add login registration pages) <<<<<<< HEAD >>>>>>> 06e5e41 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8f1baf1c (Add login registration pages) ======= ======= ======= >>>>>>> ccec311 (Add login registration pages) <<<<<<< HEAD >>>>>>> 385136b (Add login registration pages) <<<<<<< HEAD >>>>>>> dda81aa9 (Add login registration pages) ======= ======= ======= ======= 2 relevant lines. 2 lines covered and >>>>>>> 26b462d (Add login registration pages) >>>>>>> 8c3e531 (Add login registration pages) <<<<<<< HEAD >>>>>>> 1c33e01 (Add login registration pages) <<<<<<< HEAD >>>>>>> 40a3d25f (Add login registration pages) ======= ======= ======= 3 relevant lines. 3 lines covered and >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= 2 relevant lines. 2 lines covered and >>>>>>> 715fac2 (Featire specs) >>>>>>> fb61c5a (Featire specs) >>>>>>> 73f364d8 (Featire specs) 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> bae2b7de (Add login registration pages)
=======
>>>>>>> 56fd9d41 (Add login registration pages)
=======
>>>>>>> 11792758 (Rebased)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 7a08014b (Featire specs)
=======
>>>>>>> a8b17c32 (Add login registration pages)
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> 0561be1d (Add login registration pages)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 512d1d87 (Add login registration pages)
=======
>>>>>>> 4976a174 (Add login registration pages)
=======
>>>>>>> ef483b6d (Fix)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> e6fc67c7 (Featire specs)
=======
>>>>>>> e011b0df (Add login registration pages)
=======
>>>>>>> bdc24a1a (Rebased)
=======
>>>>>>> ff4c2fe0 (Add login registration pages)
=======
>>>>>>> 8f1baf1c (Add login registration pages)
=======
>>>>>>> dda81aa9 (Add login registration pages)
=======
>>>>>>> 40a3d25f (Add login registration pages)
=======
>>>>>>> 1049b80c (Fix)
=======
>>>>>>> 73f364d8 (Featire specs)
=======
>>>>>>> 9a49b7b (Rebased)
=======
>>>>>>> 156ffe6 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6066f925 (Add login registration pages)
=======
=======
>>>>>>> 793a6ed (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8249ff3c (Add login registration pages)
=======
=======
>>>>>>> c5efe8e (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e989024d (Add login registration pages)
=======
=======
>>>>>>> aa3618b (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 75fa7e1b (Rebased)
=======
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
=======
>>>>>>> 311e9fa (Rebased)
=======
>>>>>>> c871248 (Add login registration pages)
=======
>>>>>>> e055dd0 (Rebased)
=======
>>>>>>> 1d11874 (Add login registration pages)
=======
>>>>>>> 06e5e41 (Add login registration pages)
=======
>>>>>>> 385136b (Add login registration pages)
=======
>>>>>>> 1c33e01 (Add login registration pages)
=======
>>>>>>> 9e081dc (Fix)
=======
>>>>>>> fb61c5a (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 7d58507 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 31507b8 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 29e1af94 (Add login registration pages)
=======
=======
=======
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 13fca83d (Rebased)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> 2fef4a0 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f6e20266 (Add login registration pages)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
>>>>>>> e60833c (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ed8ea634 (Add login registration pages)
=======
=======
>>>>>>> f416f45 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 2be0d057 (Add login registration pages)
=======
=======
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
>>>>>>> d9d85ca6 (Fix)
=======
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> ebcdce06 (Featire specs)
=======
>>>>>>> bae2b7de (Add login registration pages)
=======
=======
>>>>>>> c5efe8e (Add login registration pages)
>>>>>>> 56fd9d41 (Add login registration pages)
=======
=======
>>>>>>> aa3618b (Rebased)
>>>>>>> 11792758 (Rebased)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> c51bf93 (Featire specs)
>>>>>>> 7a08014b (Featire specs)
=======
=======
=======
>>>>>>> 311e9fa (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 7d58507 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 31507b8 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> a8b17c32 (Add login registration pages)
=======
=======
=======
>>>>>>> 49e8a6c (Rebased)
>>>>>>> 311e9fa (Rebased)
>>>>>>> bc6bc8d2 (Rebased)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> 2fef4a0 (Add login registration pages)
>>>>>>> 0561be1d (Add login registration pages)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> e60833c (Add login registration pages)
>>>>>>> 512d1d87 (Add login registration pages)
=======
=======
>>>>>>> f416f45 (Add login registration pages)
>>>>>>> 4976a174 (Add login registration pages)
=======
=======
>>>>>>> 5b7749a (Fix)
>>>>>>> ef483b6d (Fix)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
>>>>>>> c871248 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e011b0df (Add login registration pages)
=======
=======
=======
>>>>>>> 49e8a6c (Rebased)
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
=======
>>>>>>> 852864e (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 1d11874 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> ff4c2fe0 (Add login registration pages)
=======
=======
=======
>>>>>>> 551f3c1 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 06e5e41 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 8f1baf1c (Add login registration pages)
=======
=======
=======
>>>>>>> ccec311 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 385136b (Add login registration pages)
<<<<<<< HEAD
>>>>>>> dda81aa9 (Add login registration pages)
=======
=======
=======
>>>>>>> 8c3e531 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 1c33e01 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 40a3d25f (Add login registration pages)
=======
=======
=======
>>>>>>> 1d59aaa (Fix)
>>>>>>> 9e081dc (Fix)
>>>>>>> 1049b80c (Fix)
            OmniAuth.config.logger = Rails.logger
          
      2. 
        
      
      
        
      
          
    2. 
            
            

            

            
          
      3. 
        
      
      
        
      
          
    3. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9bfbd88 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> bae2b7de (Add login registration pages)
=======
>>>>>>> 11792758 (Rebased)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 7a08014b (Featire specs)
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> ef483b6d (Fix)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> e6fc67c7 (Featire specs)
=======
>>>>>>> bdc24a1a (Rebased)
=======
>>>>>>> ff4c2fe0 (Add login registration pages)
=======
>>>>>>> 1049b80c (Fix)
=======
>>>>>>> 9bfbd88 (Featire specs)
=======
>>>>>>> 9a49b7b (Rebased)
=======
=======
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0561be1d (Add login registration pages)
>>>>>>> 156ffe6 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 6066f925 (Add login registration pages)
=======
=======
=======
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 793a6ed (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8249ff3c (Add login registration pages)
=======
=======
>>>>>>> 56fd9d41 (Add login registration pages)
=======
=======
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> c5efe8e (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e989024d (Add login registration pages)
=======
=======
>>>>>>> aa3618b (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 75fa7e1b (Rebased)
=======
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
=======
>>>>>>> 311e9fa (Rebased)
=======
>>>>>>> e055dd0 (Rebased)
=======
>>>>>>> 1d11874 (Add login registration pages)
=======
>>>>>>> 9e081dc (Fix)
=======
<<<<<<< HEAD
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 1214e1f (Add login registration pages)
=======
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 7d58507 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 31507b8 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 29e1af94 (Add login registration pages)
=======
=======
=======
>>>>>>> 49e8a6c (Rebased)
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> 13fca83d (Rebased)
=======
=======
=======
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
=======
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 2fef4a0 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> f6e20266 (Add login registration pages)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> e60833c (Add login registration pages)
<<<<<<< HEAD
>>>>>>> ed8ea634 (Add login registration pages)
=======
=======
=======
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> f416f45 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 2be0d057 (Add login registration pages)
=======
=======
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
>>>>>>> d9d85ca6 (Fix)
=======
>>>>>>> c7a726c5 (Rebased)
=======
=======
>>>>>>> 9bfbd88 (Featire specs)
>>>>>>> ebcdce06 (Featire specs)
=======
>>>>>>> 156ffe6 (Add login registration pages)
>>>>>>> bae2b7de (Add login registration pages)
=======
>>>>>>> 56fd9d41 (Add login registration pages)
=======
=======
>>>>>>> aa3618b (Rebased)
>>>>>>> 11792758 (Rebased)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
=======
>>>>>>> 311e9fa (Rebased)
=======
<<<<<<< HEAD
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 1214e1f (Add login registration pages)
=======
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 7d58507 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 31507b8 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> a8b17c32 (Add login registration pages)
=======
=======
=======
>>>>>>> 49e8a6c (Rebased)
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> bc6bc8d2 (Rebased)
=======
=======
=======
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
=======
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 2fef4a0 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 0561be1d (Add login registration pages)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> e60833c (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 512d1d87 (Add login registration pages)
=======
=======
=======
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> f416f45 (Add login registration pages)
>>>>>>> 4976a174 (Add login registration pages)
=======
=======
>>>>>>> 5b7749a (Fix)
>>>>>>> ef483b6d (Fix)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
=======
>>>>>>> 1214e1f (Add login registration pages)
=======
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 7d58507 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> c871248 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e011b0df (Add login registration pages)
=======
=======
=======
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
=======
=======
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> 852864e (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 1d11874 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> ff4c2fe0 (Add login registration pages)
=======
=======
=======
>>>>>>> 551f3c1 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 06e5e41 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 8f1baf1c (Add login registration pages)
=======
=======
=======
=======
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> ccec311 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 385136b (Add login registration pages)
<<<<<<< HEAD
>>>>>>> dda81aa9 (Add login registration pages)
=======
=======
=======
=======
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 8c3e531 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 1c33e01 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 40a3d25f (Add login registration pages)
=======
=======
=======
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
=======
>>>>>>> 715fac2 (Featire specs)
>>>>>>> fb61c5a (Featire specs)
>>>>>>> 73f364d8 (Featire specs)
            Rails.application.config.middleware.use OmniAuth::Builder do
          
      4. 
        
      
      
        
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6066f925 (Add login registration pages)
=======
>>>>>>> 8249ff3c (Add login registration pages)
=======
>>>>>>> e989024d (Add login registration pages)
=======
>>>>>>> 75fa7e1b (Rebased)
=======
>>>>>>> 84809242 (Featire specs)
=======
>>>>>>> 4f4ea3f9 (Featire specs)
=======
>>>>>>> 29e1af94 (Add login registration pages)
=======
>>>>>>> 13fca83d (Rebased)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f6e20266 (Add login registration pages)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> ed8ea634 (Add login registration pages)
=======
>>>>>>> 2be0d057 (Add login registration pages)
=======
>>>>>>> d9d85ca6 (Fix)
=======
>>>>>>> ebcdce06 (Featire specs)
=======
>>>>>>> bae2b7de (Add login registration pages)
=======
>>>>>>> 56fd9d41 (Add login registration pages)
=======
>>>>>>> 11792758 (Rebased)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 7a08014b (Featire specs)
=======
>>>>>>> a8b17c32 (Add login registration pages)
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> 0561be1d (Add login registration pages)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 512d1d87 (Add login registration pages)
=======
>>>>>>> 4976a174 (Add login registration pages)
=======
>>>>>>> ef483b6d (Fix)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> e6fc67c7 (Featire specs)
=======
>>>>>>> e011b0df (Add login registration pages)
=======
>>>>>>> bdc24a1a (Rebased)
=======
>>>>>>> ff4c2fe0 (Add login registration pages)
=======
>>>>>>> 8f1baf1c (Add login registration pages)
=======
>>>>>>> dda81aa9 (Add login registration pages)
=======
>>>>>>> 40a3d25f (Add login registration pages)
=======
>>>>>>> 1049b80c (Fix)
=======
>>>>>>> 73f364d8 (Featire specs)
          
    4. 
=======
          
    5. 
>>>>>>> 9bfbd88 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
          
    6. 
>>>>>>> 9a49b7b (Rebased)
=======
<<<<<<< HEAD
=======
>>>>>>> 793a6ed (Add login registration pages)
=======
>>>>>>> c5efe8e (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 2fef4a0 (Add login registration pages)
<<<<<<< HEAD
=======
>>>>>>> bae2b7de (Add login registration pages)
=======
>>>>>>> 56fd9d41 (Add login registration pages)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> 0561be1d (Add login registration pages)
          
    7. 
=======
          
    8. 
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> 0561be1d (Add login registration pages)
>>>>>>> 156ffe6 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 6066f925 (Add login registration pages)
=======
=======
=======
          
    9. 
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 793a6ed (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8249ff3c (Add login registration pages)
=======
=======
>>>>>>> 56fd9d41 (Add login registration pages)
=======
=======
          
    10. 
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> c5efe8e (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e989024d (Add login registration pages)
=======
=======
          
    11. 
>>>>>>> aa3618b (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 75fa7e1b (Rebased)
=======
=======
          
    12. 
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> 31507b8 (Add login registration pages)
=======
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 7a08014b (Featire specs)
=======
>>>>>>> 31507b8 (Add login registration pages)
>>>>>>> a8b17c32 (Add login registration pages)
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
=======
>>>>>>> c871248 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e011b0df (Add login registration pages)
=======
=======
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
>>>>>>> 1d11874 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> ff4c2fe0 (Add login registration pages)
=======
=======
>>>>>>> 06e5e41 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 8f1baf1c (Add login registration pages)
=======
=======
>>>>>>> 385136b (Add login registration pages)
<<<<<<< HEAD
>>>>>>> dda81aa9 (Add login registration pages)
=======
=======
>>>>>>> 1c33e01 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 40a3d25f (Add login registration pages)
=======
=======
>>>>>>> 9e081dc (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
>>>>>>> fb61c5a (Featire specs)
>>>>>>> 73f364d8 (Featire specs)
          
    13. 
=======
          
    14. 
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e011b0df (Add login registration pages)
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
>>>>>>> c51bf93 (Featire specs)
>>>>>>> a8b17c32 (Add login registration pages)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> e60833c (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f416f45 (Add login registration pages)
=======
<<<<<<< HEAD
>>>>>>> a8b17c32 (Add login registration pages)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 512d1d87 (Add login registration pages)
=======
=======
>>>>>>> f416f45 (Add login registration pages)
>>>>>>> 4976a174 (Add login registration pages)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c871248 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e011b0df (Add login registration pages)
=======
=======
>>>>>>> 551f3c1 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 06e5e41 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 8f1baf1c (Add login registration pages)
=======
=======
=======
>>>>>>> ccec311 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 385136b (Add login registration pages)
<<<<<<< HEAD
>>>>>>> dda81aa9 (Add login registration pages)
=======
=======
=======
>>>>>>> 8c3e531 (Add login registration pages)
>>>>>>> 1c33e01 (Add login registration pages)
>>>>>>> 40a3d25f (Add login registration pages)
          
    15. 
=======
          
    16. 
>>>>>>> 1214e1f (Add login registration pages)
=======
          
    17. 
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e011b0df (Add login registration pages)
=======
>>>>>>> 8f1baf1c (Add login registration pages)
=======
>>>>>>> dda81aa9 (Add login registration pages)
=======
          
    18. 
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 7d58507 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 31507b8 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 29e1af94 (Add login registration pages)
=======
=======
=======
          
    19. 
>>>>>>> 49e8a6c (Rebased)
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> 13fca83d (Rebased)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
=======
          
    20. 
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 2fef4a0 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> f6e20266 (Add login registration pages)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
          
    21. 
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> e60833c (Add login registration pages)
<<<<<<< HEAD
>>>>>>> ed8ea634 (Add login registration pages)
=======
=======
=======
          
    22. 
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> f416f45 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 2be0d057 (Add login registration pages)
=======
=======
          
    23. 
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
>>>>>>> d9d85ca6 (Fix)
=======
          
    24. 
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> ebcdce06 (Featire specs)
=======
>>>>>>> 156ffe6 (Add login registration pages)
>>>>>>> bae2b7de (Add login registration pages)
=======
>>>>>>> 56fd9d41 (Add login registration pages)
=======
=======
          
    25. 
>>>>>>> aa3618b (Rebased)
>>>>>>> 11792758 (Rebased)
=======
=======
          
    26. 
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> c51bf93 (Featire specs)
>>>>>>> 7a08014b (Featire specs)
=======
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 512d1d87 (Add login registration pages)
=======
          
    27. 
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 7d58507 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 31507b8 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> a8b17c32 (Add login registration pages)
=======
=======
=======
          
    28. 
>>>>>>> 49e8a6c (Rebased)
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> bc6bc8d2 (Rebased)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
=======
          
    29. 
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 2fef4a0 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 0561be1d (Add login registration pages)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
          
    30. 
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> e60833c (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 512d1d87 (Add login registration pages)
=======
=======
=======
          
    31. 
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> f416f45 (Add login registration pages)
>>>>>>> 4976a174 (Add login registration pages)
=======
=======
          
    32. 
>>>>>>> 5b7749a (Fix)
>>>>>>> ef483b6d (Fix)
=======
=======
          
    33. 
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
          
    34. 
=======
          
    35. 
>>>>>>> df37394 (Featire specs)
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
=======
>>>>>>> 06e5e41 (Add login registration pages)
=======
>>>>>>> 385136b (Add login registration pages)
=======
          
    36. 
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 7d58507 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> c871248 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e011b0df (Add login registration pages)
=======
=======
=======
          
    37. 
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
=======
          
    38. 
=======
          
    39. 
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> 852864e (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 1d11874 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> ff4c2fe0 (Add login registration pages)
=======
=======
=======
>>>>>>> 551f3c1 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 06e5e41 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 8f1baf1c (Add login registration pages)
=======
=======
=======
=======
          
    40. 
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> ccec311 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 385136b (Add login registration pages)
<<<<<<< HEAD
>>>>>>> dda81aa9 (Add login registration pages)
=======
=======
=======
=======
          
    41. 
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 8c3e531 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 1c33e01 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 40a3d25f (Add login registration pages)
=======
=======
=======
          
    42. 
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
=======
          
    43. 
>>>>>>> 715fac2 (Featire specs)
>>>>>>> fb61c5a (Featire specs)
>>>>>>> 73f364d8 (Featire specs)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6066f925 (Add login registration pages)
=======
>>>>>>> 8249ff3c (Add login registration pages)
=======
>>>>>>> e989024d (Add login registration pages)
=======
>>>>>>> 75fa7e1b (Rebased)
=======
>>>>>>> 84809242 (Featire specs)
=======
>>>>>>> 4f4ea3f9 (Featire specs)
=======
>>>>>>> 29e1af94 (Add login registration pages)
=======
>>>>>>> 13fca83d (Rebased)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f6e20266 (Add login registration pages)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> ed8ea634 (Add login registration pages)
=======
>>>>>>> 2be0d057 (Add login registration pages)
=======
>>>>>>> d9d85ca6 (Fix)
=======
>>>>>>> ebcdce06 (Featire specs)
=======
>>>>>>> bae2b7de (Add login registration pages)
=======
>>>>>>> 56fd9d41 (Add login registration pages)
=======
>>>>>>> 11792758 (Rebased)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 7a08014b (Featire specs)
=======
>>>>>>> a8b17c32 (Add login registration pages)
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> 0561be1d (Add login registration pages)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 512d1d87 (Add login registration pages)
=======
>>>>>>> 4976a174 (Add login registration pages)
=======
>>>>>>> ef483b6d (Fix)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> e6fc67c7 (Featire specs)
=======
>>>>>>> e011b0df (Add login registration pages)
=======
>>>>>>> bdc24a1a (Rebased)
=======
>>>>>>> ff4c2fe0 (Add login registration pages)
=======
>>>>>>> 8f1baf1c (Add login registration pages)
=======
>>>>>>> dda81aa9 (Add login registration pages)
=======
>>>>>>> 40a3d25f (Add login registration pages)
=======
>>>>>>> 1049b80c (Fix)
=======
>>>>>>> 73f364d8 (Featire specs)
              provider :facebook,
=======
              provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET']
>>>>>>> 9bfbd88 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
              provider :facebook,
>>>>>>> 9a49b7b (Rebased)
=======
<<<<<<< HEAD
=======
>>>>>>> 793a6ed (Add login registration pages)
=======
>>>>>>> c5efe8e (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 2fef4a0 (Add login registration pages)
<<<<<<< HEAD
=======
>>>>>>> bae2b7de (Add login registration pages)
=======
>>>>>>> 56fd9d41 (Add login registration pages)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> 0561be1d (Add login registration pages)
              provider :facebook,
=======
              provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET']
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> 0561be1d (Add login registration pages)
>>>>>>> 156ffe6 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 6066f925 (Add login registration pages)
=======
=======
=======
              provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET']
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 793a6ed (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8249ff3c (Add login registration pages)
=======
=======
>>>>>>> 56fd9d41 (Add login registration pages)
=======
=======
              provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET']
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> c5efe8e (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e989024d (Add login registration pages)
=======
=======
              provider :facebook,
>>>>>>> aa3618b (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 75fa7e1b (Rebased)
=======
=======
              provider :facebook,
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> 31507b8 (Add login registration pages)
=======
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 7a08014b (Featire specs)
=======
>>>>>>> 31507b8 (Add login registration pages)
>>>>>>> a8b17c32 (Add login registration pages)
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
=======
>>>>>>> c871248 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e011b0df (Add login registration pages)
=======
=======
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
>>>>>>> 1d11874 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> ff4c2fe0 (Add login registration pages)
=======
=======
>>>>>>> 06e5e41 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 8f1baf1c (Add login registration pages)
=======
=======
>>>>>>> 385136b (Add login registration pages)
<<<<<<< HEAD
>>>>>>> dda81aa9 (Add login registration pages)
=======
=======
>>>>>>> 1c33e01 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 40a3d25f (Add login registration pages)
=======
=======
>>>>>>> 9e081dc (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
>>>>>>> fb61c5a (Featire specs)
>>>>>>> 73f364d8 (Featire specs)
              provider :facebook,
=======
              provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET']
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e011b0df (Add login registration pages)
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
>>>>>>> c51bf93 (Featire specs)
>>>>>>> a8b17c32 (Add login registration pages)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> e60833c (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f416f45 (Add login registration pages)
=======
<<<<<<< HEAD
>>>>>>> a8b17c32 (Add login registration pages)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 512d1d87 (Add login registration pages)
=======
=======
>>>>>>> f416f45 (Add login registration pages)
>>>>>>> 4976a174 (Add login registration pages)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c871248 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e011b0df (Add login registration pages)
=======
=======
>>>>>>> 551f3c1 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 06e5e41 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 8f1baf1c (Add login registration pages)
=======
=======
=======
>>>>>>> ccec311 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 385136b (Add login registration pages)
<<<<<<< HEAD
>>>>>>> dda81aa9 (Add login registration pages)
=======
=======
=======
>>>>>>> 8c3e531 (Add login registration pages)
>>>>>>> 1c33e01 (Add login registration pages)
>>>>>>> 40a3d25f (Add login registration pages)
              provider :facebook,
=======
              provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET']
>>>>>>> 1214e1f (Add login registration pages)
=======
              provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET']
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e011b0df (Add login registration pages)
=======
>>>>>>> 8f1baf1c (Add login registration pages)
=======
>>>>>>> dda81aa9 (Add login registration pages)
=======
              provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET']
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 7d58507 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 31507b8 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 29e1af94 (Add login registration pages)
=======
=======
=======
              provider :facebook,
>>>>>>> 49e8a6c (Rebased)
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> 13fca83d (Rebased)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
=======
              provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET']
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 2fef4a0 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> f6e20266 (Add login registration pages)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
              provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET']
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> e60833c (Add login registration pages)
<<<<<<< HEAD
>>>>>>> ed8ea634 (Add login registration pages)
=======
=======
=======
              provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET']
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> f416f45 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 2be0d057 (Add login registration pages)
=======
=======
              provider :facebook,
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
>>>>>>> d9d85ca6 (Fix)
=======
              provider :facebook,
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> ebcdce06 (Featire specs)
=======
>>>>>>> 156ffe6 (Add login registration pages)
>>>>>>> bae2b7de (Add login registration pages)
=======
>>>>>>> 56fd9d41 (Add login registration pages)
=======
=======
              provider :facebook,
>>>>>>> aa3618b (Rebased)
>>>>>>> 11792758 (Rebased)
=======
=======
              provider :facebook,
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> c51bf93 (Featire specs)
>>>>>>> 7a08014b (Featire specs)
=======
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 512d1d87 (Add login registration pages)
=======
              provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET']
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 7d58507 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 31507b8 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> a8b17c32 (Add login registration pages)
=======
=======
=======
              provider :facebook,
>>>>>>> 49e8a6c (Rebased)
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> bc6bc8d2 (Rebased)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
=======
              provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET']
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 2fef4a0 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 0561be1d (Add login registration pages)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
              provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET']
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> e60833c (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 512d1d87 (Add login registration pages)
=======
=======
=======
              provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET']
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> f416f45 (Add login registration pages)
>>>>>>> 4976a174 (Add login registration pages)
=======
=======
              provider :facebook,
>>>>>>> 5b7749a (Fix)
>>>>>>> ef483b6d (Fix)
=======
=======
              provider :facebook,
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
              provider :facebook,
=======
              provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET']
>>>>>>> df37394 (Featire specs)
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
=======
>>>>>>> 06e5e41 (Add login registration pages)
=======
>>>>>>> 385136b (Add login registration pages)
=======
              provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET']
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 7d58507 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> c871248 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e011b0df (Add login registration pages)
=======
=======
=======
              provider :facebook,
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
=======
              provider :facebook,
=======
              provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET']
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> 852864e (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 1d11874 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> ff4c2fe0 (Add login registration pages)
=======
=======
=======
>>>>>>> 551f3c1 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 06e5e41 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 8f1baf1c (Add login registration pages)
=======
=======
=======
=======
              provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET']
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> ccec311 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 385136b (Add login registration pages)
<<<<<<< HEAD
>>>>>>> dda81aa9 (Add login registration pages)
=======
=======
=======
=======
              provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET']
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 8c3e531 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 1c33e01 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 40a3d25f (Add login registration pages)
=======
=======
=======
              provider :facebook,
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
=======
              provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET']
>>>>>>> 715fac2 (Featire specs)
>>>>>>> fb61c5a (Featire specs)
>>>>>>> 73f364d8 (Featire specs)
          
      44. 
        
      
      
        
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> bae2b7de (Add login registration pages)
=======
>>>>>>> 56fd9d41 (Add login registration pages)
=======
>>>>>>> 11792758 (Rebased)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 7a08014b (Featire specs)
=======
>>>>>>> a8b17c32 (Add login registration pages)
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> 0561be1d (Add login registration pages)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 512d1d87 (Add login registration pages)
=======
>>>>>>> 4976a174 (Add login registration pages)
=======
>>>>>>> ef483b6d (Fix)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> e6fc67c7 (Featire specs)
=======
>>>>>>> e011b0df (Add login registration pages)
=======
>>>>>>> bdc24a1a (Rebased)
=======
>>>>>>> ff4c2fe0 (Add login registration pages)
=======
>>>>>>> 8f1baf1c (Add login registration pages)
=======
>>>>>>> dda81aa9 (Add login registration pages)
=======
>>>>>>> 40a3d25f (Add login registration pages)
=======
>>>>>>> 1049b80c (Fix)
=======
>>>>>>> 73f364d8 (Featire specs)
=======
>>>>>>> 9a49b7b (Rebased)
=======
>>>>>>> 156ffe6 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6066f925 (Add login registration pages)
=======
=======
>>>>>>> 793a6ed (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8249ff3c (Add login registration pages)
=======
=======
>>>>>>> c5efe8e (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e989024d (Add login registration pages)
=======
=======
>>>>>>> aa3618b (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 75fa7e1b (Rebased)
=======
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
=======
>>>>>>> 311e9fa (Rebased)
=======
>>>>>>> c871248 (Add login registration pages)
=======
>>>>>>> e055dd0 (Rebased)
=======
>>>>>>> 1d11874 (Add login registration pages)
=======
>>>>>>> 06e5e41 (Add login registration pages)
=======
>>>>>>> 385136b (Add login registration pages)
=======
>>>>>>> 1c33e01 (Add login registration pages)
=======
>>>>>>> 9e081dc (Fix)
=======
>>>>>>> fb61c5a (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 7d58507 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 31507b8 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 29e1af94 (Add login registration pages)
=======
=======
=======
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 13fca83d (Rebased)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> 2fef4a0 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f6e20266 (Add login registration pages)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
>>>>>>> e60833c (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ed8ea634 (Add login registration pages)
=======
=======
>>>>>>> f416f45 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 2be0d057 (Add login registration pages)
=======
=======
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
>>>>>>> d9d85ca6 (Fix)
=======
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> ebcdce06 (Featire specs)
=======
>>>>>>> bae2b7de (Add login registration pages)
=======
=======
>>>>>>> c5efe8e (Add login registration pages)
>>>>>>> 56fd9d41 (Add login registration pages)
=======
=======
>>>>>>> aa3618b (Rebased)
>>>>>>> 11792758 (Rebased)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> c51bf93 (Featire specs)
>>>>>>> 7a08014b (Featire specs)
=======
=======
=======
>>>>>>> 311e9fa (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 7d58507 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 31507b8 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> a8b17c32 (Add login registration pages)
=======
=======
=======
>>>>>>> 49e8a6c (Rebased)
>>>>>>> 311e9fa (Rebased)
>>>>>>> bc6bc8d2 (Rebased)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> 2fef4a0 (Add login registration pages)
>>>>>>> 0561be1d (Add login registration pages)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> e60833c (Add login registration pages)
>>>>>>> 512d1d87 (Add login registration pages)
=======
=======
>>>>>>> f416f45 (Add login registration pages)
>>>>>>> 4976a174 (Add login registration pages)
=======
=======
>>>>>>> 5b7749a (Fix)
>>>>>>> ef483b6d (Fix)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
>>>>>>> c871248 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e011b0df (Add login registration pages)
=======
=======
=======
>>>>>>> 49e8a6c (Rebased)
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
=======
>>>>>>> 852864e (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 1d11874 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> ff4c2fe0 (Add login registration pages)
=======
=======
=======
>>>>>>> 551f3c1 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 06e5e41 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 8f1baf1c (Add login registration pages)
=======
=======
=======
>>>>>>> ccec311 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 385136b (Add login registration pages)
<<<<<<< HEAD
>>>>>>> dda81aa9 (Add login registration pages)
=======
=======
=======
>>>>>>> 8c3e531 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 1c33e01 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 40a3d25f (Add login registration pages)
=======
=======
=======
>>>>>>> 1d59aaa (Fix)
>>>>>>> 9e081dc (Fix)
>>>>>>> 1049b80c (Fix)
          
    44. 
            
            

            

                       Rails.application.credentials.dig(:facebook, :FACEBOOK_ID),
          
      45. 
        
      
      
        
      
          
    45. 
            
            

            

                       Rails.application.credentials.dig(:facebook, :FACEBOOK_SECRET),
          
      46. 
        
      
      
        
      
          
    46. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                       scope: 'public_profile, email', info_fields: 'email, first_name, last_name'
=======
                       scope: 'email', info_fields: 'email,name'
>>>>>>> c7a726c5 (Rebased)
=======
                       scope: 'public_profile, email', info_fields: 'email, first_name, last_name'
>>>>>>> ef483b6d (Fix)
=======
=======
>>>>>>> 1049b80c (Fix)
                       scope: 'public_profile, email', info_fields: 'email, first_name, last_name'
=======
                       scope: 'email', info_fields: 'email,name'
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
                       scope: 'public_profile, email', info_fields: 'email, first_name, last_name'
>>>>>>> 9e081dc (Fix)
>>>>>>> 1049b80c (Fix)
          
      47. 
        
      
      
        
      
          
    47. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
    48. 
>>>>>>> 9bfbd88 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> bae2b7de (Add login registration pages)
=======
>>>>>>> 11792758 (Rebased)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 7a08014b (Featire specs)
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> ef483b6d (Fix)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> e6fc67c7 (Featire specs)
=======
>>>>>>> bdc24a1a (Rebased)
=======
>>>>>>> ff4c2fe0 (Add login registration pages)
=======
>>>>>>> 1049b80c (Fix)
=======
          
    49. 
>>>>>>> 9bfbd88 (Featire specs)
=======
>>>>>>> 9a49b7b (Rebased)
=======
=======
          
    50. 
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0561be1d (Add login registration pages)
>>>>>>> 156ffe6 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 6066f925 (Add login registration pages)
=======
=======
=======
          
    51. 
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 793a6ed (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8249ff3c (Add login registration pages)
=======
=======
>>>>>>> 56fd9d41 (Add login registration pages)
=======
=======
          
    52. 
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> c5efe8e (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e989024d (Add login registration pages)
=======
=======
>>>>>>> aa3618b (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 75fa7e1b (Rebased)
=======
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
=======
>>>>>>> 311e9fa (Rebased)
=======
>>>>>>> e055dd0 (Rebased)
=======
>>>>>>> 1d11874 (Add login registration pages)
=======
>>>>>>> 9e081dc (Fix)
=======
          
    53. 
<<<<<<< HEAD
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
=======
=======
=======
          
    54. 
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 1214e1f (Add login registration pages)
=======
          
    55. 
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
    56. 
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 7d58507 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 31507b8 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 29e1af94 (Add login registration pages)
=======
=======
=======
>>>>>>> 49e8a6c (Rebased)
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> 13fca83d (Rebased)
=======
=======
=======
          
    57. 
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
=======
          
    58. 
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 2fef4a0 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> f6e20266 (Add login registration pages)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
          
    59. 
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> e60833c (Add login registration pages)
<<<<<<< HEAD
>>>>>>> ed8ea634 (Add login registration pages)
=======
=======
=======
          
    60. 
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> f416f45 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 2be0d057 (Add login registration pages)
=======
=======
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
>>>>>>> d9d85ca6 (Fix)
=======
>>>>>>> c7a726c5 (Rebased)
=======
=======
          
    61. 
>>>>>>> 9bfbd88 (Featire specs)
>>>>>>> ebcdce06 (Featire specs)
=======
>>>>>>> 156ffe6 (Add login registration pages)
>>>>>>> bae2b7de (Add login registration pages)
=======
>>>>>>> 56fd9d41 (Add login registration pages)
=======
=======
>>>>>>> aa3618b (Rebased)
>>>>>>> 11792758 (Rebased)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
=======
>>>>>>> 311e9fa (Rebased)
=======
          
    62. 
<<<<<<< HEAD
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
=======
=======
=======
=======
          
    63. 
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 1214e1f (Add login registration pages)
=======
          
    64. 
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
    65. 
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 7d58507 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 31507b8 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> a8b17c32 (Add login registration pages)
=======
=======
=======
>>>>>>> 49e8a6c (Rebased)
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> bc6bc8d2 (Rebased)
=======
=======
=======
          
    66. 
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
=======
          
    67. 
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 2fef4a0 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 0561be1d (Add login registration pages)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
          
    68. 
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> e60833c (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 512d1d87 (Add login registration pages)
=======
=======
=======
          
    69. 
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> f416f45 (Add login registration pages)
>>>>>>> 4976a174 (Add login registration pages)
=======
=======
>>>>>>> 5b7749a (Fix)
>>>>>>> ef483b6d (Fix)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
          
    70. 
<<<<<<< HEAD
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
=======
>>>>>>> 1214e1f (Add login registration pages)
=======
          
    71. 
>>>>>>> 730a8ca (Add login registration pages)
=======
          
    72. 
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 7d58507 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> c871248 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e011b0df (Add login registration pages)
=======
=======
=======
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
=======
=======
          
    73. 
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 852864e (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 1d11874 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> ff4c2fe0 (Add login registration pages)
=======
=======
=======
=======
          
    74. 
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 551f3c1 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 06e5e41 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 8f1baf1c (Add login registration pages)
=======
=======
=======
>>>>>>> ccec311 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 385136b (Add login registration pages)
<<<<<<< HEAD
>>>>>>> dda81aa9 (Add login registration pages)
=======
=======
=======
=======
          
    75. 
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 8c3e531 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 1c33e01 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 40a3d25f (Add login registration pages)
=======
=======
=======
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
=======
          
    76. 
>>>>>>> 715fac2 (Featire specs)
>>>>>>> fb61c5a (Featire specs)
>>>>>>> 73f364d8 (Featire specs)
            
            

            

            end
          
      77.
    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> e989024d (Add login registration pages) ======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> 29e1af94 (Add login registration pages) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f6e20266 (Add login registration pages) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ed8ea634 (Add login registration pages) ======= >>>>>>> 2be0d057 (Add login registration pages) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> e011b0df (Add login registration pages) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> ff4c2fe0 (Add login registration pages) ======= >>>>>>> 8f1baf1c (Add login registration pages) ======= >>>>>>> dda81aa9 (Add login registration pages) ======= >>>>>>> 40a3d25f (Add login registration pages) ======= >>>>>>> 1049b80c (Fix) ======= >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> 73dcd461 (Add login registration pages) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> aca90e3 (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> 156ffe6 (Add login registration pages) ======= <<<<<<< HEAD ======= >>>>>>> c5efe8e (Add login registration pages) ======= >>>>>>> aa3618b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> c871248 (Add login registration pages) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 1d11874 (Add login registration pages) ======= >>>>>>> 06e5e41 (Add login registration pages) ======= >>>>>>> 385136b (Add login registration pages) ======= >>>>>>> 1c33e01 (Add login registration pages) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> fb61c5a (Featire specs) ======= >>>>>>> 8d4ec55 (Add login registration pages) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> f92a45b (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> bae2b7de (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= >>>>>>> 793a6ed (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> c5efe8e (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= >>>>>>> aa3618b (Rebased) ======= <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> c51bf93 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> e60833c (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> ed8ea634 (Add login registration pages) ======= >>>>>>> f416f45 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 2be0d057 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> d9d85ca6 (Fix) >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> 0f8241bb (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 88d49ad (Add login registration pages) ======= ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) >>>>>>> c033601 (Rebased) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> c033601 (Rebased) >>>>>>> e3e66f3 (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> ae409ca (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 379a979 (Featire specs) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> 56fd9d41 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 37e48018 (Featire specs) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> aa3618b (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) >>>>>>> 3cf8dd4 (Featire specs) >>>>>>> aa4361fd (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0ed7f7c (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> cacbab9 (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f182ac7 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> 57da3ff (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> a624084 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 6a9fede (Add login registration pages) ======= >>>>>>> f416f45 (Add login registration pages) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> 57a2e05 (Add login registration pages) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> ed8ea634 (Add login registration pages) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD >>>>>>> 2be0d057 (Add login registration pages) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 610b6138 (Featire specs) >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> bae2b7de (Add login registration pages) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 56fd9d41 (Add login registration pages) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> aa3618b (Rebased) >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> cacbab9 (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f182ac7 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> 57da3ff (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> a624084 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 6a9fede (Add login registration pages) ======= >>>>>>> f416f45 (Add login registration pages) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> 57a2e05 (Add login registration pages) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> 0561be1d (Add login registration pages) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> 512d1d87 (Add login registration pages) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD >>>>>>> 4976a174 (Add login registration pages) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 0676508 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 6a9fede (Add login registration pages) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 57a2e05 (Add login registration pages) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> c871248 (Add login registration pages) <<<<<<< HEAD >>>>>>> e011b0df (Add login registration pages) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD >>>>>>> 852864e (Add login registration pages) <<<<<<< HEAD >>>>>>> 1d11874 (Add login registration pages) <<<<<<< HEAD >>>>>>> ff4c2fe0 (Add login registration pages) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 551f3c1 (Add login registration pages) <<<<<<< HEAD >>>>>>> 06e5e41 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8f1baf1c (Add login registration pages) ======= ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> ccec311 (Add login registration pages) <<<<<<< HEAD >>>>>>> 385136b (Add login registration pages) <<<<<<< HEAD >>>>>>> dda81aa9 (Add login registration pages) ======= ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> 8c3e531 (Add login registration pages) <<<<<<< HEAD >>>>>>> 1c33e01 (Add login registration pages) <<<<<<< HEAD >>>>>>> 40a3d25f (Add login registration pages) ======= ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= ======= >>>>>>> 03c0867 (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 03c0867 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8d4ec55 (Add login registration pages) <<<<<<< HEAD >>>>>>> 73dcd461 (Add login registration pages) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs)

    config/initializers/permissions_policy.rb

    100.0% lines covered

    0 relevant lines. 0 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            
            

            

            # Define an application-wide HTTP permissions policy. For further
          
      2. 
        
      
      
        
      
          
    2. 
            
            

            

            # information see https://developers.google.com/web/updates/2018/06/feature-policy
          
      3. 
        
      
      
        
      
          
    3. 
            
            

            

            #
          
      4. 
        
      
      
        
      
          
    4. 
            
            

            

            # Rails.application.config.permissions_policy do |f|
          
      5. 
        
      
      
        
      
          
    5. 
            
            

            

            #   f.camera      :none
          
      6. 
        
      
      
        
      
          
    6. 
            
            

            

            #   f.gyroscope   :none
          
      7. 
        
      
      
        
      
          
    7. 
            
            

            

            #   f.microphone  :none
          
      8. 
        
      
      
        
      
          
    8. 
            
            

            

            #   f.usb         :none
          
      9. 
        
      
      
        
      
          
    9. 
            
            

            

            #   f.fullscreen  :self
          
      10. 
        
      
      
        
      
          
    10. 
            
            

            

            #   f.payment     :self, "https://secure.example.com"
          
      11. 
        
      
      
        
      
          
    11. 
            
            

            

            # end
          
      12.

    config/initializers/wrap_parameters.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            
            

            

            # Be sure to restart your server when you modify this file.
          
      2. 
        
      
      
        
      
          
    2. 
            
            

            

            
          
      3. 
        
      
      
        
      
          
    3. 
            
            

            

            # This file contains settings for ActionController::ParamsWrapper which
          
      4. 
        
      
      
        
      
          
    4. 
            
            

            

            # is enabled by default.
          
      5. 
        
      
      
        
      
          
    5. 
            
            

            

            
          
      6. 
        
      
      
        
      
          
    6. 
            
            

            

            # Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array.
          
      7. 
        
      
      
        
      
          
    7. 
            1
            

            

            ActiveSupport.on_load(:action_controller) do
          
      8. 
        
      
      
        
      
          
    8. 
            2
            

            

              wrap_parameters format: [:json]
          
      9. 
        
      
      
        
      
          
    9. 
            
            

            

            end
          
      10. 
        
      
      
        
      
          
    10. 
            
            

            

            
          
      11. 
        
      
      
        
      
          
    11. 
            
            

            

            # To enable root element in JSON for ActiveRecord objects.
          
      12. 
        
      
      
        
      
          
    12. 
            
            

            

            # ActiveSupport.on_load(:active_record) do
          
      13. 
        
      
      
        
      
          
    13. 
            
            

            

            #   self.include_root_in_json = true
          
      14. 
        
      
      
        
      
          
    14. 
            
            

            

            # end
          
      15.

    config/routes.rb

    100.0% lines covered

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= >>>>>>> 6e923b9d (Featire specs) ======= >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> 34509eee (Featire specs) ======= >>>>>>> e989024d (Add login registration pages) ======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 29e1af94 (Add login registration pages) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f6e20266 (Add login registration pages) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ed8ea634 (Add login registration pages) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 2be0d057 (Add login registration pages) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> e6fc67c7 (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> a2206025 (Featire specs) ======= >>>>>>> b5ac3004 (Featire specs) ======= >>>>>>> e011b0df (Add login registration pages) ======= >>>>>>> bdc24a1a (Rebased) ======= >>>>>>> 53db2224 (Featire specs) ======= >>>>>>> 7b22ad7e (Featire specs) ======= >>>>>>> b97bb382 (Featire specs) ======= >>>>>>> ff4c2fe0 (Add login registration pages) ======= >>>>>>> 4a2f2ad8 (Featire specs) ======= >>>>>>> 8f1baf1c (Add login registration pages) ======= >>>>>>> 21873de0 (Featire specs) ======= >>>>>>> dda81aa9 (Add login registration pages) ======= >>>>>>> 392646b5 (Featire specs) ======= >>>>>>> 40a3d25f (Add login registration pages) ======= >>>>>>> 1049b80c (Fix) ======= >>>>>>> 73f364d8 (Featire specs) ======= >>>>>>> 73dcd461 (Add login registration pages) ======= >>>>>>> f3d746cb (Featire specs) ======= >>>>>>> aa4361fd (Featire specs) ======= >>>>>>> e1ecabbe (Featire specs) ======= >>>>>>> 2612be03 (Featire specs) ======= ======= >>>>>>> f92a45b (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 659083f (Featire specs) ======= ======= >>>>>>> 416166f (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) ======= >>>>>>> c871248 (Add login registration pages) ======= >>>>>>> e055dd0 (Rebased) ======= >>>>>>> 5e31aeb (Featire specs) ======= >>>>>>> 51bc18c (Featire specs) ======= >>>>>>> 973ba8c (Featire specs) ======= >>>>>>> 1d11874 (Add login registration pages) ======= >>>>>>> 8181d13 (Featire specs) ======= >>>>>>> 06e5e41 (Add login registration pages) ======= >>>>>>> 72b9cab (Featire specs) ======= >>>>>>> 385136b (Add login registration pages) ======= >>>>>>> 15c51b7 (Featire specs) ======= >>>>>>> 1c33e01 (Add login registration pages) ======= >>>>>>> 9e081dc (Fix) ======= >>>>>>> fb61c5a (Featire specs) ======= >>>>>>> 8d4ec55 (Add login registration pages) ======= >>>>>>> 216fe41 (Featire specs) ======= >>>>>>> 3cf8dd4 (Featire specs) ======= >>>>>>> afa56d1 (Featire specs) ======= >>>>>>> 49f2e24 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> c871248 (Add login registration pages) ======= ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 852864e (Add login registration pages) <<<<<<< HEAD >>>>>>> 1d11874 (Add login registration pages) ======= ======= <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> ccec311 (Add login registration pages) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= >>>>>>> 6a9fede (Add login registration pages) >>>>>>> 8c3e531 (Add login registration pages) 9 relevant lines. 9 lines covered and ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> 551f3c1 (Add login registration pages) <<<<<<< HEAD >>>>>>> 06e5e41 (Add login registration pages) ======= ======= >>>>>>> 03c0867 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8d4ec55 (Add login registration pages) ======= ======= >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) ======= ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) ======= ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) ======= ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) 3 relevant lines. 3 lines covered and ======= ======= >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0ed7f7c (Featire specs) ======= ======= 3 relevant lines. 3 lines covered and ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) ======= ======= 3 relevant lines. 3 lines covered and ======= >>>>>>> 715fac2 (Featire specs) >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) 4 relevant lines. 4 lines covered and ======= 3 relevant lines. 3 lines covered and >>>>>>> 08edf50 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> aca90e3 (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= >>>>>>> aa3618b (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) 3 relevant lines. 3 lines covered and ======= ======= ======= >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 311e9fa (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> c12b71de (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a8b17c32 (Add login registration pages) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bc6bc8d2 (Rebased) >>>>>>> 31507b8 (Add login registration pages) ======= ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d52f9efe (Featire specs) >>>>>>> 311e9fa (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae07231a (Featire specs) >>>>>>> 932dbec (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c12b71de (Featire specs) >>>>>>> 77d62af (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b904d7ae (Featire specs) >>>>>>> e60833c (Add login registration pages) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4976a174 (Add login registration pages) >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 6a9fede (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> e60833c (Add login registration pages) >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 4976a174 (Add login registration pages) 9 relevant lines. 9 lines covered and ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> bae2b7de (Add login registration pages) ======= ======= >>>>>>> adc21e0 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 4d90e3d (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> c5efe8e (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= >>>>>>> aa3618b (Rebased) >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 31507b8 (Add login registration pages) >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> 311e9fa (Rebased) >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> 77d62af (Featire specs) >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 2fef4a0 (Add login registration pages) >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) 3 relevant lines. 3 lines covered and ======= ======= >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8d4ec55 (Add login registration pages) ======= 3 relevant lines. 3 lines covered and ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= 3 relevant lines. 3 lines covered and ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 03c0867 (Add login registration pages) >>>>>>> 8d4ec55 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ebcdce06 (Featire specs) ======= 3 relevant lines. 3 lines covered and ======= <<<<<<< HEAD >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) 4 relevant lines. 4 lines covered and ======= 3 relevant lines. 3 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 2fef4a0 (Add login registration pages) >>>>>>> f6e20266 (Add login registration pages) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 2fef4a0 (Add login registration pages) >>>>>>> 0561be1d (Add login registration pages) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= >>>>>>> 0561be1d (Add login registration pages) >>>>>>> 57da3ff (Add login registration pages) ======= 4 relevant lines. 4 lines covered and >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) >>>>>>> 88d49ad (Add login registration pages) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) 9 relevant lines. 9 lines covered and >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) ======= >>>>>>> fb61c5a (Featire specs) ======= >>>>>>> 8d4ec55 (Add login registration pages) >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> 57da3ff (Add login registration pages) ======= 4 relevant lines. 4 lines covered and >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) ======= ======= >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD >>>>>>> 1d11874 (Add login registration pages) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 8181d13 (Featire specs) 9 relevant lines. 9 lines covered and >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ecb02dbf (Featire specs) ======= >>>>>>> 2274daf2 (Featire specs) ======= >>>>>>> 448bef30 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> bae2b7de (Add login registration pages) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> a8b17c32 (Add login registration pages) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 31507b8 (Add login registration pages) >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) 9 relevant lines. 9 lines covered and ======= 9 relevant lines. 9 lines covered and >>>>>>> 9620751 (Featire specs) ======= 3 relevant lines. 3 lines covered and >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> ae07231a (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= 3 relevant lines. 3 lines covered and >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c12b71de (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> ae07231a (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) >>>>>>> ae409ca (Featire specs) ======= ======= ======= 3 relevant lines. 3 lines covered and >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= ======= 4 relevant lines. 4 lines covered and >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= ======= ======= 3 relevant lines. 3 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= ======= 4 relevant lines. 4 lines covered and >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 37e48018 (Featire specs) ======= ======= ======= 3 relevant lines. 3 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= ======= 4 relevant lines. 4 lines covered and >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> bf554f4 (Rebased) >>>>>>> aa3618b (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> d2e6b3c (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) ======= 3 relevant lines. 3 lines covered and >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> f182ac7 (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> f182ac7 (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) ======= 4 relevant lines. 4 lines covered and >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) ======= ======= 3 relevant lines. 3 lines covered and >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) ======= ======= >>>>>>> e54deeb (Featire specs) ======= 3 relevant lines. 3 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 4 relevant lines. 4 lines covered and >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) ======= ======= <<<<<<< HEAD ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) 3 relevant lines. 3 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> a624084 (Add login registration pages) ======= 4 relevant lines. 4 lines covered and >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= ======= ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> ed8ea634 (Add login registration pages) ======= ======= ======= ======= 3 relevant lines. 3 lines covered and >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= ======= 4 relevant lines. 4 lines covered and >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD >>>>>>> 2be0d057 (Add login registration pages) ======= ======= ======= 17 relevant lines. 17 lines covered and >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 610b6138 (Featire specs) >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> bae2b7de (Add login registration pages) ======= ======= ======= ======= 3 relevant lines. 3 lines covered and >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 56fd9d41 (Add login registration pages) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= ======= 4 relevant lines. 4 lines covered and >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> bf554f4 (Rebased) >>>>>>> aa3618b (Rebased) >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> d2e6b3c (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) ======= 3 relevant lines. 3 lines covered and >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> f182ac7 (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> f182ac7 (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) ======= 4 relevant lines. 4 lines covered and >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) ======= ======= 3 relevant lines. 3 lines covered and >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) ======= ======= >>>>>>> e54deeb (Featire specs) ======= 3 relevant lines. 3 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 4 relevant lines. 4 lines covered and >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) ======= ======= <<<<<<< HEAD ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) 3 relevant lines. 3 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> a624084 (Add login registration pages) ======= 4 relevant lines. 4 lines covered and >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> 0561be1d (Add login registration pages) ======= ======= ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> 512d1d87 (Add login registration pages) ======= ======= ======= ======= 3 relevant lines. 3 lines covered and >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= ======= 4 relevant lines. 4 lines covered and >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD >>>>>>> 4976a174 (Add login registration pages) ======= ======= ======= 17 relevant lines. 17 lines covered and >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0ed7f7c (Featire specs) ======= ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) ======= ======= ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) ======= ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) >>>>>>> c871248 (Add login registration pages) 9 relevant lines. 9 lines covered and ======= 9 relevant lines. 9 lines covered and >>>>>>> 9620751 (Featire specs) ======= 3 relevant lines. 3 lines covered and >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= 3 relevant lines. 3 lines covered and >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0ed7f7c (Featire specs) <<<<<<< HEAD >>>>>>> ecb02dbf (Featire specs) ======= ======= ======= >>>>>>> 0676508 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) ======= 3 relevant lines. 3 lines covered and >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) <<<<<<< HEAD >>>>>>> e6fc67c7 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 659083f (Featire specs) <<<<<<< HEAD >>>>>>> 2274daf2 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 0676508 (Featire specs) <<<<<<< HEAD >>>>>>> 448bef30 (Featire specs) ======= ======= ======= >>>>>>> f182ac7 (Add login registration pages) ======= 4 relevant lines. 4 lines covered and >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) ======= ======= >>>>>>> e54deeb (Featire specs) ======= 3 relevant lines. 3 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 416166f (Featire specs) <<<<<<< HEAD >>>>>>> a2206025 (Featire specs) ======= ======= ======= ======= ======= 4 relevant lines. 4 lines covered and >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) ======= ======= >>>>>>> 3b03895 (Featire specs) ======= 3 relevant lines. 3 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> da3a9a3 (Featire specs) <<<<<<< HEAD >>>>>>> b5ac3004 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> a624084 (Add login registration pages) ======= 4 relevant lines. 4 lines covered and >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> c871248 (Add login registration pages) <<<<<<< HEAD >>>>>>> e011b0df (Add login registration pages) ======= ======= ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> e055dd0 (Rebased) <<<<<<< HEAD >>>>>>> bdc24a1a (Rebased) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 5e31aeb (Featire specs) <<<<<<< HEAD >>>>>>> 53db2224 (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 51bc18c (Featire specs) <<<<<<< HEAD >>>>>>> 7b22ad7e (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 973ba8c (Featire specs) <<<<<<< HEAD >>>>>>> b97bb382 (Featire specs) ======= ======= ======= ======= >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD >>>>>>> 852864e (Add login registration pages) <<<<<<< HEAD >>>>>>> 1d11874 (Add login registration pages) <<<<<<< HEAD >>>>>>> ff4c2fe0 (Add login registration pages) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) <<<<<<< HEAD >>>>>>> 8181d13 (Featire specs) <<<<<<< HEAD >>>>>>> 4a2f2ad8 (Featire specs) ======= ======= ======= ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 551f3c1 (Add login registration pages) <<<<<<< HEAD >>>>>>> 06e5e41 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8f1baf1c (Add login registration pages) ======= ======= ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> 72b9cab (Featire specs) <<<<<<< HEAD >>>>>>> 21873de0 (Featire specs) ======= ======= ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> ccec311 (Add login registration pages) <<<<<<< HEAD >>>>>>> 385136b (Add login registration pages) <<<<<<< HEAD >>>>>>> dda81aa9 (Add login registration pages) ======= ======= ======= ======= ======= 3 relevant lines. 3 lines covered and >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 15c51b7 (Featire specs) <<<<<<< HEAD >>>>>>> 392646b5 (Featire specs) ======= ======= ======= ======= ======= 4 relevant lines. 4 lines covered and >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> 8c3e531 (Add login registration pages) <<<<<<< HEAD >>>>>>> 1c33e01 (Add login registration pages) <<<<<<< HEAD >>>>>>> 40a3d25f (Add login registration pages) ======= ======= ======= ======= 17 relevant lines. 17 lines covered and >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD >>>>>>> 9e081dc (Fix) <<<<<<< HEAD >>>>>>> 1049b80c (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD >>>>>>> fb61c5a (Featire specs) <<<<<<< HEAD >>>>>>> 73f364d8 (Featire specs) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) ======= ======= 4 relevant lines. 4 lines covered and >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD >>>>>>> 03c0867 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8d4ec55 (Add login registration pages) <<<<<<< HEAD >>>>>>> 73dcd461 (Add login registration pages) ======= ======= ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 2ee03d3 (Featire specs) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) 9 relevant lines. 9 lines covered and ======= 3 relevant lines. 3 lines covered and >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD >>>>>>> 216fe41 (Featire specs) <<<<<<< HEAD >>>>>>> f3d746cb (Featire specs) ======= ======= ======= ======= ======= 3 relevant lines. 3 lines covered and >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 3cf8dd4 (Featire specs) <<<<<<< HEAD >>>>>>> aa4361fd (Featire specs) ======= ======= ======= ======= ======= 3 relevant lines. 3 lines covered and >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= 4 relevant lines. 4 lines covered and >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) ======= ======= 3 relevant lines. 3 lines covered and >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD >>>>>>> afa56d1 (Featire specs) <<<<<<< HEAD >>>>>>> e1ecabbe (Featire specs) ======= ======= ======= ======= ======= 4 relevant lines. 4 lines covered and >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) ======= ======= 3 relevant lines. 3 lines covered and >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) >>>>>>> 49f2e24 (Featire specs) >>>>>>> 2612be03 (Featire specs) 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
            require 'sidekiq/web'
          
      2. 
        
      
      
        
      
<<<<<<< HEAD
          
    2. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6066f925 (Add login registration pages)
=======
>>>>>>> 6e923b9d (Featire specs)
=======
>>>>>>> 8249ff3c (Add login registration pages)
=======
>>>>>>> 34509eee (Featire specs)
=======
>>>>>>> e989024d (Add login registration pages)
=======
>>>>>>> 75fa7e1b (Rebased)
=======
>>>>>>> 84809242 (Featire specs)
=======
>>>>>>> d8dd3b4a (Featire specs)
=======
>>>>>>> 4f4ea3f9 (Featire specs)
=======
>>>>>>> 365d41ed (Featire specs)
=======
>>>>>>> c05ee511 (Featire specs)
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
>>>>>>> 29e1af94 (Add login registration pages)
=======
>>>>>>> 13fca83d (Rebased)
=======
>>>>>>> f136376a (Featire specs)
=======
>>>>>>> 1ca9c0ea (Featire specs)
=======
>>>>>>> 4bf888bf (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f6e20266 (Add login registration pages)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
=======
>>>>>>> 393eff3b (Featire specs)
=======
>>>>>>> 2be0d057 (Add login registration pages)
=======
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> f416f45 (Add login registration pages)
=======
=======
>>>>>>> 512d1d87 (Add login registration pages)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b904d7ae (Featire specs)
=======
=======
>>>>>>> f416f45 (Add login registration pages)
>>>>>>> 4976a174 (Add login registration pages)
              root 'home#index'
=======
=======
>>>>>>> 22ee41c (Add login registration pages)
>>>>>>> e60833c (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ed8ea634 (Add login registration pages)
=======
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> ebcdce06 (Featire specs)
=======
>>>>>>> bae2b7de (Add login registration pages)
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 56fd9d41 (Add login registration pages)
=======
>>>>>>> 11792758 (Rebased)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> 7a08014b (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> a8b17c32 (Add login registration pages)
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> c12b71de (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> 0561be1d (Add login registration pages)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 512d1d87 (Add login registration pages)
              devise_for :users
=======
              root 'home#index'
>>>>>>> 08edf50 (Featire specs)
=======
              devise_for :admin_users, ActiveAdmin::Devise.config
>>>>>>> aca90e3 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
=======
>>>>>>> 88d49ad (Add login registration pages)
=======
>>>>>>> 9a49b7b (Rebased)
=======
>>>>>>> 70fcacc (Featire specs)
=======
>>>>>>> ae409ca (Featire specs)
=======
>>>>>>> 379a979 (Featire specs)
=======
>>>>>>> 156ffe6 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6066f925 (Add login registration pages)
=======
=======
>>>>>>> adc21e0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> 793a6ed (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8249ff3c (Add login registration pages)
=======
=======
>>>>>>> 4d90e3d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> c5efe8e (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e989024d (Add login registration pages)
=======
=======
>>>>>>> aa3618b (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 75fa7e1b (Rebased)
=======
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
              root 'home#index'
=======
=======
=======
>>>>>>> c51bf93 (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 31507b8 (Add login registration pages)
=======
>>>>>>> 311e9fa (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bf05825 (Featire specs)
=======
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 31507b8 (Add login registration pages)
=======
>>>>>>> a8b17c32 (Add login registration pages)
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> bf05825 (Featire specs)
=======
>>>>>>> c12b71de (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a8b17c32 (Add login registration pages)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 7d58507 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> bc6bc8d2 (Rebased)
>>>>>>> 31507b8 (Add login registration pages)
=======
=======
<<<<<<< HEAD
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d52f9efe (Featire specs)
>>>>>>> 311e9fa (Rebased)
=======
=======
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ae07231a (Featire specs)
>>>>>>> 932dbec (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c12b71de (Featire specs)
>>>>>>> 77d62af (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 2fef4a0 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> bae2b7de (Add login registration pages)
=======
=======
>>>>>>> adc21e0 (Featire specs)
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> 4d90e3d (Featire specs)
>>>>>>> 37e48018 (Featire specs)
=======
=======
>>>>>>> c5efe8e (Add login registration pages)
>>>>>>> 56fd9d41 (Add login registration pages)
=======
=======
>>>>>>> aa3618b (Rebased)
>>>>>>> 11792758 (Rebased)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> c51bf93 (Featire specs)
>>>>>>> 7a08014b (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 31507b8 (Add login registration pages)
>>>>>>> a8b17c32 (Add login registration pages)
=======
>>>>>>> 311e9fa (Rebased)
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> 932dbec (Featire specs)
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> c12b71de (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> 0561be1d (Add login registration pages)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
              root 'home#index'
=======
=======
>>>>>>> 22ee41c (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
=======
              root 'home#index'
=======
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
              root 'home#index'
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
              root 'home#index'
=======
<<<<<<< HEAD
>>>>>>> ebcdce06 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
              devise_for :users
=======
              root 'home#index'
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 7a08014b (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 9bfbd88 (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
>>>>>>> 9bfbd88 (Featire specs)
<<<<<<< HEAD
=======
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
              devise_for :users
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 22ee41c (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 88d49ad (Add login registration pages)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a636fda (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
              devise_for :admin_users, ActiveAdmin::Devise.config
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> 9a49b7b (Rebased)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> cacbab9 (Add login registration pages)
=======
>>>>>>> bae2b7de (Add login registration pages)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
>>>>>>> cacbab9 (Add login registration pages)
>>>>>>> 56fd9d41 (Add login registration pages)
              devise_for :admin_users, ActiveAdmin::Devise.config
=======
              devise_for :users
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9ec6862 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 156ffe6 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 6066f925 (Add login registration pages)
=======
=======
=======
=======
              root 'home#index'
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> adc21e0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
=======
=======
              devise_for :users
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 57a2e05 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 793a6ed (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8249ff3c (Add login registration pages)
=======
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
=======
              root 'home#index'
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d90e3d (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
=======
=======
              devise_for :users
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> cacbab9 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> c5efe8e (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e989024d (Add login registration pages)
=======
=======
=======
              devise_for :admin_users, ActiveAdmin::Devise.config
>>>>>>> bf554f4 (Rebased)
>>>>>>> aa3618b (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 75fa7e1b (Rebased)
=======
=======
>>>>>>> 84003439 (Featire specs)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ae07231a (Featire specs)
>>>>>>> 5507b42 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c12b71de (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
=======
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 5507b42 (Featire specs)
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> c12b71de (Featire specs)
              devise_for :admin_users, ActiveAdmin::Devise.config
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
              devise_for :admin_users, ActiveAdmin::Devise.config
>>>>>>> c033601 (Rebased)
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
=======
>>>>>>> cacbab9 (Add login registration pages)
>>>>>>> 7d58507 (Add login registration pages)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> cacbab9 (Add login registration pages)
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
>>>>>>> 2fef4a0 (Add login registration pages)
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> a624084 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b904d7ae (Featire specs)
>>>>>>> e60833c (Add login registration pages)
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4976a174 (Add login registration pages)
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 6a9fede (Add login registration pages)
>>>>>>> f416f45 (Add login registration pages)
<<<<<<< HEAD
=======
>>>>>>> e60833c (Add login registration pages)
>>>>>>> 512d1d87 (Add login registration pages)
=======
>>>>>>> 36356d3 (Featire specs)
>>>>>>> b904d7ae (Featire specs)
=======
>>>>>>> 4976a174 (Add login registration pages)
              devise_for :admin_users, ActiveAdmin::Devise.config
=======
              devise_for :users
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 9ec6862 (Add login registration pages)
=======
=======
              root 'home#index'
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
              devise_for :users
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 57a2e05 (Add login registration pages)
=======
=======
              root 'home#index'
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
              devise_for :users
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> cacbab9 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 7d58507 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 31507b8 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 29e1af94 (Add login registration pages)
=======
=======
=======
=======
              devise_for :admin_users, ActiveAdmin::Devise.config
>>>>>>> bf554f4 (Rebased)
>>>>>>> 49e8a6c (Rebased)
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> 13fca83d (Rebased)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
              devise_for :admin_users, ActiveAdmin::Devise.config
>>>>>>> bf554f4 (Rebased)
=======
              devise_for :admin_users, ActiveAdmin::Devise.config
=======
              devise_for :users
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> f182ac7 (Add login registration pages)
=======
=======
              root 'home#index'
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
              devise_for :users
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 57da3ff (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 2fef4a0 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> f6e20266 (Add login registration pages)
=======
=======
=======
=======
              root 'home#index'
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
=======
              devise_for :users
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> a624084 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e60833c (Add login registration pages)
<<<<<<< HEAD
>>>>>>> ed8ea634 (Add login registration pages)
=======
=======
=======
=======
              root 'home#index'
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 393eff3b (Featire specs)
=======
=======
=======
=======
              devise_for :users
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 6a9fede (Add login registration pages)
>>>>>>> f416f45 (Add login registration pages)
>>>>>>> 2be0d057 (Add login registration pages)
=======
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 9bfbd88 (Featire specs)
>>>>>>> ebcdce06 (Featire specs)
=======
=======
>>>>>>> 610b6138 (Featire specs)
>>>>>>> 9ec6862 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 156ffe6 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> bae2b7de (Add login registration pages)
=======
=======
=======
=======
              root 'home#index'
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 3723aad (Featire specs)
>>>>>>> adc21e0 (Featire specs)
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> 56fd9d41 (Add login registration pages)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d90e3d (Featire specs)
<<<<<<< HEAD
>>>>>>> 37e48018 (Featire specs)
=======
=======
=======
=======
              devise_for :users
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> cacbab9 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> c5efe8e (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 56fd9d41 (Add login registration pages)
=======
=======
=======
              devise_for :admin_users, ActiveAdmin::Devise.config
>>>>>>> bf554f4 (Rebased)
>>>>>>> aa3618b (Rebased)
>>>>>>> 11792758 (Rebased)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
              devise_for :admin_users, ActiveAdmin::Devise.config
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
              devise_for :admin_users, ActiveAdmin::Devise.config
>>>>>>> c033601 (Rebased)
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
=======
>>>>>>> cacbab9 (Add login registration pages)
>>>>>>> 7d58507 (Add login registration pages)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> cacbab9 (Add login registration pages)
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
>>>>>>> 2fef4a0 (Add login registration pages)
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
              devise_for :admin_users, ActiveAdmin::Devise.config
=======
              devise_for :users
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 9ec6862 (Add login registration pages)
=======
=======
              root 'home#index'
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
              devise_for :users
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 57a2e05 (Add login registration pages)
=======
=======
              root 'home#index'
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
              devise_for :users
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> cacbab9 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 7d58507 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 31507b8 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> a8b17c32 (Add login registration pages)
=======
=======
=======
=======
              devise_for :admin_users, ActiveAdmin::Devise.config
>>>>>>> bf554f4 (Rebased)
>>>>>>> 49e8a6c (Rebased)
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> bc6bc8d2 (Rebased)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
              devise_for :admin_users, ActiveAdmin::Devise.config
>>>>>>> bf554f4 (Rebased)
=======
              devise_for :admin_users, ActiveAdmin::Devise.config
=======
              devise_for :users
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> f182ac7 (Add login registration pages)
=======
=======
              root 'home#index'
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
              devise_for :users
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 57da3ff (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 2fef4a0 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 0561be1d (Add login registration pages)
=======
=======
=======
=======
              root 'home#index'
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
=======
              devise_for :users
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> a624084 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e60833c (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 512d1d87 (Add login registration pages)
=======
=======
=======
=======
              root 'home#index'
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b904d7ae (Featire specs)
=======
=======
=======
=======
              devise_for :users
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 6a9fede (Add login registration pages)
>>>>>>> f416f45 (Add login registration pages)
>>>>>>> 4976a174 (Add login registration pages)
          
      3. 
        
      
      
        
      
          
    3. 
=======
          
    4. 
>>>>>>> 7c4ea7f (Fix)
            
            

            

            
          
      5. 
        
      
      
        
      
          
    5. 
            1
            

            

=======
>>>>>>> 6da9530 (Featire specs)
            Rails.application.routes.draw do
=======
            require 'sidekiq/web'
>>>>>>> 9e081dc (Fix)
          
      6. 
        
      
      
        
      
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 9e081dc (Fix)
          
    6. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fb61c5a (Featire specs)
=======
>>>>>>> 8d4ec55 (Add login registration pages)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 7d58507 (Add login registration pages)
=======
<<<<<<< HEAD
>>>>>>> 49e8a6c (Rebased)
=======
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 852864e (Add login registration pages)
=======
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 551f3c1 (Add login registration pages)
=======
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> ccec311 (Add login registration pages)
=======
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8c3e531 (Add login registration pages)
=======
>>>>>>> 03c0867 (Add login registration pages)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
              root 'home#index'
=======
=======
>>>>>>> 22ee41c (Add login registration pages)
<<<<<<< HEAD
=======
              root 'home#index'
=======
>>>>>>> df37394 (Featire specs)
=======
              root 'home#index'
=======
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> 03c0867 (Add login registration pages)
<<<<<<< HEAD
              devise_for :users
=======
              root 'home#index'
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 03c0867 (Add login registration pages)
>>>>>>> 5c33a07 (Featire specs)
=======
=======
              devise_for :users
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 22ee41c (Add login registration pages)
<<<<<<< HEAD
=======
=======
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
              devise_for :admin_users, ActiveAdmin::Devise.config
>>>>>>> c033601 (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
=======
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
=======
>>>>>>> cacbab9 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 7d58507 (Add login registration pages)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 551f3c1 (Add login registration pages)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> a624084 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> ccec311 (Add login registration pages)
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
>>>>>>> 6a9fede (Add login registration pages)
>>>>>>> 8c3e531 (Add login registration pages)
=======
>>>>>>> 5506bd0 (Featire specs)
              devise_for :admin_users, ActiveAdmin::Devise.config
=======
              devise_for :users
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9ec6862 (Add login registration pages)
=======
=======
              root 'home#index'
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 551f3c1 (Add login registration pages)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
=======
=======
              devise_for :users
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 57a2e05 (Add login registration pages)
=======
=======
              root 'home#index'
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
=======
=======
              devise_for :users
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> cacbab9 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 7d58507 (Add login registration pages)
=======
=======
              devise_for :admin_users, ActiveAdmin::Devise.config
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
>>>>>>> 49e8a6c (Rebased)
=======
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
              devise_for :admin_users, ActiveAdmin::Devise.config
=======
              devise_for :users
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
>>>>>>> f182ac7 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 852864e (Add login registration pages)
=======
=======
<<<<<<< HEAD
>>>>>>> 9ec6862 (Add login registration pages)
>>>>>>> 2ee03d3 (Featire specs)
=======
=======
              root 'home#index'
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
=======
              devise_for :users
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 57da3ff (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 551f3c1 (Add login registration pages)
=======
=======
=======
              root 'home#index'
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
=======
              devise_for :users
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> a624084 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> ccec311 (Add login registration pages)
=======
=======
=======
              root 'home#index'
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
=======
              devise_for :users
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> 6a9fede (Add login registration pages)
>>>>>>> 8c3e531 (Add login registration pages)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> 03c0867 (Add login registration pages)
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
          
      7. 
        
      
      
        
      
          
    7. 
=======
          
    8. 
>>>>>>> 7c4ea7f (Fix)
            
            

            

            
          
      9. 
        
      
      
        
      
<<<<<<< HEAD
>>>>>>> 6da9530 (Featire specs)
=======
          
    9. 
            1
            

            

            Rails.application.routes.draw do
          
      10. 
        
      
      
        
      
>>>>>>> 9e081dc (Fix)
          
    10. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6066f925 (Add login registration pages)
=======
>>>>>>> 6e923b9d (Featire specs)
=======
>>>>>>> 8249ff3c (Add login registration pages)
=======
>>>>>>> 34509eee (Featire specs)
=======
>>>>>>> e989024d (Add login registration pages)
=======
>>>>>>> 75fa7e1b (Rebased)
=======
>>>>>>> 84809242 (Featire specs)
=======
>>>>>>> 4f4ea3f9 (Featire specs)
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f6e20266 (Add login registration pages)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> ed8ea634 (Add login registration pages)
=======
>>>>>>> 393eff3b (Featire specs)
=======
>>>>>>> 2be0d057 (Add login registration pages)
=======
>>>>>>> d9d85ca6 (Fix)
=======
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> ebcdce06 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> bae2b7de (Add login registration pages)
=======
<<<<<<< HEAD
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 56fd9d41 (Add login registration pages)
=======
>>>>>>> 11792758 (Rebased)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 7a08014b (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> 0561be1d (Add login registration pages)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 512d1d87 (Add login registration pages)
=======
>>>>>>> b904d7ae (Featire specs)
=======
>>>>>>> 4976a174 (Add login registration pages)
=======
>>>>>>> ef483b6d (Fix)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> e6fc67c7 (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> 73f364d8 (Featire specs)
=======
>>>>>>> 73dcd461 (Add login registration pages)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
              root 'home#index'
=======
              ActiveAdmin.routes(self)
>>>>>>> aca90e3 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
<<<<<<< HEAD
=======
>>>>>>> 88d49ad (Add login registration pages)
=======
>>>>>>> 9a49b7b (Rebased)
=======
>>>>>>> 98beee2 (Manifest_cache true)
=======
>>>>>>> 156ffe6 (Add login registration pages)
=======
>>>>>>> adc21e0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6066f925 (Add login registration pages)
=======
>>>>>>> adc21e0 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
>>>>>>> 793a6ed (Add login registration pages)
=======
>>>>>>> 4d90e3d (Featire specs)
=======
>>>>>>> c5efe8e (Add login registration pages)
=======
>>>>>>> aa3618b (Rebased)
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> c51bf93 (Featire specs)
=======
=======
>>>>>>> fb61c5a (Featire specs)
=======
>>>>>>> 8d4ec55 (Add login registration pages)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8249ff3c (Add login registration pages)
=======
>>>>>>> 4d90e3d (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
>>>>>>> c5efe8e (Add login registration pages)
=======
<<<<<<< HEAD
>>>>>>> e989024d (Add login registration pages)
=======
>>>>>>> aa3618b (Rebased)
=======
<<<<<<< HEAD
>>>>>>> 75fa7e1b (Rebased)
=======
>>>>>>> 824bb2b (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
>>>>>>> c51bf93 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> fc3774fd (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e5752db (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 7d58507 (Add login registration pages)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 49e8a6c (Rebased)
=======
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 2fef4a0 (Add login registration pages)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> e60833c (Add login registration pages)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> f416f45 (Add login registration pages)
=======
>>>>>>> 5b7749a (Fix)
=======
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> f92a45b (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 2fef4a0 (Add login registration pages)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> e60833c (Add login registration pages)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> f416f45 (Add login registration pages)
=======
>>>>>>> 5b7749a (Fix)
=======
=======
>>>>>>> bae2b7de (Add login registration pages)
<<<<<<< HEAD
=======
>>>>>>> e5752db (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> a8b17c32 (Add login registration pages)
=======
>>>>>>> 49e8a6c (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bc6bc8d2 (Rebased)
=======
<<<<<<< HEAD
>>>>>>> 824ea7c9 (Manifest_cache true)
=======
>>>>>>> e5752db (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> 7d58507 (Add login registration pages)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e011b0df (Add login registration pages)
=======
>>>>>>> 49e8a6c (Rebased)
=======
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
>>>>>>> 307f31f (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8a3779d4 (Manifest_cache true)
=======
>>>>>>> 852864e (Add login registration pages)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ff4c2fe0 (Add login registration pages)
=======
>>>>>>> ee5242b (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
>>>>>>> 551f3c1 (Add login registration pages)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8f1baf1c (Add login registration pages)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
>>>>>>> ccec311 (Add login registration pages)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> dda81aa9 (Add login registration pages)
=======
>>>>>>> 6fba6be (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 392646b5 (Featire specs)
=======
>>>>>>> 8c3e531 (Add login registration pages)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 40a3d25f (Add login registration pages)
=======
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
<<<<<<< HEAD
=======
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 22ee41c (Add login registration pages)
>>>>>>> d8abfed3 (Featire specs)
              root 'home#index'
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
>>>>>>> 9bfbd88 (Featire specs)
<<<<<<< HEAD
=======
=======
=======
              ActiveAdmin.routes(self)
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9a49b7b (Rebased)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
              ActiveAdmin.routes(self)
>>>>>>> c033601 (Rebased)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
              ActiveAdmin.routes(self)
>>>>>>> c033601 (Rebased)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 9ec6862 (Add login registration pages)
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> cacbab9 (Add login registration pages)
=======
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
              ActiveAdmin.routes(self)
=======
=======
              ActiveAdmin.routes(self)
>>>>>>> c033601 (Rebased)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
=======
<<<<<<< HEAD
=======
>>>>>>> 9ec6862 (Add login registration pages)
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
=======
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
=======
>>>>>>> cacbab9 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 7d58507 (Add login registration pages)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
>>>>>>> f182ac7 (Add login registration pages)
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
>>>>>>> 2fef4a0 (Add login registration pages)
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> a624084 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e60833c (Add login registration pages)
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 6a9fede (Add login registration pages)
>>>>>>> f416f45 (Add login registration pages)
=======
>>>>>>> 9ec6862 (Add login registration pages)
>>>>>>> bae2b7de (Add login registration pages)
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
>>>>>>> cacbab9 (Add login registration pages)
>>>>>>> 56fd9d41 (Add login registration pages)
              ActiveAdmin.routes(self)
=======
              resources :books, only: %i[show index]
=======
              root 'home#index'
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
=======
              resources :books, only: %i[show index]
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
              root 'home#index'
>>>>>>> 730a8ca (Add login registration pages)
=======
              resources :books, only: %i[show index]
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
=======
              root 'home#index'
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 7d58507 (Add login registration pages)
=======
=======
>>>>>>> bf554f4 (Rebased)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
              ActiveAdmin.routes(self)
<<<<<<< HEAD
>>>>>>> 49e8a6c (Rebased)
=======
=======
              resources :books, only: %i[show index]
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
              root 'home#index'
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 2fef4a0 (Add login registration pages)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
              root 'home#index'
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> e60833c (Add login registration pages)
=======
=======
              resources :books, only: %i[show index]
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
              root 'home#index'
>>>>>>> 26b462d (Add login registration pages)
<<<<<<< HEAD
>>>>>>> f416f45 (Add login registration pages)
=======
=======
              devise_for :admin_users, ActiveAdmin::Devise.config
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
=======
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> 7a08014b (Featire specs)
=======
=======
=======
<<<<<<< HEAD
=======
>>>>>>> 9ec6862 (Add login registration pages)
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
=======
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
=======
>>>>>>> cacbab9 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 7d58507 (Add login registration pages)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
>>>>>>> f182ac7 (Add login registration pages)
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
>>>>>>> 2fef4a0 (Add login registration pages)
=======
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> a624084 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e60833c (Add login registration pages)
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 6a9fede (Add login registration pages)
>>>>>>> f416f45 (Add login registration pages)
              ActiveAdmin.routes(self)
=======
              resources :books, only: %i[show index]
=======
              root 'home#index'
>>>>>>> 1214e1f (Add login registration pages)
=======
              resources :books, only: %i[show index]
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
              root 'home#index'
>>>>>>> 730a8ca (Add login registration pages)
=======
              resources :books, only: %i[show index]
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
=======
              root 'home#index'
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 7d58507 (Add login registration pages)
=======
=======
>>>>>>> bf554f4 (Rebased)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
              ActiveAdmin.routes(self)
<<<<<<< HEAD
>>>>>>> 49e8a6c (Rebased)
=======
=======
              resources :books, only: %i[show index]
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
              root 'home#index'
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 2fef4a0 (Add login registration pages)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
              root 'home#index'
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> e60833c (Add login registration pages)
=======
=======
              resources :books, only: %i[show index]
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
              root 'home#index'
>>>>>>> 26b462d (Add login registration pages)
<<<<<<< HEAD
>>>>>>> f416f45 (Add login registration pages)
=======
=======
              devise_for :admin_users, ActiveAdmin::Devise.config
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
=======
=======
              ActiveAdmin.routes(self)
>>>>>>> c033601 (Rebased)
>>>>>>> 6da9530 (Featire specs)
          
      11. 
        
      
      
        
      
          
    11. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 2fef4a0 (Add login registration pages)
=======
<<<<<<< HEAD
=======
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e60833c (Add login registration pages)
=======
=======
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> f416f45 (Add login registration pages)
=======
>>>>>>> 5b7749a (Fix)
=======
>>>>>>> 6da9530 (Featire specs)
            
          
      12. 
        
      
      
        
      
          
    12. 
            1
            

            

<<<<<<< HEAD
              authenticate :admin_user do
          
      13. 
        
      
      
        
      
<<<<<<< HEAD
          
    13. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 2fef4a0 (Add login registration pages)
=======
=======
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e60833c (Add login registration pages)
=======
=======
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> f416f45 (Add login registration pages)
            end
          
      14.
    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) =======
    ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
    =======

    spec/decorators/author_decorator_spec.rb

    100.0% lines covered

    7 relevant lines. 7 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            require 'rails_helper'
          
      2. 
        
      
      
        
      
          
    2. 
            
            

            

            
          
      3. 
        
      
      
        
      
          
    3. 
            1
            

            

            RSpec.describe AuthorDecorator do
          
      4. 
        
      
      
        
      
          
    4. 
            2
            

            

              let(:decorator) { described_class.new(author) }
=======
=======
=======
<<<<<<< HEAD
=======
>>>>>>> 9ec6862 (Add login registration pages)
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
=======
>>>>>>> cacbab9 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 7d58507 (Add login registration pages)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
              ActiveAdmin.routes(self)
=======
              resources :books, only: %i[show index]
=======
              root 'home#index'
>>>>>>> 1214e1f (Add login registration pages)
=======
              resources :books, only: %i[show index]
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
              root 'home#index'
>>>>>>> 730a8ca (Add login registration pages)
=======
              resources :books, only: %i[show index]
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
=======
              root 'home#index'
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 7d58507 (Add login registration pages)
=======
=======
>>>>>>> bf554f4 (Rebased)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
>>>>>>> f182ac7 (Add login registration pages)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> a624084 (Add login registration pages)
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> 6a9fede (Add login registration pages)
              ActiveAdmin.routes(self)
<<<<<<< HEAD
>>>>>>> 49e8a6c (Rebased)
=======
=======
              resources :books, only: %i[show index]
=======
              root 'home#index'
>>>>>>> 1214e1f (Add login registration pages)
=======
              resources :books, only: %i[show index]
>>>>>>> 08edf50 (Featire specs)
=======
              root 'home#index'
>>>>>>> 730a8ca (Add login registration pages)
=======
              resources :books, only: %i[show index]
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
=======
              root 'home#index'
>>>>>>> e1f4d17 (Add login registration pages)
=======
              resources :books, only: %i[show index]
>>>>>>> 4552227 (Featire specs)
=======
              root 'home#index'
>>>>>>> 26b462d (Add login registration pages)
=======
              devise_for :admin_users, ActiveAdmin::Devise.config
>>>>>>> 7c4ea7f (Fix)
=======
=======
>>>>>>> 03c0867 (Add login registration pages)
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 22ee41c (Add login registration pages)
              root 'home#index'
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
          
      5. 
        
      
      
        
      
          
    5. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 5506bd0 (Featire specs)
            
          
      6. 
        
      
      
        
      
          
    6. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
              authenticate :admin_user do
          
      7. 
        
      
      
        
      
          
    7. 
            1
            

            

                mount Sidekiq::Web => '/sidekiq'
          
      8. 
        
      
      
        
      
          
    8. 
            
            

            

              end
          
      9. 
        
      
      
        
      
          
    9. 
            
            

            

            
          
      10. 
        
      
      
        
      
          
    10. 
            1
            

            

              ActiveAdmin.routes(self)
          
      11. 
        
      
      
        
      
          
    11. 
            
            

            

            
          
      12. 
        
      
      
        
      
<<<<<<< HEAD
          
    12. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
            RSpec.describe AuthorDecorator do
          
      13. 
        
      
      
        
      
          
    13. 
            2
            

            

<<<<<<< HEAD
              let(:decorator) { described_class.new(author) }
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
=======
=======
              let(:book_decorator) { described_class.new(book) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
          
      14. 
        
      
      
        
      
          
    14. 
            3
            

            

              let(:book) { FactoryBot.create(:book, authors: authors, categories: categories) }
          
      15. 
        
      
      
        
      
          
    15. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
=======
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 7d58507 (Add login registration pages)
=======
>>>>>>> 49e8a6c (Rebased)
            
          
      16. 
        
      
      
        
      
          
    16. 
=======
          
    17. 
>>>>>>> 1d59aaa (Fix)
            1
            

            

<<<<<<< HEAD
=======
=======
>>>>>>> 03c0867 (Add login registration pages)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> 715fac2 (Featire specs)
=======
=======
=======
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 22ee41c (Add login registration pages)
>>>>>>> 03c0867 (Add login registration pages)
              resources :books, only: %i[show index]
          
      18. 
        
      
      
        
      
<<<<<<< HEAD
<<<<<<< HEAD
          
    18. 
=======
=======
>>>>>>> 03c0867 (Add login registration pages)
<<<<<<< HEAD
          
    19. 
=======
=======
>>>>>>> 22ee41c (Add login registration pages)
<<<<<<< HEAD
          
    20. 
=======
          
    21. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> 715fac2 (Featire specs)
=======
=======
=======
          
    22. 
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 22ee41c (Add login registration pages)
>>>>>>> 03c0867 (Add login registration pages)
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 08edf50 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> 730a8ca (Add login registration pages)
=======
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 7d58507 (Add login registration pages)
=======
>>>>>>> 715fac2 (Featire specs)
            end
          
      23.
    >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD root 'home#index' >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> f92a45b (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    =======

    spec/decorators/author_decorator_spec.rb

    100.0% lines covered

    7 relevant lines. 7 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            require 'rails_helper'
          
      2. 
        
      
      
        
      
          
    2. 
            
            

            

            
          
      3. 
        
      
      
        
      
          
    3. 
            1
            

            

            RSpec.describe AuthorDecorator do
          
      4. 
        
      
      
        
      
          
    4. 
            2
            

            

              let(:decorator) { described_class.new(author) }
          
      5. 
        
      
      
        
      
          
    5. 
            
            

            

            
          
      6. 
        
      
      
        
      
          
    6. 
            2
            

            

              let(:author) { FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk') }
          
      7. 
        
      
      
        
      
          
    7. 
            
            

            

            
          
      8. 
        
      
      
        
      
          
    8. 
            1
            

            

              context 'when decorate' do
          
      9. 
        
      
      
        
      
          
    9. 
            1
            

            

                it '#full_name' do
          
      10. 
        
      
      
        
      
          
    10. 
            1
            

            

                  expect(decorator.full_name).to eq('Vlad Todorchuk')
          
      11. 
        
      
      
        
      
          
    11. 
            
            

            

                end
          
      12. 
        
      
      
        
      
          
    12. 
            
            

            

              end
          
      13. 
        
      
      
        
      
          
    13. 
            
            

            

=======
<<<<<<< HEAD
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
            end
          
      14.
    <<<<<<< HEAD <<<<<<< HEAD
    >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    >>>>>>> 0b43b18 (Manifest_cache true)

    spec/decorators/author_decorator_spec.rb

    =======

    spec/decorators/book_decorator_spec.rb

    >>>>>>> bd8bda4 (Manifest_cache true) =======

    spec/decorators/book_decorator_spec.rb

    >>>>>>> aa7b40c (Manifest_cache true)

    100.0% lines covered

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0b43b18 (Manifest_cache true) 7 relevant lines. 7 lines covered and ======= 12 relevant lines. 12 lines covered and >>>>>>> bd8bda4 (Manifest_cache true) ======= 12 relevant lines. 12 lines covered and >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD ======= 7 relevant lines. 7 lines covered and ======= 13 relevant lines. 13 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0b43b18 (Manifest_cache true) 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            require 'rails_helper'
          
      2. 
        
      
      
        
      
          
    2. 
            
            

            

            
          
      3. 
        
      
      
        
      
          
    3. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
            RSpec.describe AuthorDecorator do
          
      4. 
        
      
      
        
      
          
    4. 
            2
            

            

              let(:decorator) { described_class.new(author) }
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 6fa625b (Manifest_cache true)
>>>>>>> 86d584a (Manifest_cache true)
>>>>>>> 0e864a5 (Manifest_cache true)
          
      5. 
        
      
      
        
      
          
    5. 
            
            

            

            
          
      6. 
        
      
      
        
      
<<<<<<< HEAD
=======
<<<<<<< HEAD
          
    6. 
=======
>>>>>>> da3a9a3 (Featire specs)
          
    7. 
            2
            

            

              let(:author) { FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk') }
          
      8. 
        
      
      
        
      
          
    8. 
            
            

            

            
          
      9. 
        
      
      
        
      
          
    9. 
            1
            

            

              context 'when decorate' do
          
      10. 
        
      
      
        
      
          
    10. 
            1
            

            

                it '#full_name' do
          
      11. 
        
      
      
        
      
          
    11. 
            1
            

            

                  expect(decorator.full_name).to eq('Vlad Todorchuk')
          
      12. 
        
      
      
        
      
          
    12. 
            
            

            

                end
          
      13. 
        
      
      
        
      
          
    13. 
            
            

            

              end
          
      14. 
        
      
      
        
      
          
    14. 
            
            

            

<<<<<<< HEAD
            end
          
      15.
    >>>>>>> 066fd0b (Fix book_spec decrease quantity and price)

    spec/decorators/author_decorator_spec.rb

    100.0% lines covered

    <<<<<<< HEAD 7 relevant lines. 7 lines covered and ======= 13 relevant lines. 13 lines covered and >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            require 'rails_helper'
          
      2. 
        
      
      
        
      
          
    2. 
            
            

            

            
          
      3. 
        
      
      
        
      
          
    3. 
            1
            

            

            RSpec.describe AuthorDecorator do
          
      4. 
        
      
      
        
      
          
    4. 
            2
            

            

<<<<<<< HEAD
              let(:decorator) { described_class.new(author) }
=======
              let(:book_decorator) { described_class.new(book) }
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
          
      5. 
        
      
      
        
      
          
    5. 
            3
            

            

              let(:book) { FactoryBot.create(:book, authors: authors, categories: categories) }
          
      6. 
        
      
      
        
      
          
    6. 
            
            

            

            
          
      7. 
        
      
      
        
      
<<<<<<< HEAD
          
    7. 
            2
=======
=======
>>>>>>> 5b7749a (Fix)
          
    8. 
            1
            

            

                mount Sidekiq::Web => '/sidekiq'
          
      9. 
        
      
      
        
      
          
    9. 
            
            

            

              end
          
      10. 
        
      
      
        
      
          
    10. 
            
            

            

            
          
      11. 
        
      
      
        
      
          
    11. 
            1
            

            

              ActiveAdmin.routes(self)
          
      12. 
        
      
      
        
      
          
    12. 
            
            

            

<<<<<<< HEAD
                end
          
      13. 
        
      
      
        
      
          
    13. 
            
            

            

              end
          
      14. 
        
      
      
        
      
          
    14. 
            
            

            

<<<<<<< HEAD
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
            end
          
      15.
    <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> da3a9a3 (Featire specs) >>>>>>> c336a21 (Fix book_spec decrease quantity and price)

    spec/decorators/book_decorator_spec.rb

    >>>>>>> bd8bda4 (Manifest_cache true) =======

    spec/decorators/book_decorator_spec.rb

    >>>>>>> aa7b40c (Manifest_cache true)

    100.0% lines covered

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 7 relevant lines. 7 lines covered and ======= 12 relevant lines. 12 lines covered and >>>>>>> bd8bda4 (Manifest_cache true) ======= 12 relevant lines. 12 lines covered and >>>>>>> aa7b40c (Manifest_cache true) ======= 13 relevant lines. 13 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            require 'rails_helper'
          
      2. 
        
      
      
        
      
          
    2. 
            
            

            

<<<<<<< HEAD
=======
>>>>>>> 5b7749a (Fix)
=======
>>>>>>> da3a9a3 (Featire specs)
            
          
      3. 
        
      
      
        
      
<<<<<<< HEAD
<<<<<<< HEAD
          
    3. 
=======
          
    4. 
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
            RSpec.describe AuthorDecorator do
          
      5. 
        
      
      
        
      
          
    5. 
            2
            

            

<<<<<<< HEAD
              let(:decorator) { described_class.new(author) }
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
              let(:book_decorator) { described_class.new(book) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
              let(:book_decorator) { described_class.new(book) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> e3e66f3 (Featire specs)
          
      6. 
        
      
      
        
      
          
    6. 
            3
            

            

              let(:book) { FactoryBot.create(:book, authors: authors, categories: categories) }
          
      7. 
        
      
      
        
      
          
    7. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
=======
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 7d58507 (Add login registration pages)
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
            
          
      8. 
        
      
      
        
      
          
    8. 
=======
          
    9. 
>>>>>>> 5b7749a (Fix)
            1
            

            

<<<<<<< HEAD
              resources :books, only: %i[show index]
          
      10. 
        
      
      
        
      
          
    10. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 08edf50 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> 730a8ca (Add login registration pages)
=======
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 7d58507 (Add login registration pages)
            end
          
      11.
    >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD root 'home#index' <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= root 'home#index' >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) ======= ActiveAdmin.routes(self) >>>>>>> 11792758 (Rebased) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    =======

    spec/decorators/author_decorator_spec.rb

    100.0% lines covered

    7 relevant lines. 7 lines covered and 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            require 'rails_helper'
          
      2. 
        
      
      
        
      
          
    2. 
            
            

            

            
          
      3. 
        
      
      
        
      
          
    3. 
            1
            

            

            RSpec.describe AuthorDecorator do
          
      4. 
        
      
      
        
      
          
    4. 
            2
            

            

              let(:decorator) { described_class.new(author) }
          
      5. 
        
      
      
        
      
          
    5. 
            
            

            

            
          
      6. 
        
      
      
        
      
          
    6. 
            2
            

            

              let(:author) { FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk') }
          
      7. 
        
      
      
        
      
          
    7. 
            
            

            

            
          
      8. 
        
      
      
        
      
          
    8. 
            1
            

            

              context 'when decorate' do
          
      9. 
        
      
      
        
      
          
    9. 
            1
            

            

                it '#full_name' do
          
      10. 
        
      
      
        
      
          
    10. 
            1
            

            

                  expect(decorator.full_name).to eq('Vlad Todorchuk')
          
      11. 
        
      
      
        
      
          
    11. 
            
            

            

                end
          
      12. 
        
      
      
        
      
          
    12. 
            
            

            

              end
          
      13. 
        
      
      
        
      
          
    13. 
            
            

            

            end
          
      14.
    >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)

    spec/decorators/author_decorator_spec.rb

    =======

    spec/decorators/book_decorator_spec.rb

    >>>>>>> bd8bda4 (Manifest_cache true) =======

    spec/decorators/book_decorator_spec.rb

    >>>>>>> aa7b40c (Manifest_cache true)

    100.0% lines covered

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 7 relevant lines. 7 lines covered and ======= 12 relevant lines. 12 lines covered and >>>>>>> bd8bda4 (Manifest_cache true) ======= 12 relevant lines. 12 lines covered and >>>>>>> aa7b40c (Manifest_cache true) ======= 7 relevant lines. 7 lines covered and ======= 13 relevant lines. 13 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            require 'rails_helper'
          
      2. 
        
      
      
        
      
          
    2. 
            
            

            

            
          
      3. 
        
      
      
        
      
          
    3. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
            RSpec.describe AuthorDecorator do
          
      4. 
        
      
      
        
      
          
    4. 
            2
            

            

              let(:decorator) { described_class.new(author) }
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 6fa625b (Manifest_cache true)
>>>>>>> 86d584a (Manifest_cache true)
>>>>>>> e5890c2 (Manifest_cache true)
>>>>>>> 1d6a89b5 (Manifest_cache true)
          
      5. 
        
      
      
        
      
          
    5. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 2fef4a0 (Add login registration pages)
=======
<<<<<<< HEAD
=======
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e60833c (Add login registration pages)
=======
=======
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> f416f45 (Add login registration pages)
=======
>>>>>>> 5b7749a (Fix)
=======
>>>>>>> bae2b7de (Add login registration pages)
=======
=======
>>>>>>> 730a8ca (Add login registration pages)
=======
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 56fd9d41 (Add login registration pages)
=======
>>>>>>> 11792758 (Rebased)
            
          
      6. 
        
      
      
        
      
<<<<<<< HEAD
          
    6. 
=======
          
    7. 
            2
            

            

              let(:author) { FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk') }
          
      8. 
        
      
      
        
      
          
    8. 
            
            

            

            
          
      9. 
        
      
      
        
      
          
    9. 
            1
            

            

              context 'when decorate' do
          
      10. 
        
      
      
        
      
          
    10. 
            1
            

            

                it '#full_name' do
          
      11. 
        
      
      
        
      
          
    11. 
            1
            

            

                  expect(decorator.full_name).to eq('Vlad Todorchuk')
          
      12. 
        
      
      
        
      
          
    12. 
            
            

            

                end
          
      13. 
        
      
      
        
      
          
    13. 
            
            

            

              end
          
      14. 
        
      
      
        
      
          
    14. 
            
            

            

=======
>>>>>>> 7a02bbe (Featire specs)
            end
          
      15.
    <<<<<<< HEAD ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> c336a21 (Fix book_spec decrease quantity and price)

    spec/decorators/book_decorator_spec.rb

    >>>>>>> bd8bda4 (Manifest_cache true) =======

    spec/decorators/book_decorator_spec.rb

    >>>>>>> aa7b40c (Manifest_cache true)

    100.0% lines covered

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 7 relevant lines. 7 lines covered and ======= 12 relevant lines. 12 lines covered and >>>>>>> bd8bda4 (Manifest_cache true) ======= 12 relevant lines. 12 lines covered and >>>>>>> aa7b40c (Manifest_cache true) ======= 13 relevant lines. 13 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) 0 lines missed. 
        
      
      
        
      
          
    1. 
            1
            

            

            require 'rails_helper'
          
      2. 
        
      
      
        
      
          
    2. 
            
            

            

            
          
      3. 
        
      
      
        
      
          
    3. 
>>>>>>> e5752db (Featire specs)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
              resources :books, only: %i[show index]
          
      4. 
        
      
      
        
      
          
    4. 
            
            

            

>>>>>>> 7a08014b (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
              authenticate :admin_user do
=======
=======
>>>>>>> ebcdce06 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 08edf50 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 9bfbd88 (Featire specs)
=======
>>>>>>> 11792758 (Rebased)
=======
>>>>>>> 84003439 (Featire specs)
              resources :books, only: %i[show index]
>>>>>>> c7a726c5 (Rebased)
          
      5. 
        
      
      
        
      
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
    5. 
=======
<<<<<<< HEAD
>>>>>>> 9bfbd88 (Featire specs)
          
    6. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 56fd9d41 (Add login registration pages)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 2fef4a0 (Add login registration pages)
=======
=======
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e60833c (Add login registration pages)
=======
=======
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> f416f45 (Add login registration pages)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
        
      
  
      
    
      spec/decorators/book_decorator_spec.rb
      
>>>>>>> bd8bda4 (Manifest_cache true)
=======
        
      
  
      
    
      spec/decorators/book_decorator_spec.rb
      
>>>>>>> aa7b40c (Manifest_cache true)
    
      
      
  100.0%


      lines covered
    
      

    

    
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
      7 relevant lines.
      7 lines covered and
=======
      12 relevant lines.
      12 lines covered and
>>>>>>> bd8bda4 (Manifest_cache true)
=======
      12 relevant lines.
      12 lines covered and
>>>>>>> aa7b40c (Manifest_cache true)
=======
      13 relevant lines.
      13 lines covered and
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            require 'rails_helper'
          
        2. 
        
        
      
        
        
          
      2. 
            
            

            

            
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
            RSpec.describe AuthorDecorator do
          
        4. 
        
        
      
        
        
          
      4. 
            2
            

            

<<<<<<< HEAD
              let(:decorator) { described_class.new(author) }
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 6fa625b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 98beee2 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
              let(:book_decorator) { described_class.new(book) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
          
        5. 
        
        
      
        
        
          
      5. 
            3
            

            

              let(:book) { FactoryBot.create(:book, authors: authors, categories: categories) }
          
        6. 
        
        
      
        
        
          
      6. 
            
            

            

            
          
        7. 
        
        
      
        
        
          
      7. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 08edf50 (Featire specs)
=======
=======
>>>>>>> 88d49ad (Add login registration pages)
=======
>>>>>>> 9a49b7b (Rebased)
=======
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6da9530 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f92a45b (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 9bfbd88 (Featire specs)
            
            

            

>>>>>>> ebcdce06 (Featire specs)
=======
=======
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 56fd9d41 (Add login registration pages)
            end
          
        8. 
        
        
      
    
      
  
      

      

      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9bfbd88 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 9bfbd88 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
        
      
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
        
      
=======
        
      
  
      
    
      spec/decorators/author_decorator_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      7 relevant lines.
      7 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            require 'rails_helper'
          
        2. 
        
        
      
        
        
          
      2. 
            
            

            

            
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

            RSpec.describe AuthorDecorator do
          
        4. 
        
        
      
        
        
          
      4. 
            2
            

            

              let(:decorator) { described_class.new(author) }
=======
=======
<<<<<<< HEAD
              resources :books, only: %i[show index]
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
=======
=======
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 22ee41c (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 88d49ad (Add login registration pages)
=======
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> f92a45b (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> f92a45b (Featire specs)
              resources :books, only: %i[show index]
          
        5. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 88d49ad (Add login registration pages)
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> c51bf93 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> f92a45b (Featire specs)
          
      5. 
=======
=======
>>>>>>> 22ee41c (Add login registration pages)
=======
          
      6. 
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      7. 
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9bfbd88 (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
          
      8. 
=======
          
      9. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 9bfbd88 (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> c51bf93 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> f92a45b (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
=======
          
      10. 
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 22ee41c (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 88d49ad (Add login registration pages)
=======
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
>>>>>>> c51bf93 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
>>>>>>> f92a45b (Featire specs)
            
            

            

            end
          
        11. 
        
        
      
    
      
  
      

      

      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
<<<<<<< HEAD
>>>>>>> 9bfbd88 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> bb5c652 (Fix book_spec decrease quantity and price)
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 9bfbd88 (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
>>>>>>> c51bf93 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> bb5c652 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
>>>>>>> f92a45b (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
        
      
  
      
    
      spec/decorators/author_decorator_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      7 relevant lines.
      7 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            require 'rails_helper'
          
        2. 
        
        
      
        
        
          
      2. 
            
            

            

            
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

            RSpec.describe AuthorDecorator do
          
        4. 
        
        
      
        
        
          
      4. 
            2
            

            

              let(:decorator) { described_class.new(author) }
>>>>>>> 84003439 (Featire specs)
          
        5. 
        
        
      
        
        
          
      5. 
            
            

            

<<<<<<< HEAD
            
          
        6. 
        
        
      
        
        
          
      6. 
            2
            

            

              let(:author) { FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk') }
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> bf554f4 (Rebased)
>>>>>>> 84003439 (Featire specs)
              devise_for :users
>>>>>>> aca90e3 (Rebased)
=======
<<<<<<< HEAD
              resources :books, only: %i[show index]
>>>>>>> bae2b7de (Add login registration pages)
=======
>>>>>>> c033601 (Rebased)
>>>>>>> 9a49b7b (Rebased)
=======
=======
=======
>>>>>>> bf554f4 (Rebased)
>>>>>>> 311e9fa (Rebased)
=======
=======
>>>>>>> bf554f4 (Rebased)
>>>>>>> e055dd0 (Rebased)
              devise_for :users
>>>>>>> c033601 (Rebased)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> bf554f4 (Rebased)
              devise_for :users
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
              devise_for :users
>>>>>>> c033601 (Rebased)
>>>>>>> 6da9530 (Featire specs)
>>>>>>> 0f8241bb (Featire specs)
          
        7. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
          
      7. 
            
            

            

            
          
        8. 
        
        
      
        
        
          
      8. 
            1
            

            

              devise_for :users, as: 'omniauth', controller: { omniauth_callbacks: 'callbacks' }
          
        9. 
        
        
      
        
        
          
      9. 
            
            

            

            
          
        10. 
        
        
      
        
        
          
      10. 
            1
            

            

=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
              root 'home#index'
          
        11. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
          
      11. 
            
            

            

            
          
        12. 
        
        
      
        
        
          
      12. 
            1
            

            

              resources :users
          
        13. 
        
        
      
        
        
>>>>>>> 2a25e4c (Featire specs)
>>>>>>> 216fe41 (Featire specs)
          
      13. 
=======
          
      14. 
>>>>>>> 6da9530 (Featire specs)
=======
          
      15. 
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
=======
          
      16. 
>>>>>>> 9e081dc (Fix)
            
            

            

<<<<<<< HEAD
            
          
        17. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      17. 
=======
=======
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
          
      18. 
>>>>>>> 6da9530 (Featire specs)
=======
          
      19. 
>>>>>>> 9e081dc (Fix)
            1
            

            

              devise_for :users, as: 'omniauth', controller: { omniauth_callbacks: 'callbacks' }
          
        20. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      20. 
=======
          
      21. 
>>>>>>> 6da9530 (Featire specs)
=======
          
      22. 
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
=======
          
      23. 
>>>>>>> 9e081dc (Fix)
            
            

            

            
          
        24. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      24. 
=======
=======
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
          
      25. 
>>>>>>> 6da9530 (Featire specs)
=======
          
      26. 
>>>>>>> 9e081dc (Fix)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 311e9fa (Rebased)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 9e081dc (Fix)
=======
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
=======
=======
>>>>>>> 51bc18c (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> bf05825 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> e055dd0 (Rebased)
=======
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 5b7749a (Fix)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 6da9530 (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 659083f (Featire specs)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
=======
=======
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> e055dd0 (Rebased)
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> 973ba8c (Featire specs)
=======
=======
>>>>>>> 1d59aaa (Fix)
>>>>>>> 9e081dc (Fix)
              root 'home#index'
          
        27. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
=======
=======
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
=======
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
=======
=======
>>>>>>> e055dd0 (Rebased)
=======
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 973ba8c (Featire specs)
=======
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9e081dc (Fix)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
=======
=======
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> e055dd0 (Rebased)
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5e31aeb (Featire specs)
=======
=======
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 51bc18c (Featire specs)
=======
=======
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 973ba8c (Featire specs)
=======
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
          
      27. 
=======
          
      28. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
          
      29. 
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
            
            

            

            
          
        30. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
          
      30. 
=======
          
      31. 
>>>>>>> 6da9530 (Featire specs)
=======
          
      32. 
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
            1
            

            

              resources :users
          
        33. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
          
      33. 
            
            

            

            
          
        34. 
        
        
      
        
        
<<<<<<< HEAD
          
      34. 
            1
=======
          
      35. 
            2
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
            

            

              resources :books, only: %i[show index] do
          
        36. 
        
        
      
        
        
<<<<<<< HEAD
          
      36. 
            1
=======
          
      37. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5b7749a (Fix)
          
      38. 
            
            

            

            
          
        39. 
        
        
      
        
        
          
      39. 
            1
            

            

              resources :orders, only: %i[index] do
          
        40. 
        
        
      
        
        
          
      40. 
            1
            

            

                get '/add_to_order', to: 'order_books#add_to_order'
          
        41. 
        
        
      
        
        
          
      41. 
            1
            

            

                delete '/delete_from_cart/:book_id', to: 'order_books#delete_product'
          
        42. 
        
        
      
        
        
          
      42. 
            1
            

            

                put '/order_update_book', to: 'order_books#update_quantity'
          
        43. 
        
        
      
        
        
          
      43. 
            
            

            

              end
          
        44. 
        
        
      
        
        
          
      44. 
            
            

            

            
          
        45. 
        
        
      
        
        
          
      45. 
            1
            

            

              get '/coupon_check', to: 'coupons#find'
          
        46. 
        
        
      
        
        
          
      46. 
            
            

            

            
          
        47. 
        
        
      
        
        
          
      47. 
            1
            

            

              resources :users
          
        48. 
        
        
      
        
        
          
      48. 
            
            

            

            
          
        49. 
        
        
      
        
        
          
      49. 
            1
            

            

              resources :books, only: %i[show index] do
          
        50. 
        
        
      
        
        
          
      50. 
            1
            

            

                resources :reviews, only: :create
          
        51. 
        
        
      
        
        
          
      51. 
            
            

            

              end
          
        52. 
        
        
      
        
        
          
      52. 
            
            

            

=======
>>>>>>> bae2b7de (Add login registration pages)
            end
          
        53. 
        
        
      
    
      
  
      

      

      
<<<<<<< HEAD
<<<<<<< HEAD
        
      
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
  
      
    
      spec/decorators/author_decorator_spec.rb
      
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
        
      
=======
        
      
  
      
    
      spec/decorators/author_decorator_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      7 relevant lines.
      7 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            require 'rails_helper'
          
        2. 
        
        
      
        
        
          
      2. 
            
            

            

            
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

            RSpec.describe AuthorDecorator do
          
        4. 
        
        
      
        
        
          
      4. 
            2
            

            

              let(:decorator) { described_class.new(author) }
          
        5. 
        
        
      
        
        
          
      5. 
            
            

            

            
          
        6. 
        
        
      
        
        
          
      6. 
            2
            

            

              let(:author) { FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk') }
          
        7. 
        
        
      
        
        
          
      7. 
            
            

            

            
          
        8. 
        
        
      
        
        
          
      8. 
            1
            

            

              context 'when decorate' do
          
        9. 
        
        
      
        
        
          
      9. 
            1
            

            

                it '#full_name' do
          
        10. 
        
        
      
        
        
          
      10. 
            1
            

            

                  expect(decorator.full_name).to eq('Vlad Todorchuk')
          
        11. 
        
        
      
        
        
          
      11. 
            
            

            

                end
          
        12. 
        
        
      
        
        
          
      12. 
            
            

            

              end
          
        13. 
        
        
      
        
        
          
      13. 
            
            

            

            end
          
        14. 
        
        
      
    
      
  
      

      

      
        
      
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  
      
    
      spec/decorators/author_decorator_spec.rb
      
=======
=======
        
      
  
      
    
      spec/decorators/author_decorator_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
<<<<<<< HEAD
      7 relevant lines.
      7 lines covered and
=======
      13 relevant lines.
      13 lines covered and
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            require 'rails_helper'
          
        2. 
        
        
      
        
        
          
      2. 
            
            

            

            
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

            RSpec.describe AuthorDecorator do
          
        4. 
        
        
      
        
        
          
      4. 
            2
            

            

              let(:decorator) { described_class.new(author) }
          
        5. 
        
        
      
        
        
          
      5. 
            
            

            

            
          
        6. 
        
        
      
        
        
          
      6. 
            2
            

            

              let(:author) { FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk') }
          
        7. 
        
        
      
        
        
          
      7. 
            
            

            

            
          
        8. 
        
        
      
        
        
          
      8. 
            1
            

            

              context 'when decorate' do
          
        9. 
        
        
      
        
        
          
      9. 
            1
            

            

                it '#full_name' do
          
        10. 
        
        
      
        
        
          
      10. 
            1
            

            

                  expect(decorator.full_name).to eq('Vlad Todorchuk')
          
        11. 
        
        
      
        
        
          
      11. 
            
            

            

                end
          
        12. 
        
        
      
        
        
          
      12. 
            
            

            

              end
          
        13. 
        
        
      
        
        
          
      13. 
            
            

            

=======
>>>>>>> 7a02bbe (Featire specs)
            end
          
        14. 
        
        
      
    
      
  
      

      

      
<<<<<<< HEAD
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
        
      
  
      
    
      spec/decorators/book_decorator_spec.rb
      
>>>>>>> bd8bda4 (Manifest_cache true)
=======
        
      
  
      
    
      spec/decorators/book_decorator_spec.rb
      
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> c59d1a99 (Manifest_cache true)
    
      
      
  100.0%


      lines covered
    
      

    

    
      
<<<<<<< HEAD
<<<<<<< HEAD
      7 relevant lines.
      7 lines covered and
=======
      13 relevant lines.
      13 lines covered and
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            require 'rails_helper'
          
        2. 
        
        
      
        
        
          
      2. 
            
            

            

            
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

            RSpec.describe AuthorDecorator do
          
        4. 
        
        
      
        
        
          
      4. 
            2
            

            

<<<<<<< HEAD
              let(:decorator) { described_class.new(author) }
=======
              let(:book_decorator) { described_class.new(book) }
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
          
        5. 
        
        
      
        
        
          
      5. 
            3
            

            

              let(:book) { FactoryBot.create(:book, authors: authors, categories: categories) }
          
        6. 
        
        
      
        
        
          
      6. 
            
            

            

            
          
        7. 
        
        
      
        
        
<<<<<<< HEAD
          
      7. 
            2
=======
=======
>>>>>>> 5b7749a (Fix)
          
      8. 
            1
            

            

                mount Sidekiq::Web => '/sidekiq'
          
        9. 
        
        
      
        
        
          
      9. 
            
            

            

              end
          
        10. 
        
        
      
        
        
          
      10. 
            
            

            

            
          
        11. 
        
        
      
        
        
          
      11. 
            1
            

            

              ActiveAdmin.routes(self)
          
        12. 
        
        
      
        
        
          
      12. 
            
            

            

<<<<<<< HEAD
                end
          
        13. 
        
        
      
        
        
          
      13. 
            
            

            

              end
          
        14. 
        
        
      
        
        
          
      14. 
            
            

            

<<<<<<< HEAD
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
            end
          
        15. 
        
        
      
    
      
  
      

      

      
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
        
      
  
      
    
      spec/decorators/book_decorator_spec.rb
      
>>>>>>> bd8bda4 (Manifest_cache true)
=======
        
      
  
      
    
      spec/decorators/book_decorator_spec.rb
      
>>>>>>> aa7b40c (Manifest_cache true)
=======
        
      
  
      
    
      spec/decorators/author_decorator_spec.rb
      
>>>>>>> c7a726c5 (Rebased)
    
      
      
  100.0%


      lines covered
    
      

    

    
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
      7 relevant lines.
      7 lines covered and
=======
      12 relevant lines.
      12 lines covered and
>>>>>>> bd8bda4 (Manifest_cache true)
=======
      12 relevant lines.
      12 lines covered and
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
=======
      13 relevant lines.
      13 lines covered and
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            require 'rails_helper'
          
        2. 
        
        
      
        
        
          
      2. 
            
            

            

=======
>>>>>>> 5b7749a (Fix)
            
          
        3. 
        
        
      
        
        
<<<<<<< HEAD
          
      3. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
            RSpec.describe AuthorDecorator do
          
        4. 
        
        
      
        
        
          
      4. 
            2
            

            

<<<<<<< HEAD
              let(:decorator) { described_class.new(author) }
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
              let(:book_decorator) { described_class.new(book) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
              let(:book_decorator) { described_class.new(book) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> e3e66f3 (Featire specs)
          
        5. 
        
        
      
        
        
          
      5. 
            3
            

            

              let(:book) { FactoryBot.create(:book, authors: authors, categories: categories) }
          
        6. 
        
        
      
        
        
          
      6. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
=======
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 7d58507 (Add login registration pages)
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
            
          
        7. 
        
        
      
        
        
          
      7. 
=======
          
      8. 
>>>>>>> 5b7749a (Fix)
            1
            

            

<<<<<<< HEAD
              resources :books, only: %i[show index]
          
        9. 
        
        
      
        
        
          
      9. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 08edf50 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> 730a8ca (Add login registration pages)
=======
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 7d58507 (Add login registration pages)
            end
          
        10. 
        
        
      
    
      
  
      

      

      
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
              root 'home#index'
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
        
      
=======
        
      
  
      
    
      spec/decorators/author_decorator_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      7 relevant lines.
      7 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            require 'rails_helper'
          
        2. 
        
        
      
        
        
          
      2. 
            
            

            

            
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

            RSpec.describe AuthorDecorator do
          
        4. 
        
        
      
        
        
          
      4. 
            2
            

            

              let(:decorator) { described_class.new(author) }
          
        5. 
        
        
      
        
        
          
      5. 
            
            

            

            
          
        6. 
        
        
      
        
        
          
      6. 
            2
            

            

              let(:author) { FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk') }
          
        7. 
        
        
      
        
        
          
      7. 
            
            

            

            
          
        8. 
        
        
      
        
        
          
      8. 
            1
            

            

              context 'when decorate' do
          
        9. 
        
        
      
        
        
          
      9. 
            1
            

            

                it '#full_name' do
          
        10. 
        
        
      
        
        
          
      10. 
            1
            

            

                  expect(decorator.full_name).to eq('Vlad Todorchuk')
          
        11. 
        
        
      
        
        
          
      11. 
            
            

            

                end
          
        12. 
        
        
      
        
        
          
      12. 
            
            

            

              end
          
        13. 
        
        
      
        
        
          
      13. 
            
            

            

=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 610b6138 (Featire specs)
            end
          
        14. 
        
        
      
    
      
  
      

      

      
<<<<<<< HEAD
        
      
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
        
      
>>>>>>> 610b6138 (Featire specs)
  
      
    
      spec/decorators/author_decorator_spec.rb
      
=======
        
      
  
      
    
      spec/decorators/book_decorator_spec.rb
      
>>>>>>> bd8bda4 (Manifest_cache true)
=======
        
      
  
      
    
      spec/decorators/book_decorator_spec.rb
      
>>>>>>> aa7b40c (Manifest_cache true)
    
      
      
  100.0%


      lines covered
    
      

    

    
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
      7 relevant lines.
      7 lines covered and
=======
      12 relevant lines.
      12 lines covered and
>>>>>>> bd8bda4 (Manifest_cache true)
=======
      12 relevant lines.
      12 lines covered and
>>>>>>> aa7b40c (Manifest_cache true)
=======
<<<<<<< HEAD
      7 relevant lines.
      7 lines covered and
=======
      13 relevant lines.
      13 lines covered and
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> c59d1a99 (Manifest_cache true)
=======
      13 relevant lines.
      13 lines covered and
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            require 'rails_helper'
          
        2. 
        
        
      
        
        
          
      2. 
            
            

            

            
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
            RSpec.describe AuthorDecorator do
          
        4. 
        
        
      
        
        
          
      4. 
            2
            

            

              let(:decorator) { described_class.new(author) }
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 6fa625b (Manifest_cache true)
>>>>>>> 86d584a (Manifest_cache true)
>>>>>>> e5890c2 (Manifest_cache true)
          
        5. 
        
        
      
        
        
          
      5. 
            
            

            

            
          
        6. 
        
        
      
        
        
<<<<<<< HEAD
          
      6. 
=======
          
      7. 
            2
            

            

              let(:author) { FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk') }
          
        8. 
        
        
      
        
        
          
      8. 
            
            

            

            
          
        9. 
        
        
      
        
        
          
      9. 
            1
            

            

              context 'when decorate' do
          
        10. 
        
        
      
        
        
          
      10. 
            1
            

            

                it '#full_name' do
          
        11. 
        
        
      
        
        
          
      11. 
            1
            

            

                  expect(decorator.full_name).to eq('Vlad Todorchuk')
          
        12. 
        
        
      
        
        
          
      12. 
            
            

            

                end
          
        13. 
        
        
      
        
        
          
      13. 
            
            

            

              end
          
        14. 
        
        
      
        
        
          
      14. 
            
            

            

=======
>>>>>>> 7a02bbe (Featire specs)
            end
          
        15. 
        
        
      
    
      
  
      

      

      
<<<<<<< HEAD
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
        
      
  
      
    
      spec/decorators/book_decorator_spec.rb
      
>>>>>>> bd8bda4 (Manifest_cache true)
=======
        
      
  
      
    
      spec/decorators/book_decorator_spec.rb
      
>>>>>>> aa7b40c (Manifest_cache true)
    
      
      
  100.0%


      lines covered
    
      

    

    
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
      7 relevant lines.
      7 lines covered and
=======
      12 relevant lines.
      12 lines covered and
>>>>>>> bd8bda4 (Manifest_cache true)
=======
      12 relevant lines.
      12 lines covered and
>>>>>>> aa7b40c (Manifest_cache true)
=======
      13 relevant lines.
      13 lines covered and
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            require 'rails_helper'
          
        2. 
        
        
      
        
        
          
      2. 
            
            

            

            
          
        3. 
        
        
      
        
        
          
      3. 
>>>>>>> e5752db (Featire specs)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              resources :books, only: %i[show index]
          
        4. 
        
        
      
        
        
          
      4. 
            
            

            

<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
=======
>>>>>>> 08edf50 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 730a8ca (Add login registration pages)
=======
>>>>>>> e1f4d17 (Add login registration pages)
            end
          
        5. 
        
        
      
    
      
  
      

      

      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
        
      
=======
        
      
  
      
    
      spec/decorators/author_decorator_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      7 relevant lines.
      7 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            require 'rails_helper'
          
        2. 
        
        
      
        
        
          
      2. 
            
            

            

            
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

            RSpec.describe AuthorDecorator do
          
        4. 
        
        
      
        
        
          
      4. 
            2
            

            

              let(:decorator) { described_class.new(author) }
          
        5. 
        
        
      
        
        
          
      5. 
            
            

            

            
          
        6. 
        
        
      
        
        
          
      6. 
            2
            

            

              let(:author) { FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk') }
          
        7. 
        
        
      
        
        
          
      7. 
            
            

            

            
          
        8. 
        
        
      
        
        
          
      8. 
            1
            

            

              context 'when decorate' do
          
        9. 
        
        
      
        
        
          
      9. 
            1
            

            

                it '#full_name' do
          
        10. 
        
        
      
        
        
          
      10. 
            1
            

            

                  expect(decorator.full_name).to eq('Vlad Todorchuk')
          
        11. 
        
        
      
        
        
          
      11. 
            
            

            

                end
          
        12. 
        
        
      
        
        
          
      12. 
            
            

            

              end
          
        13. 
        
        
      
        
        
          
      13. 
            
            

            

            end
          
        14. 
        
        
      
    
      
  
      

      

      
        
      
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  
      
    
      spec/decorators/author_decorator_spec.rb
      
=======
        
      
  
      
    
      spec/decorators/book_decorator_spec.rb
      
>>>>>>> bd8bda4 (Manifest_cache true)
=======
        
      
  
      
    
      spec/decorators/book_decorator_spec.rb
      
>>>>>>> aa7b40c (Manifest_cache true)
    
      
      
  100.0%


      lines covered
    
      

    

    
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
      7 relevant lines.
      7 lines covered and
=======
      12 relevant lines.
      12 lines covered and
>>>>>>> bd8bda4 (Manifest_cache true)
=======
      12 relevant lines.
      12 lines covered and
>>>>>>> aa7b40c (Manifest_cache true)
=======
      7 relevant lines.
      7 lines covered and
=======
      13 relevant lines.
      13 lines covered and
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            require 'rails_helper'
          
        2. 
        
        
      
        
        
          
      2. 
            
            

            

            
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c59d1a99 (Manifest_cache true)
            RSpec.describe AuthorDecorator do
          
        4. 
        
        
      
        
        
          
      4. 
            2
            

            

<<<<<<< HEAD
              let(:decorator) { described_class.new(author) }
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 6fa625b (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 98beee2 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 490b01d6 (Manifest_cache true)
=======
=======
=======
=======
              let(:book_decorator) { described_class.new(book) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
          
        5. 
        
        
      
        
        
          
      5. 
            3
            

            

              let(:book) { FactoryBot.create(:book, authors: authors, categories: categories) }
          
        6. 
        
        
      
        
        
          
      6. 
            
            

            

            
          
        7. 
        
        
      
        
        
          
      7. 
            1
            

            

<<<<<<< HEAD
=======
              context 'when decorate' do
          
        8. 
        
        
      
        
        
          
      8. 
            1
            

            

                it '#full_name' do
          
        9. 
        
        
      
        
        
          
      9. 
            1
            

            

                  expect(decorator.full_name).to eq('Vlad Todorchuk')
          
        10. 
        
        
      
        
        
          
      10. 
            
            

            

                end
          
        11. 
        
        
      
        
        
          
      11. 
            
            

            

              end
          
        12. 
        
        
      
        
        
          
      12. 
            
            

            

=======
>>>>>>> 7a02bbe (Featire specs)
            end
          
        13. 
        
        
      
    
      
  
      

      

      
<<<<<<< HEAD
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
        
      
  
      
    
      spec/decorators/book_decorator_spec.rb
      
>>>>>>> bd8bda4 (Manifest_cache true)
=======
        
      
  
      
    
      spec/decorators/book_decorator_spec.rb
      
>>>>>>> aa7b40c (Manifest_cache true)
    
      
      
  100.0%


      lines covered
    
      

    

    
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
      7 relevant lines.
      7 lines covered and
=======
      12 relevant lines.
      12 lines covered and
>>>>>>> bd8bda4 (Manifest_cache true)
=======
      12 relevant lines.
      12 lines covered and
>>>>>>> aa7b40c (Manifest_cache true)
=======
      13 relevant lines.
      13 lines covered and
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
      5 relevant lines.
      5 lines covered and
>>>>>>> c7a726c5 (Rebased)
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            RSpec.describe AuthorDecorator, type: :decorator do
          
        2. 
        
        
      
        
        
<<<<<<< HEAD
          
      2. 
            
            

            

            
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
            RSpec.describe AuthorDecorator do
          
        4. 
        
        
      
        
        
          
      4. 
            2
            

            

<<<<<<< HEAD
              let(:decorator) { described_class.new(author) }
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 6fa625b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 98beee2 (Manifest_cache true)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
              let(:book_decorator) { described_class.new(book) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
          
        5. 
        
        
      
        
        
          
      5. 
            3
            

            

              let(:book) { FactoryBot.create(:book, authors: authors, categories: categories) }
          
        6. 
        
        
      
        
        
          
      6. 
            
            

            

            
          
        7. 
        
        
      
        
        
          
      7. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 08edf50 (Featire specs)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> 88d49ad (Add login registration pages)
=======
>>>>>>> 9a49b7b (Rebased)
=======
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> f0e2e12a (Featire specs)
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9bfbd88 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9bfbd88 (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 22ee41c (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 88d49ad (Add login registration pages)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
              resources :books, only: %i[show index]
          
        8. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 88d49ad (Add login registration pages)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
          
      8. 
=======
=======
=======
>>>>>>> c51bf93 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
          
      9. 
=======
=======
>>>>>>> 22ee41c (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      10. 
=======
>>>>>>> df37394 (Featire specs)
>>>>>>> 4f4ea3f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9bfbd88 (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
          
      11. 
=======
          
      12. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 9bfbd88 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 9bfbd88 (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> c51bf93 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
=======
          
      13. 
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 22ee41c (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 88d49ad (Add login registration pages)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
            
            

            

            end
          
        14. 
        
        
      
    
      
  
      

      

      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
<<<<<<< HEAD
>>>>>>> 9bfbd88 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 9bfbd88 (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
>>>>>>> c51bf93 (Featire specs)
=======
<<<<<<< HEAD
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
        
      
  
      
    
      spec/decorators/author_decorator_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      7 relevant lines.
      7 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            require 'rails_helper'
          
        2. 
        
        
      
        
        
          
      2. 
            
            

            

            
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

            RSpec.describe AuthorDecorator do
          
        4. 
        
        
      
        
        
          
      4. 
            2
            

            

              let(:decorator) { described_class.new(author) }
          
        5. 
        
        
      
        
        
          
      5. 
            
            

            

            
          
        6. 
        
        
      
        
        
          
      6. 
            2
            

            

              let(:author) { FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk') }
=======
<<<<<<< HEAD
=======
=======
>>>>>>> bf554f4 (Rebased)
              devise_for :users
>>>>>>> 11792758 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> bf554f4 (Rebased)
              devise_for :users
>>>>>>> aca90e3 (Rebased)
<<<<<<< HEAD
=======
=======
>>>>>>> c033601 (Rebased)
>>>>>>> 9a49b7b (Rebased)
<<<<<<< HEAD
=======
          
        7. 
        
        
      
        
        
          
      7. 
            
            

            

            
          
        8. 
        
        
      
        
        
          
      8. 
            1
            

            

              devise_for :users, as: 'omniauth', controller: { omniauth_callbacks: 'callbacks' }
          
        9. 
        
        
      
        
        
          
      9. 
            
            

            

            
          
        10. 
        
        
      
        
        
          
      10. 
            1
            

            

<<<<<<< HEAD
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> bf554f4 (Rebased)
>>>>>>> 311e9fa (Rebased)
              devise_for :users
>>>>>>> c033601 (Rebased)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> bf554f4 (Rebased)
              devise_for :users
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
=======
<<<<<<< HEAD
          
      11. 
=======
          
      12. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
            
            

            

            
          
        13. 
        
        
      
        
        
          
      13. 
            1
            

            

              resources :users
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
          
        14. 
        
        
      
        
        
          
      14. 
            
            

            

            
          
        15. 
        
        
      
        
        
<<<<<<< HEAD
          
      15. 
            1
=======
          
      16. 
            2
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
            

            

              devise_for :users, as: 'omniauth', controller: { omniauth_callbacks: 'callbacks' }
          
        17. 
        
        
      
        
        
<<<<<<< HEAD
          
      17. 
            
            

            

            
          
        18. 
        
        
      
        
        
          
      18. 
=======
<<<<<<< HEAD
          
      19. 
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
            1
=======
          
      20. 
            
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 311e9fa (Rebased)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 5b7749a (Fix)
=======
>>>>>>> 11792758 (Rebased)
              root 'home#index'
          
        21. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
=======
=======
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
=======
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 11792758 (Rebased)
          
      21. 
            
            

            

            
          
        22. 
        
        
      
        
        
          
      22. 
            1
            

            

              resources :users
          
        23. 
        
        
      
        
        
          
      23. 
            
            

            

            
          
        24. 
        
        
      
        
        
          
      24. 
            1
            

            

              resources :books, only: %i[show index] do
          
        25. 
        
        
      
        
        
          
      25. 
            1
<<<<<<< HEAD
=======
          
      26. 
=======
=======
>>>>>>> 5b7749a (Fix)
          
      27. 
            
=======
>>>>>>> 11792758 (Rebased)
            

            

            
          
        28. 
        
        
      
        
        
<<<<<<< HEAD
          
      28. 
            1
            

            

              resources :orders, only: %i[index] do
          
        29. 
        
        
      
        
        
          
      29. 
            1
            

            

                get '/add_to_order', to: 'order_books#add_to_order'
          
        30. 
        
        
      
        
        
          
      30. 
            1
            

            

                delete '/delete_from_cart/:book_id', to: 'order_books#delete_product'
          
        31. 
        
        
      
        
        
          
      31. 
            1
            

            

                put '/order_update_book', to: 'order_books#update_quantity'
          
        32. 
        
        
      
        
        
          
      32. 
=======
          
      33. 
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
          
      34. 
>>>>>>> 11792758 (Rebased)
            
            

            

              end
          
        35. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
          
      35. 
            
            

            

            
          
        36. 
        
        
      
        
        
          
      36. 
            1
            

            

              get '/coupon_check', to: 'coupons#find'
          
        37. 
        
        
      
        
        
          
      37. 
            
            

            

            
          
        38. 
        
        
      
        
        
          
      38. 
            1
            

            

              resources :users
          
        39. 
        
        
      
        
        
          
      39. 
            
            

            

            
          
        40. 
        
        
      
        
        
          
      40. 
            1
            

            

              resources :books, only: %i[show index] do
          
        41. 
        
        
      
        
        
          
      41. 
            1
            

            

                resources :reviews, only: :create
          
        42. 
        
        
      
        
        
          
      42. 
            
            

            

              end
          
        43. 
        
        
      
        
        
          
      43. 
=======
          
      44. 
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
          
      45. 
>>>>>>> 11792758 (Rebased)
            
            

            

            end
          
        46. 
        
        
      
    
      
  
      

      

      
<<<<<<< HEAD
        
      
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
        
      
=======
=======
>>>>>>> 9a49b7b (Rebased)
=======
>>>>>>> 78717cc (Manifest_cache true)
=======
>>>>>>> 84d0df6 (Manifest_cache true)
=======
>>>>>>> 450f4e3 (Manifest_cache true)
=======
>>>>>>> aa3618b (Rebased)
=======
>>>>>>> 160fb15 (Fix)
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 160fb15 (Fix)
=======
>>>>>>> 11792758 (Rebased)
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 311e9fa (Rebased)
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> b719333 (Manifest_cache true)
>>>>>>> b28889f (Fix)
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> e9f3851 (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 64dceec (Manifest_cache true)
=======
>>>>>>> 5b7749a (Fix)
=======
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> b28889f (Fix)
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> fdab719f (Fix)
=======
=======
>>>>>>> 311e9fa (Rebased)
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> b719333 (Manifest_cache true)
>>>>>>> b28889f (Fix)
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 49e8a6c (Rebased)
=======
<<<<<<< HEAD
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> 872e675 (Fix)
=======
<<<<<<< HEAD
>>>>>>> 8288136d (Fix)
=======
>>>>>>> e9f3851 (Manifest_cache true)
=======
>>>>>>> d34a0770 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 4367ccb1 (Manifest_cache true)
=======
>>>>>>> 64dceec (Manifest_cache true)
=======
>>>>>>> 4fac471d (Manifest_cache true)
=======
>>>>>>> ef483b6d (Fix)
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
=======
>>>>>>> bd8bda4 (Manifest_cache true)
=======
>>>>>>> aa7b40c (Manifest_cache true)
=======
>>>>>>> 183b6c5 (Manifest_cache true)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
        
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> bb5c652 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b15044a (Manifest_cache true)
=======
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
=======
>>>>>>> 4367ccb1 (Manifest_cache true)
=======
=======
>>>>>>> b15044a (Manifest_cache true)
>>>>>>> 4fac471d (Manifest_cache true)
=======
>>>>>>> ef483b6d (Fix)
        
      
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9a49b7b (Rebased)
<<<<<<< HEAD
>>>>>>> 75fa7e1b (Rebased)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 9a49b7b (Rebased)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> 9a49b7b (Rebased)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
  
      
    
      spec/decorators/author_decorator_spec.rb
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> d9d85ca6 (Fix)
=======
        
      
  
      
    
      spec/decorators/book_decorator_spec.rb
      
>>>>>>> 02a399d (Manifest_cache true)
=======
        
      
  
      
    
      spec/decorators/book_decorator_spec.rb
      
>>>>>>> 183b6c5 (Manifest_cache true)
=======
        
      
  
      
    
      spec/decorators/book_decorator_spec.rb
      
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 31d15e66 (Fix)
=======
        
      
  
      
    
      spec/decorators/author_decorator_spec.rb
      
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
        
      
>>>>>>> c033601 (Rebased)
  
      
    
      spec/decorators/author_decorator_spec.rb
      
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
<<<<<<< HEAD
=======
=======
>>>>>>> ef483b6d (Fix)
=======
        
      
  
      
    
      spec/decorators/book_decorator_spec.rb
      
>>>>>>> 02a399d (Manifest_cache true)
=======
        
      
  
      
    
      spec/decorators/book_decorator_spec.rb
      
>>>>>>> 183b6c5 (Manifest_cache true)
=======
        
      
  
      
    
      spec/decorators/book_decorator_spec.rb
      
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
        
      
  
      
    
      spec/decorators/author_decorator_spec.rb
      
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> ae884b47 (Fix)
=======
=======
=======
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
>>>>>>> e3e66f3 (Featire specs)
        
      
  
      
    
      spec/decorators/author_decorator_spec.rb
      
=======
>>>>>>> b15044a (Manifest_cache true)
=======
        
      
  
      
    
      spec/decorators/book_decorator_spec.rb
      
<<<<<<< HEAD
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
>>>>>>> b719333 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0341d6de (Manifest_cache true)
=======
=======
<<<<<<< HEAD
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
        
      
  
      
    
      spec/decorators/book_decorator_spec.rb
      
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e59c273d (Manifest_cache true)
=======
=======
=======
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 64dceec (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 7afa007b (Manifest_cache true)
=======
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
>>>>>>> d9d85ca6 (Fix)
=======
>>>>>>> 31d15e66 (Fix)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
        
      
>>>>>>> c033601 (Rebased)
  
      
    
      spec/decorators/author_decorator_spec.rb
      
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
<<<<<<< HEAD
=======
=======
        
      
  
      
    
      spec/decorators/book_decorator_spec.rb
      
>>>>>>> 02a399d (Manifest_cache true)
=======
        
      
  
      
    
      spec/decorators/book_decorator_spec.rb
      
>>>>>>> 183b6c5 (Manifest_cache true)
=======
        
      
  
      
    
      spec/decorators/book_decorator_spec.rb
      
>>>>>>> fd6db03 (Manifest_cache true)
=======
        
      
  
      
    
      spec/decorators/author_decorator_spec.rb
      
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> fdab719f (Fix)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> 8288136d (Fix)
=======
=======
=======
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
>>>>>>> e3e66f3 (Featire specs)
        
      
  
      
    
      spec/decorators/author_decorator_spec.rb
      
=======
>>>>>>> b15044a (Manifest_cache true)
=======
        
      
  
      
    
      spec/decorators/book_decorator_spec.rb
      
<<<<<<< HEAD
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
>>>>>>> b719333 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d34a0770 (Manifest_cache true)
=======
=======
<<<<<<< HEAD
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
        
      
  
      
    
      spec/decorators/book_decorator_spec.rb
      
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4367ccb1 (Manifest_cache true)
=======
=======
=======
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 64dceec (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4fac471d (Manifest_cache true)
=======
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
>>>>>>> ef483b6d (Fix)
    
      
      
  100.0%


      lines covered
    
      

    

    
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
      5 relevant lines.
      5 lines covered and
<<<<<<< HEAD
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> fdab719f (Fix)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> e9f3851 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 31d15e66 (Fix)
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> e9f3851 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
      12 relevant lines.
      12 lines covered and
=======
<<<<<<< HEAD
      13 relevant lines.
      13 lines covered and
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b15044a (Manifest_cache true)
=======
>>>>>>> 4367ccb1 (Manifest_cache true)
=======
=======
>>>>>>> b15044a (Manifest_cache true)
>>>>>>> 4fac471d (Manifest_cache true)
      5 relevant lines.
      5 lines covered and
>>>>>>> 2c640cf (Manifest_cache true)
=======
      12 relevant lines.
      12 lines covered and
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
=======
      12 relevant lines.
      12 lines covered and
>>>>>>> bd8bda4 (Manifest_cache true)
=======
      12 relevant lines.
      12 lines covered and
>>>>>>> aa7b40c (Manifest_cache true)
=======
      12 relevant lines.
      12 lines covered and
>>>>>>> 183b6c5 (Manifest_cache true)
=======
<<<<<<< HEAD
      13 relevant lines.
      13 lines covered and
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> bb5c652 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
      5 relevant lines.
      5 lines covered and
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> fdab719f (Fix)
>>>>>>> 9a49b7b (Rebased)
=======
>>>>>>> c8da2e3 (Fix)
=======
<<<<<<< HEAD
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
      5 relevant lines.
      5 lines covered and
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fdab719f (Fix)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
      5 relevant lines.
      5 lines covered and
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 00f8b58 (Manifest_cache true)
      5 relevant lines.
      5 lines covered and
=======
      5 relevant lines.
      5 lines covered and
>>>>>>> 845dac1 (Manifest_cache true)
=======
      12 relevant lines.
      12 lines covered and
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d34a0770 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
>>>>>>> b9cc4e9 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 78717cc (Manifest_cache true)
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fdab719f (Fix)
=======
<<<<<<< HEAD
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
>>>>>>> e3e66f3 (Featire specs)
=======
      12 relevant lines.
      12 lines covered and
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 24b58e6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 84d0df6 (Manifest_cache true)
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 24b58e6 (Manifest_cache true)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> 24b58e6 (Manifest_cache true)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
      12 relevant lines.
      12 lines covered and
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 00f8b58 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 450f4e3 (Manifest_cache true)
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
      5 relevant lines.
      5 lines covered and
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> d34a0770 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 160fb15 (Fix)
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> b28889f (Fix)
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
=======
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> b28889f (Fix)
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ae884b47 (Fix)
=======
=======
>>>>>>> d34a0770 (Manifest_cache true)
=======
>>>>>>> b28889f (Fix)
=======
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> e9f3851 (Manifest_cache true)
>>>>>>> b719333 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0341d6de (Manifest_cache true)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
>>>>>>> fdab719f (Fix)
=======
      12 relevant lines.
      12 lines covered and
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e59c273d (Manifest_cache true)
=======
=======
=======
=======
      12 relevant lines.
      12 lines covered and
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 64dceec (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 7afa007b (Manifest_cache true)
=======
=======
>>>>>>> 00f8b58 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 450f4e3 (Manifest_cache true)
>>>>>>> 31d15e66 (Fix)
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
      5 relevant lines.
      5 lines covered and
<<<<<<< HEAD
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
>>>>>>> d9d85ca6 (Fix)
=======
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> 160fb15 (Fix)
<<<<<<< HEAD
>>>>>>> 31d15e66 (Fix)
=======
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> b28889f (Fix)
>>>>>>> c8da2e3 (Fix)
>>>>>>> fdab719f (Fix)
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> d34a0770 (Manifest_cache true)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
      12 relevant lines.
      12 lines covered and
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4367ccb1 (Manifest_cache true)
=======
=======
=======
=======
      12 relevant lines.
      12 lines covered and
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 64dceec (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4fac471d (Manifest_cache true)
=======
=======
=======
      5 relevant lines.
      5 lines covered and
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
>>>>>>> ef483b6d (Fix)
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

<<<<<<< HEAD
            RSpec.describe AuthorDecorator, type: :decorator do
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
            RSpec.describe AuthorDecorator, type: :decorator do
=======
=======
            RSpec.describe AuthorDecorator, type: :decorator do
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> 8288136d (Fix)
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> d34a0770 (Manifest_cache true)
            RSpec.describe AuthorDecorator, type: :decorator do
=======
>>>>>>> c8da2e3 (Fix)
            require 'rails_helper'
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
>>>>>>> 64dceec (Manifest_cache true)
=======
>>>>>>> 5b7749a (Fix)
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
>>>>>>> b15044a (Manifest_cache true)
            RSpec.describe AuthorDecorator, type: :decorator do
=======
            require 'rails_helper'
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> d34a0770 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
>>>>>>> 64dceec (Manifest_cache true)
=======
>>>>>>> 5b7749a (Fix)
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
>>>>>>> b15044a (Manifest_cache true)
            RSpec.describe AuthorDecorator, type: :decorator do
=======
            require 'rails_helper'
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
            require 'rails_helper'
>>>>>>> 183b6c5 (Manifest_cache true)
=======
            require 'rails_helper'
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4367ccb1 (Manifest_cache true)
=======
>>>>>>> 4fac471d (Manifest_cache true)
=======
            RSpec.describe AuthorDecorator, type: :decorator do
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
=======
            RSpec.describe AuthorDecorator, type: :decorator do
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> ae884b47 (Fix)
=======
>>>>>>> 0341d6de (Manifest_cache true)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> d34a0770 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
            RSpec.describe AuthorDecorator, type: :decorator do
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> b28889f (Fix)
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
=======
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> b28889f (Fix)
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ae884b47 (Fix)
=======
=======
>>>>>>> d34a0770 (Manifest_cache true)
=======
>>>>>>> b28889f (Fix)
=======
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> e9f3851 (Manifest_cache true)
>>>>>>> b719333 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0341d6de (Manifest_cache true)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 845dac1 (Manifest_cache true)
=======
=======
            require 'rails_helper'
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e59c273d (Manifest_cache true)
=======
=======
=======
=======
            require 'rails_helper'
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 64dceec (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 7afa007b (Manifest_cache true)
=======
=======
=======
            RSpec.describe AuthorDecorator, type: :decorator do
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
>>>>>>> d9d85ca6 (Fix)
=======
=======
            RSpec.describe AuthorDecorator, type: :decorator do
>>>>>>> a5d032d (Fix)
>>>>>>> 31d15e66 (Fix)
=======
=======
            RSpec.describe AuthorDecorator, type: :decorator do
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
            RSpec.describe AuthorDecorator, type: :decorator do
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> b28889f (Fix)
>>>>>>> c8da2e3 (Fix)
>>>>>>> fdab719f (Fix)
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> d34a0770 (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4367ccb1 (Manifest_cache true)
=======
=======
=======
=======
            require 'rails_helper'
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 64dceec (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4fac471d (Manifest_cache true)
=======
=======
=======
            RSpec.describe AuthorDecorator, type: :decorator do
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
>>>>>>> ef483b6d (Fix)
          
        2. 
        
        
      
        
        
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
>>>>>>> 84809242 (Featire specs)
=======
>>>>>>> 5a2009f1 (Fix)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> e59c273d (Manifest_cache true)
=======
>>>>>>> 7afa007b (Manifest_cache true)
=======
>>>>>>> d9d85ca6 (Fix)
=======
>>>>>>> 31d15e66 (Fix)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 4367ccb1 (Manifest_cache true)
=======
>>>>>>> 4fac471d (Manifest_cache true)
=======
>>>>>>> ef483b6d (Fix)
          
      2. 
            2
            

            

              subject(:decorated_object) { described_class.new(author) }
          
        3. 
        
        
      
        
        
          
      3. 
<<<<<<< HEAD
=======
=======
=======
>>>>>>> 78717cc (Manifest_cache true)
=======
>>>>>>> 84d0df6 (Manifest_cache true)
=======
>>>>>>> 450f4e3 (Manifest_cache true)
=======
>>>>>>> 160fb15 (Fix)
<<<<<<< HEAD
          
      4. 
>>>>>>> 9a49b7b (Rebased)
>>>>>>> 67ab5299 (Fix)
            
<<<<<<< HEAD
=======
=======
=======
>>>>>>> 00f8b58 (Manifest_cache true)
          
      5. 
            2
>>>>>>> 24b58e6 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fdab719f (Fix)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> d34a0770 (Manifest_cache true)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
=======
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
          
      6. 
            
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
>>>>>>> 64dceec (Manifest_cache true)
=======
>>>>>>> 5b7749a (Fix)
          
      7. 
            
=======
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
          
      8. 
            2
>>>>>>> 24b58e6 (Manifest_cache true)
>>>>>>> e9f3851 (Manifest_cache true)
>>>>>>> b719333 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0341d6de (Manifest_cache true)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
>>>>>>> b15044a (Manifest_cache true)
=======
>>>>>>> 7c4ea7f (Fix)
          
      9. 
            2
>>>>>>> 24b58e6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
=======
=======
>>>>>>> b28889f (Fix)
>>>>>>> c8da2e3 (Fix)
>>>>>>> fdab719f (Fix)
=======
>>>>>>> 8288136d (Fix)
          
      10. 
            
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
>>>>>>> 64dceec (Manifest_cache true)
=======
>>>>>>> 5b7749a (Fix)
          
      11. 
            
=======
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
          
      12. 
            2
>>>>>>> 24b58e6 (Manifest_cache true)
>>>>>>> e9f3851 (Manifest_cache true)
>>>>>>> b719333 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d34a0770 (Manifest_cache true)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
>>>>>>> b15044a (Manifest_cache true)
=======
>>>>>>> 7c4ea7f (Fix)
          
      13. 
            2
>>>>>>> 24b58e6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
            

            

            
          
        14. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      14. 
            2
=======
=======
>>>>>>> 5b7749a (Fix)
          
      15. 
            1
>>>>>>> 824bb2b (Featire specs)
=======
          
      16. 
            1
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
          
      17. 
            1
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> ef483b6d (Fix)
          
      18. 
            2
=======
=======
>>>>>>> 5b7749a (Fix)
          
      19. 
            1
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
          
      20. 
            1
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
          
      21. 
            1
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
              let(:author) { create(:author) }
=======
            RSpec.describe BookDecorator do
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
            RSpec.describe BookDecorator do
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
            RSpec.describe BookDecorator do
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
=======
            RSpec.describe BookDecorator do
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
          
        22. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      22. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      23. 
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
          
      24. 
            3
            

            

<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
              subject(:book_decorator) { described_class.new(book) }
=======
<<<<<<< HEAD
              let(:book_decorator) { described_class.new(book) }
=======
              subject(:book_decorator) { described_class.new(book) }
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
=======
              subject(:book_decorator) { described_class.new(book) }
>>>>>>> bd8bda4 (Manifest_cache true)
=======
              subject(:book_decorator) { described_class.new(book) }
>>>>>>> aa7b40c (Manifest_cache true)
=======
              subject(:book_decorator) { described_class.new(book) }
>>>>>>> 183b6c5 (Manifest_cache true)
=======
              let(:book_decorator) { described_class.new(book) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
          
        25. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
          
      25. 
=======
<<<<<<< HEAD
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
          
      26. 
            3
            

            

              let(:book) { FactoryBot.create(:book, authors: authors, categories: categories) }
          
        27. 
        
        
      
        
        
          
      27. 
<<<<<<< HEAD
=======
          
      28. 
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
=======
          
      29. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
      30. 
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
      31. 
>>>>>>> 183b6c5 (Manifest_cache true)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> bb5c652 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
          
      32. 
>>>>>>> 02a399d (Manifest_cache true)
=======
          
      33. 
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> 4367ccb1 (Manifest_cache true)
>>>>>>> 24b58e6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84d0df6 (Manifest_cache true)
=======
=======
<<<<<<< HEAD
>>>>>>> 24b58e6 (Manifest_cache true)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      34. 
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 00f8b58 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 450f4e3 (Manifest_cache true)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
          
      35. 
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e59c273d (Manifest_cache true)
=======
=======
=======
=======
          
      36. 
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 64dceec (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 7afa007b (Manifest_cache true)
=======
=======
=======
          
      37. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
>>>>>>> d9d85ca6 (Fix)
=======
>>>>>>> 00f8b58 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 450f4e3 (Manifest_cache true)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
=======
          
      38. 
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4367ccb1 (Manifest_cache true)
=======
=======
=======
=======
          
      39. 
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 64dceec (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4fac471d (Manifest_cache true)
=======
=======
=======
          
      40. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
>>>>>>> ef483b6d (Fix)
            
            

            

            
          
        41. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      41. 
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
          
      42. 
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
          
      43. 
=======
<<<<<<< HEAD
          
      44. 
=======
          
      45. 
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
=======
          
      46. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
      47. 
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
      48. 
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
      49. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bb5c652 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> bb5c652 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> bb5c652 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
              describe '#full_name' do
=======
              let(:authors) do
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
              let(:authors) do
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
              let(:authors) do
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
=======
              let(:authors) do
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
          
        50. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
          
      50. 
            2
            

            

                it { expect(decorated_object.full_name).to eq("#{author.first_name} #{author.last_name}") }
          
        51. 
        
        
      
        
        
          
      51. 
<<<<<<< HEAD
=======
=======
<<<<<<< HEAD
=======
=======
>>>>>>> 84003439 (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
          
      52. 
=======
<<<<<<< HEAD
          
      53. 
=======
          
      54. 
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
=======
          
      55. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
      56. 
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
      57. 
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
      58. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bb5c652 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> bb5c652 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> bb5c652 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
              end
=======
                [
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                [
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
                [
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
=======
                [
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
          
        59. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
<<<<<<< HEAD
          
      59. 
>>>>>>> 84003439 (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
          
      60. 
<<<<<<< HEAD
=======
=======
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
          
      61. 
=======
<<<<<<< HEAD
          
      62. 
=======
          
      63. 
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
=======
          
      64. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
      65. 
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
      66. 
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
      67. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> b9cc4e9 (Manifest_cache true)
          
      68. 
>>>>>>> c033601 (Rebased)
            2
=======
          
      69. 
            2
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
          
      70. 
>>>>>>> c033601 (Rebased)
            2
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fdab719f (Fix)
>>>>>>> 824bb2b (Featire specs)
=======
=======
          
      71. 
            2
>>>>>>> a5d032d (Fix)
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 31d15e66 (Fix)
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> fdab719f (Fix)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
            

            

              subject(:decorated_object) { described_class.new(author) }
          
        72. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 31d15e66 (Fix)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> fdab719f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
          
      72. 
=======
<<<<<<< HEAD
          
      73. 
=======
          
      74. 
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
=======
          
      75. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
      76. 
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
      77. 
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
      78. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
          
      79. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d34a0770 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
>>>>>>> b719333 (Manifest_cache true)
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> d34a0770 (Manifest_cache true)
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
=======
>>>>>>> c033601 (Rebased)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> c033601 (Rebased)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> c033601 (Rebased)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> c033601 (Rebased)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      80. 
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
          
      81. 
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> d34a0770 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> c033601 (Rebased)
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> b28889f (Fix)
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> b28889f (Fix)
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d34a0770 (Manifest_cache true)
=======
>>>>>>> b28889f (Fix)
=======
>>>>>>> 872e675 (Fix)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> d34a0770 (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
          
      82. 
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> e9f3851 (Manifest_cache true)
>>>>>>> b719333 (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 31d15e66 (Fix)
=======
=======
>>>>>>> c033601 (Rebased)
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> e9f3851 (Manifest_cache true)
>>>>>>> b719333 (Manifest_cache true)
>>>>>>> d34a0770 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
            
            

            

            
          
        83. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> d34a0770 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> b719333 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> b719333 (Manifest_cache true)
=======
=======
>>>>>>> fdab719f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 31d15e66 (Fix)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> fdab719f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
          
      83. 
=======
<<<<<<< HEAD
          
      84. 
=======
          
      85. 
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
=======
          
      86. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
      87. 
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
      88. 
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
      89. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
            
<<<<<<< HEAD
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
=======
>>>>>>> b15044a (Manifest_cache true)
>>>>>>> 64dceec (Manifest_cache true)
          
      90. 
            2
=======
          
      91. 
            1
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 845dac1 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 845dac1 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      92. 
            1
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
=======
          
      93. 
            1
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
=======
=======
          
      94. 
            1
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 64dceec (Manifest_cache true)
=======
=======
          
      95. 
            2
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                ]
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
                ]
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
=======
>>>>>>> b15044a (Manifest_cache true)
>>>>>>> 64dceec (Manifest_cache true)
<<<<<<< HEAD
=======
>>>>>>> 7c4ea7f (Fix)
              let(:author) { create(:author) }
<<<<<<< HEAD
=======
=======
>>>>>>> bd8bda4 (Manifest_cache true)
=======
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
=======
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> 64dceec (Manifest_cache true)
            RSpec.describe BookDecorator do
=======
>>>>>>> 5b7749a (Fix)
          
        96. 
        
        
      
        
        
<<<<<<< HEAD
          
      96. 
            3
            

            

<<<<<<< HEAD
<<<<<<< HEAD
              subject(:book_decorator) { described_class.new(book) }
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 8cbdfeb (Manifest_cache true)
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 845dac1 (Manifest_cache true)
=======
=======
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 96aecde (Manifest_cache true)
=======
=======
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2722d07 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 2722d07 (Manifest_cache true)
=======
=======
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 5b6aeb7 (Manifest_cache true)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
=======
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
=======
=======
              let(:book_decorator) { described_class.new(book) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
=======
              subject(:book_decorator) { described_class.new(book) }
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
>>>>>>> 64dceec (Manifest_cache true)
          
        97. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d34a0770 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 4fac471d (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
=======
<<<<<<< HEAD
>>>>>>> b15044a (Manifest_cache true)
>>>>>>> 64dceec (Manifest_cache true)
=======
          
      97. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
      98. 
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
      99. 
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
      100. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
          
      101. 
=======
=======
>>>>>>> b15044a (Manifest_cache true)
          
      102. 
            3
            

            

              let(:book) { FactoryBot.create(:book, authors: authors, categories: categories) }
          
        103. 
        
        
      
        
        
          
      103. 
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
      104. 
>>>>>>> 7c4ea7f (Fix)
            
            

            

            
          
        105. 
        
        
      
        
        
          
      105. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
>>>>>>> 5b7749a (Fix)
              describe '#full_name' do
          
        106. 
        
        
      
        
        
          
      106. 
            2
            

            

                it { expect(decorated_object.full_name).to eq("#{author.first_name} #{author.last_name}") }
          
        107. 
        
        
      
        
        
          
      107. 
<<<<<<< HEAD
>>>>>>> 845dac1 (Manifest_cache true)
=======
            
            

            

              end
          
        108. 
        
        
      
        
        
          
      108. 
            
            

            

            end
          
        109. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/decorators/book_decorator_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      15 relevant lines.
      15 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            RSpec.describe BookDecorator do
          
        2. 
        
        
      
        
        
          
      2. 
            4
            

            

              subject(:decorated_object) { described_class.new(book) }
          
        3. 
        
        
      
        
        
          
      3. 
            
            

            

            
          
        4. 
        
        
      
        
        
          
      4. 
            1
            

            

              let(:book) do
          
        5. 
        
        
      
        
        
          
      5. 
            3
            

            

                create(:book, price_cents: 123, authors: authors, categories: categories,
          
        6. 
        
        
      
        
        
          
      6. 
            
            

            

                              categories_count: 0,
          
        7. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      7. 
=======
          
      8. 
>>>>>>> ae2a012 (Manifest_cache true)
=======
          
      9. 
>>>>>>> 998f08d (Manifest_cache true)
            1
            

            

<<<<<<< HEAD
>>>>>>> 7375d4b (Manifest_cache true)
              let(:authors) do
>>>>>>> 02a399d (Manifest_cache true)
=======
              let(:authors) do
>>>>>>> bd8bda4 (Manifest_cache true)
=======
              let(:authors) do
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
              let(:authors) do
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
              let(:authors) do
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
              let(:authors) do
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
=======
              let(:authors) do
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> 64dceec (Manifest_cache true)
          
        10. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> bd8bda4 (Manifest_cache true)
=======
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
=======
=======
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> bd8bda4 (Manifest_cache true)
=======
>>>>>>> aa7b40c (Manifest_cache true)
=======
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
=======
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> 64dceec (Manifest_cache true)
=======
>>>>>>> 5b7749a (Fix)
          
      10. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
>>>>>>> 64dceec (Manifest_cache true)
                              authors_count: 0)
=======
                [
>>>>>>> 02a399d (Manifest_cache true)
=======
                [
>>>>>>> bd8bda4 (Manifest_cache true)
=======
                [
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
                [
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                [
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                [
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
=======
                [
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> 64dceec (Manifest_cache true)
=======
                              authors_count: 0)
>>>>>>> 5b7749a (Fix)
          
        11. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
>>>>>>> 5b7749a (Fix)
          
      11. 
            
<<<<<<< HEAD
=======
          
      12. 
            2
>>>>>>> 02a399d (Manifest_cache true)
=======
          
      13. 
            2
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
      14. 
            2
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      15. 
            2
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      16. 
            2
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
=======
          
      17. 
            2
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> 64dceec (Manifest_cache true)
=======
>>>>>>> 5b7749a (Fix)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
>>>>>>> 64dceec (Manifest_cache true)
              end
=======
                  FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk'),
>>>>>>> 02a399d (Manifest_cache true)
=======
                  FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk'),
>>>>>>> bd8bda4 (Manifest_cache true)
=======
                  FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk'),
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
                  FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk'),
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                  FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk'),
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                  FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk'),
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
=======
                  FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk'),
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> 64dceec (Manifest_cache true)
=======
              end
>>>>>>> 5b7749a (Fix)
          
        18. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
>>>>>>> 64dceec (Manifest_cache true)
          
      18. 
            1
=======
          
      19. 
            
>>>>>>> 02a399d (Manifest_cache true)
=======
          
      20. 
=======
          
      21. 
>>>>>>> ae2a012 (Manifest_cache true)
            2
>>>>>>> 7375d4b (Manifest_cache true)
=======
          
      22. 
            
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
      23. 
            
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      24. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      25. 
            
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
=======
          
      26. 
            
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> 64dceec (Manifest_cache true)
=======
          
      27. 
            1
>>>>>>> 5b7749a (Fix)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
>>>>>>> 64dceec (Manifest_cache true)
              let(:authors) do
=======
                  FactoryBot.create(:author, first_name: 'Stas', last_name: 'Todorchuk')
>>>>>>> 02a399d (Manifest_cache true)
=======
                  FactoryBot.create(:author, first_name: 'Stas', last_name: 'Todorchuk')
>>>>>>> bd8bda4 (Manifest_cache true)
=======
                  FactoryBot.create(:author, first_name: 'Stas', last_name: 'Todorchuk')
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
                  FactoryBot.create(:author, first_name: 'Stas', last_name: 'Todorchuk')
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                  FactoryBot.create(:author, first_name: 'Stas', last_name: 'Todorchuk')
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                  FactoryBot.create(:author, first_name: 'Stas', last_name: 'Todorchuk')
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
=======
                  FactoryBot.create(:author, first_name: 'Stas', last_name: 'Todorchuk')
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> 64dceec (Manifest_cache true)
=======
              let(:authors) do
>>>>>>> 5b7749a (Fix)
          
        28. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
>>>>>>> 64dceec (Manifest_cache true)
          
      28. 
=======
          
      29. 
>>>>>>> ae2a012 (Manifest_cache true)
=======
          
      30. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
      31. 
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
          
      32. 
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      33. 
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      34. 
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
=======
          
      35. 
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> 64dceec (Manifest_cache true)
=======
          
      36. 
>>>>>>> 5b7749a (Fix)
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
>>>>>>> 64dceec (Manifest_cache true)
=======
>>>>>>> 5b7749a (Fix)
                [
          
        37. 
        
        
      
        
        
          
      37. 
            3
            

            

                  create(:author, first_name: FFaker::Name.first_name, last_name: FFaker::Name.last_name),
          
        38. 
        
        
      
        
        
          
      38. 
            
            

            

                  create(:author, first_name: FFaker::Name.first_name, last_name: FFaker::Name.last_name)
          
        39. 
        
        
      
        
        
=======
>>>>>>> 6da9530 (Featire specs)
          
      39. 
=======
          
      40. 
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 02a399d (Manifest_cache true)
=======
            
          
        41. 
        
        
      
        
        
<<<<<<< HEAD
          
      41. 
            1
=======
          
      42. 
            2
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
            

            

              resources :books, only: %i[show index] do
          
        43. 
        
        
      
        
        
<<<<<<< HEAD
          
      43. 
            1
=======
          
      44. 
=======
          
      45. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 1d59aaa (Fix)
          
      46. 
>>>>>>> 9e081dc (Fix)
            
            

            

            
          
        47. 
        
        
      
        
        
          
      47. 
            1
            

            

              resources :orders, only: %i[index] do
          
        48. 
        
        
      
        
        
          
      48. 
            1
            

            

                get '/add_to_order', to: 'order_books#add_to_order'
          
        49. 
        
        
      
        
        
          
      49. 
            1
            

            

                delete '/delete_from_cart/:book_id', to: 'order_books#delete_product'
          
        50. 
        
        
      
        
        
          
      50. 
            1
            

            

                put '/order_update_book', to: 'order_books#update_quantity'
          
        51. 
        
        
      
        
        
          
      51. 
            
            

            

              end
          
        52. 
        
        
      
        
        
          
      52. 
            
            

            

            
          
        53. 
        
        
      
        
        
          
      53. 
            1
            

            

              get '/coupon_check', to: 'coupons#find'
          
        54. 
        
        
      
        
        
          
      54. 
            
            

            

            
          
        55. 
        
        
      
        
        
          
      55. 
            1
            

            

              resources :users
          
        56. 
        
        
      
        
        
          
      56. 
            
            

            

            
          
        57. 
        
        
      
        
        
          
      57. 
            1
            

            

              resources :books, only: %i[show index] do
          
        58. 
        
        
      
        
        
          
      58. 
            1
            

            

                resources :reviews, only: :create
          
        59. 
        
        
      
        
        
          
      59. 
            
            

            

              end
          
        60. 
        
        
      
        
        
          
      60. 
            
            

            

            end
          
        61. 
        
        
      
    
      
  
      

      

      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> e9f3851 (Manifest_cache true)
=======
>>>>>>> add330c (Manifest_cache true)
=======
>>>>>>> 15bff2e (Manifest_cache true)
=======
>>>>>>> 6c71f00 (Manifest_cache true)
=======
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> bd8bda4 (Manifest_cache true)
=======
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
=======
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> 64dceec (Manifest_cache true)
=======
>>>>>>> 5b7749a (Fix)
                ]
=======
=======
>>>>>>> 183b6c5 (Manifest_cache true)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
        
      
=======
<<<<<<< HEAD
=======
=======
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 15bff2e (Manifest_cache true)
=======
=======
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 6c71f00 (Manifest_cache true)
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
        
      
>>>>>>> c033601 (Rebased)
  
      
    
      spec/decorators/author_decorator_spec.rb
      
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 1d59aaa (Fix)
=======
        
      
  
      
    
      spec/decorators/book_decorator_spec.rb
      
>>>>>>> 02a399d (Manifest_cache true)
=======
        
      
  
      
    
      spec/decorators/book_decorator_spec.rb
      
>>>>>>> 183b6c5 (Manifest_cache true)
=======
        
      
  
      
    
      spec/decorators/book_decorator_spec.rb
      
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
        
      
  
      
    
      spec/decorators/author_decorator_spec.rb
      
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
=======
>>>>>>> 872e675 (Fix)
=======
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
        
      
  
      
    
      spec/decorators/author_decorator_spec.rb
      
=======
>>>>>>> b15044a (Manifest_cache true)
=======
        
      
  
      
    
      spec/decorators/book_decorator_spec.rb
      
<<<<<<< HEAD
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
=======
=======
=======
        
      
  
      
    
      spec/decorators/book_decorator_spec.rb
      
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> add330c (Manifest_cache true)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 15bff2e (Manifest_cache true)
=======
=======
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 6c71f00 (Manifest_cache true)
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
    
      
      
  100.0%


      lines covered
    
      

    

    
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> e9f3851 (Manifest_cache true)
=======
>>>>>>> add330c (Manifest_cache true)
=======
>>>>>>> 15bff2e (Manifest_cache true)
=======
>>>>>>> 6c71f00 (Manifest_cache true)
=======
>>>>>>> 1d59aaa (Fix)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
      12 relevant lines.
      12 lines covered and
=======
<<<<<<< HEAD
      13 relevant lines.
      13 lines covered and
=======
=======
>>>>>>> b15044a (Manifest_cache true)
      5 relevant lines.
      5 lines covered and
>>>>>>> 2c640cf (Manifest_cache true)
=======
      12 relevant lines.
      12 lines covered and
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
=======
      12 relevant lines.
      12 lines covered and
>>>>>>> bd8bda4 (Manifest_cache true)
=======
      12 relevant lines.
      12 lines covered and
>>>>>>> aa7b40c (Manifest_cache true)
=======
      12 relevant lines.
      12 lines covered and
>>>>>>> 183b6c5 (Manifest_cache true)
=======
<<<<<<< HEAD
      13 relevant lines.
      13 lines covered and
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
      5 relevant lines.
      5 lines covered and
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
=======
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 00f8b58 (Manifest_cache true)
      5 relevant lines.
      5 lines covered and
=======
      5 relevant lines.
      5 lines covered and
>>>>>>> 845dac1 (Manifest_cache true)
=======
      12 relevant lines.
      12 lines covered and
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
      12 relevant lines.
      12 lines covered and
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 24b58e6 (Manifest_cache true)
=======
=======
      12 relevant lines.
      12 lines covered and
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 00f8b58 (Manifest_cache true)
=======
      5 relevant lines.
      5 lines covered and
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
=======
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> add330c (Manifest_cache true)
=======
=======
      12 relevant lines.
      12 lines covered and
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 15bff2e (Manifest_cache true)
=======
=======
=======
      12 relevant lines.
      12 lines covered and
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 6c71f00 (Manifest_cache true)
=======
=======
      5 relevant lines.
      5 lines covered and
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

<<<<<<< HEAD
            RSpec.describe AuthorDecorator, type: :decorator do
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
>>>>>>> b15044a (Manifest_cache true)
            RSpec.describe AuthorDecorator, type: :decorator do
=======
            require 'rails_helper'
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
            require 'rails_helper'
>>>>>>> 183b6c5 (Manifest_cache true)
=======
            require 'rails_helper'
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
            RSpec.describe AuthorDecorator, type: :decorator do
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
=======
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
=======
=======
=======
            require 'rails_helper'
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> add330c (Manifest_cache true)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 15bff2e (Manifest_cache true)
=======
=======
=======
            require 'rails_helper'
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 6c71f00 (Manifest_cache true)
=======
=======
            RSpec.describe AuthorDecorator, type: :decorator do
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
          
        2. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
=======
>>>>>>> 872e675 (Fix)
          
      2. 
            
=======
=======
>>>>>>> add330c (Manifest_cache true)
=======
>>>>>>> 15bff2e (Manifest_cache true)
=======
>>>>>>> 6c71f00 (Manifest_cache true)
=======
>>>>>>> 1d59aaa (Fix)
          
      3. 
            
=======
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
>>>>>>> b15044a (Manifest_cache true)
=======
>>>>>>> 7c4ea7f (Fix)
          
      4. 
            2
>>>>>>> 24b58e6 (Manifest_cache true)
>>>>>>> e9f3851 (Manifest_cache true)
            

            

            
          
        5. 
        
        
      
        
        
<<<<<<< HEAD
          
      5. 
            1
            

            

            RSpec.describe BookDecorator do
          
        6. 
        
        
      
        
        
          
      6. 
            3
            

            

<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
              subject(:book_decorator) { described_class.new(book) }
=======
<<<<<<< HEAD
              let(:book_decorator) { described_class.new(book) }
=======
              subject(:book_decorator) { described_class.new(book) }
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
=======
              subject(:book_decorator) { described_class.new(book) }
>>>>>>> bd8bda4 (Manifest_cache true)
=======
              subject(:book_decorator) { described_class.new(book) }
>>>>>>> aa7b40c (Manifest_cache true)
=======
              subject(:book_decorator) { described_class.new(book) }
>>>>>>> 183b6c5 (Manifest_cache true)
=======
              let(:book_decorator) { described_class.new(book) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
          
        7. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
          
      7. 
=======
<<<<<<< HEAD
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
          
      8. 
            3
            

            

              let(:book) { FactoryBot.create(:book, authors: authors, categories: categories) }
          
        9. 
        
        
      
        
        
          
      9. 
<<<<<<< HEAD
=======
          
      10. 
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
=======
          
      11. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
      12. 
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
      13. 
>>>>>>> 183b6c5 (Manifest_cache true)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
=======
          
      14. 
>>>>>>> 02a399d (Manifest_cache true)
=======
          
      15. 
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 24b58e6 (Manifest_cache true)
=======
=======
          
      16. 
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> add330c (Manifest_cache true)
=======
=======
=======
          
      17. 
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 15bff2e (Manifest_cache true)
=======
=======
=======
          
      18. 
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 6c71f00 (Manifest_cache true)
=======
=======
          
      19. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
            
            

            

            
          
        20. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> add330c (Manifest_cache true)
=======
>>>>>>> 15bff2e (Manifest_cache true)
=======
>>>>>>> 6c71f00 (Manifest_cache true)
=======
>>>>>>> 1d59aaa (Fix)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
          
      20. 
=======
<<<<<<< HEAD
          
      21. 
=======
          
      22. 
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
=======
          
      23. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
      24. 
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
      25. 
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
      26. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
            1
            

            

              let(:authors) do
          
        27. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
          
      27. 
=======
<<<<<<< HEAD
          
      28. 
=======
          
      29. 
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
=======
          
      30. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
      31. 
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
      32. 
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
      33. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
            
            

            

                [
          
        34. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
          
      34. 
=======
<<<<<<< HEAD
          
      35. 
=======
          
      36. 
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
=======
          
      37. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
      38. 
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
      39. 
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
      40. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
          
      41. 
>>>>>>> c033601 (Rebased)
            2
=======
          
      42. 
            2
>>>>>>> a5d032d (Fix)
            

            

              subject(:decorated_object) { described_class.new(author) }
>>>>>>> 6da9530 (Featire specs)
          
        43. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e18eb87 (Fix)
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
>>>>>>> 64dceec (Manifest_cache true)
=======
>>>>>>> 5b7749a (Fix)
          
      43. 
<<<<<<< HEAD
=======
          
      44. 
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
          
      45. 
=======
<<<<<<< HEAD
          
      46. 
=======
          
      47. 
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
=======
          
      48. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
      49. 
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
      50. 
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
      51. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
          
      52. 
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
=======
=======
=======
          
      53. 
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
          
      54. 
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
=======
>>>>>>> 872e675 (Fix)
=======
=======
=======
          
      55. 
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> e9f3851 (Manifest_cache true)
            
            

            

            
          
        56. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
          
      56. 
=======
<<<<<<< HEAD
          
      57. 
=======
          
      58. 
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
=======
          
      59. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
      60. 
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
      61. 
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
      62. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
            
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
>>>>>>> b15044a (Manifest_cache true)
          
      63. 
            2
=======
          
      64. 
            1
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 845dac1 (Manifest_cache true)
=======
=======
          
      65. 
            1
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
=======
          
      66. 
            1
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2c640cf (Manifest_cache true)
=======
=======
          
      67. 
            1
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
=======
          
      68. 
            2
>>>>>>> 7c4ea7f (Fix)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                ]
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
=======
>>>>>>> 7c4ea7f (Fix)
              let(:author) { create(:author) }
<<<<<<< HEAD
=======
=======
=======
>>>>>>> bd8bda4 (Manifest_cache true)
=======
>>>>>>> aa7b40c (Manifest_cache true)
            RSpec.describe BookDecorator do
>>>>>>> 0b43b18 (Manifest_cache true)
          
        69. 
        
        
      
        
        
<<<<<<< HEAD
          
      69. 
            3
            

            

<<<<<<< HEAD
<<<<<<< HEAD
              subject(:book_decorator) { described_class.new(book) }
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0b43b18 (Manifest_cache true)
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 845dac1 (Manifest_cache true)
=======
=======
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96aecde (Manifest_cache true)
=======
=======
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2722d07 (Manifest_cache true)
=======
=======
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
=======
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2c640cf (Manifest_cache true)
=======
=======
              let(:book_decorator) { described_class.new(book) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
=======
              subject(:book_decorator) { described_class.new(book) }
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
=======
=======
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 0b43b18 (Manifest_cache true)
          
        70. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
          
      70. 
=======
<<<<<<< HEAD
          
      71. 
=======
          
      72. 
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 6da9530 (Featire specs)
=======
=======
          
      73. 
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96aecde (Manifest_cache true)
=======
=======
          
      74. 
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2722d07 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 2722d07 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      75. 
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
=======
          
      76. 
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
=======
=======
          
      77. 
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 64dceec (Manifest_cache true)
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
=======
=======
          
      78. 
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
      79. 
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
      80. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 6da9530 (Featire specs)
=======
=======
          
      81. 
=======
=======
>>>>>>> b15044a (Manifest_cache true)
          
      82. 
            3
            

            

              let(:book) { FactoryBot.create(:book, authors: authors, categories: categories) }
          
        83. 
        
        
      
        
        
          
      83. 
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
      84. 
>>>>>>> 7c4ea7f (Fix)
            
            

            

            
          
        85. 
        
        
      
        
        
          
      85. 
            1
            

            

<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0b43b18 (Manifest_cache true)
              describe '#full_name' do
          
        86. 
        
        
      
        
        
          
      86. 
            2
            

            

                it { expect(decorated_object.full_name).to eq("#{author.first_name} #{author.last_name}") }
          
        87. 
        
        
      
        
        
          
      87. 
<<<<<<< HEAD
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 3be4d14 (Manifest_cache true)
=======
=======
            
            

            

              end
          
        88. 
        
        
      
        
        
          
      88. 
            
            

            

            end
          
        89. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/decorators/book_decorator_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      15 relevant lines.
      15 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            RSpec.describe BookDecorator do
          
        2. 
        
        
      
        
        
          
      2. 
            4
            

            

              subject(:decorated_object) { described_class.new(book) }
          
        3. 
        
        
      
        
        
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
          
      3. 
            
            

            

            
          
        4. 
        
        
      
        
        
          
      4. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3e9f99d (Featire specs)
              let(:book) do
=======
              resources :books, only: %i[show index]
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
=======
=======
            RSpec.describe BookDecorator do
=======
              resources :books, only: %i[show index]
>>>>>>> 752f0c0 (Featire specs)
          
        5. 
        
        
      
        
        
<<<<<<< HEAD
          
      5. 
            3
            

            

<<<<<<< HEAD
              let(:book_decorator) { described_class.new(book) }
=======
              subject(:book_decorator) { described_class.new(book) }
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 3e9f99d (Featire specs)
          
        6. 
        
        
      
        
        
<<<<<<< HEAD
          
      6. 
            3
            

            

                create(:book, price_cents: 123, authors: authors, categories: categories,
          
        7. 
        
        
      
        
        
          
      7. 
            
            

            

                              categories_count: 0,
          
        8. 
        
        
      
        
        
<<<<<<< HEAD
=======
<<<<<<< HEAD
          
      8. 
=======
          
      9. 
>>>>>>> ae2a012 (Manifest_cache true)
            1
            

            

>>>>>>> 7375d4b (Manifest_cache true)
              let(:authors) do
>>>>>>> 02a399d (Manifest_cache true)
=======
              let(:authors) do
>>>>>>> bd8bda4 (Manifest_cache true)
=======
              let(:authors) do
>>>>>>> aa7b40c (Manifest_cache true)
          
        10. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> bd8bda4 (Manifest_cache true)
=======
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 0b43b18 (Manifest_cache true)
          
      10. 
            
            

            

<<<<<<< HEAD
                              authors_count: 0)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                              authors_count: 0)
=======
                [
>>>>>>> 02a399d (Manifest_cache true)
=======
                [
>>>>>>> bd8bda4 (Manifest_cache true)
=======
                [
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 0b43b18 (Manifest_cache true)
          
        11. 
        
        
      
        
        
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0b43b18 (Manifest_cache true)
          
      11. 
            
<<<<<<< HEAD
=======
=======
          
      12. 
            2
>>>>>>> 02a399d (Manifest_cache true)
=======
          
      13. 
            2
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
      14. 
            2
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 0b43b18 (Manifest_cache true)
            

            

<<<<<<< HEAD
              end
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              end
=======
                  FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk'),
>>>>>>> 02a399d (Manifest_cache true)
=======
                  FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk'),
>>>>>>> bd8bda4 (Manifest_cache true)
=======
                  FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk'),
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 0b43b18 (Manifest_cache true)
          
        15. 
        
        
      
        
        
<<<<<<< HEAD
          
      15. 
            1
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      16. 
            1
=======
          
      17. 
            
>>>>>>> 02a399d (Manifest_cache true)
=======
          
      18. 
=======
          
      19. 
>>>>>>> ae2a012 (Manifest_cache true)
            2
>>>>>>> 7375d4b (Manifest_cache true)
=======
          
      20. 
            
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
      21. 
            
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 0b43b18 (Manifest_cache true)
            

            

<<<<<<< HEAD
              let(:authors) do
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              let(:authors) do
=======
                  FactoryBot.create(:author, first_name: 'Stas', last_name: 'Todorchuk')
>>>>>>> 02a399d (Manifest_cache true)
=======
                  FactoryBot.create(:author, first_name: 'Stas', last_name: 'Todorchuk')
>>>>>>> bd8bda4 (Manifest_cache true)
=======
                  FactoryBot.create(:author, first_name: 'Stas', last_name: 'Todorchuk')
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 0b43b18 (Manifest_cache true)
          
        22. 
        
        
      
        
        
<<<<<<< HEAD
          
      22. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      23. 
=======
          
      24. 
>>>>>>> ae2a012 (Manifest_cache true)
=======
          
      25. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
      26. 
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 0b43b18 (Manifest_cache true)
            
            

            

<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0b43b18 (Manifest_cache true)
                [
          
        27. 
        
        
      
        
        
          
      27. 
            3
            

            

                  create(:author, first_name: FFaker::Name.first_name, last_name: FFaker::Name.last_name),
          
        28. 
        
        
      
        
        
          
      28. 
            
            

            

                  create(:author, first_name: FFaker::Name.first_name, last_name: FFaker::Name.last_name)
          
        29. 
        
        
      
        
        
          
      29. 
            
            

            

<<<<<<< HEAD
=======
=======
>>>>>>> 02a399d (Manifest_cache true)
=======
>>>>>>> bd8bda4 (Manifest_cache true)
=======
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 0b43b18 (Manifest_cache true)
                ]
          
        30. 
        
        
      
        
        
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0b43b18 (Manifest_cache true)
          
      30. 
<<<<<<< HEAD
=======
          
      31. 
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 51bc18c (Featire specs)
=======
=======
=======
          
      32. 
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 551c6ab (Manifest_cache true)
=======
=======
=======
          
      33. 
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> fd310ed (Manifest_cache true)
=======
=======
=======
          
      34. 
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 42e9c2e (Manifest_cache true)
=======
=======
=======
          
      35. 
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> c0159bf (Manifest_cache true)
=======
=======
=======
          
      36. 
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> ca274ec (Manifest_cache true)
=======
=======
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
=======
=======
=======
          
      37. 
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 0b43b18 (Manifest_cache true)
>>>>>>> 1cce66c (Manifest_cache true)
            
            

            

              end
          
        38. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
=======
>>>>>>> b15044a (Manifest_cache true)
>>>>>>> 64dceec (Manifest_cache true)
<<<<<<< HEAD
          
      38. 
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> 6da9530 (Featire specs)
=======
=======
>>>>>>> fd310ed (Manifest_cache true)
=======
>>>>>>> 42e9c2e (Manifest_cache true)
=======
>>>>>>> c0159bf (Manifest_cache true)
=======
>>>>>>> ca274ec (Manifest_cache true)
=======
>>>>>>> 9e081dc (Fix)
=======
>>>>>>> 1cce66c (Manifest_cache true)
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
=======
>>>>>>> 0b43b18 (Manifest_cache true)
          
      39. 
>>>>>>> 96aecde (Manifest_cache true)
>>>>>>> 551c6ab (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
          
      40. 
=======
<<<<<<< HEAD
          
      41. 
=======
          
      42. 
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> 551c6ab (Manifest_cache true)
=======
=======
          
      43. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
      44. 
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 1cce66c (Manifest_cache true)
=======
>>>>>>> 42e9c2e (Manifest_cache true)
=======
>>>>>>> fd310ed (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
          
      45. 
>>>>>>> 183b6c5 (Manifest_cache true)
=======
<<<<<<< HEAD
          
      46. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
=======
          
      47. 
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 42e9c2e (Manifest_cache true)
=======
=======
          
      48. 
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      49. 
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
=======
=======
          
      50. 
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 64dceec (Manifest_cache true)
=======
=======
          
      51. 
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
>>>>>>> 5b7749a (Fix)
=======
=======
          
      52. 
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
      53. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 6da9530 (Featire specs)
=======
=======
=======
          
      54. 
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> 96aecde (Manifest_cache true)
>>>>>>> 551c6ab (Manifest_cache true)
=======
>>>>>>> fd310ed (Manifest_cache true)
=======
>>>>>>> 42e9c2e (Manifest_cache true)
=======
=======
          
      55. 
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> c0159bf (Manifest_cache true)
=======
=======
=======
          
      56. 
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
>>>>>>> ca274ec (Manifest_cache true)
=======
=======
          
      57. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 9e081dc (Fix)
=======
=======
>>>>>>> 0b43b18 (Manifest_cache true)
>>>>>>> 1cce66c (Manifest_cache true)
            1
            

            

              let(:categories) do
          
        58. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
=======
>>>>>>> b15044a (Manifest_cache true)
>>>>>>> 64dceec (Manifest_cache true)
<<<<<<< HEAD
          
      58. 
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> 6da9530 (Featire specs)
=======
=======
>>>>>>> fd310ed (Manifest_cache true)
=======
>>>>>>> 42e9c2e (Manifest_cache true)
=======
>>>>>>> c0159bf (Manifest_cache true)
=======
>>>>>>> ca274ec (Manifest_cache true)
=======
>>>>>>> 9e081dc (Fix)
=======
>>>>>>> 1cce66c (Manifest_cache true)
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
=======
>>>>>>> 0b43b18 (Manifest_cache true)
          
      59. 
>>>>>>> 96aecde (Manifest_cache true)
>>>>>>> 551c6ab (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
          
      60. 
=======
<<<<<<< HEAD
          
      61. 
=======
          
      62. 
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> 551c6ab (Manifest_cache true)
=======
=======
          
      63. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
      64. 
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 1cce66c (Manifest_cache true)
=======
>>>>>>> 42e9c2e (Manifest_cache true)
=======
>>>>>>> fd310ed (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
          
      65. 
>>>>>>> 183b6c5 (Manifest_cache true)
=======
<<<<<<< HEAD
          
      66. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
=======
          
      67. 
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 42e9c2e (Manifest_cache true)
=======
=======
          
      68. 
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      69. 
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
=======
=======
          
      70. 
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 64dceec (Manifest_cache true)
=======
=======
          
      71. 
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
>>>>>>> 5b7749a (Fix)
=======
=======
          
      72. 
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
      73. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 6da9530 (Featire specs)
=======
=======
=======
          
      74. 
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> 96aecde (Manifest_cache true)
>>>>>>> 551c6ab (Manifest_cache true)
=======
>>>>>>> fd310ed (Manifest_cache true)
=======
>>>>>>> 42e9c2e (Manifest_cache true)
=======
=======
          
      75. 
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> c0159bf (Manifest_cache true)
=======
=======
=======
          
      76. 
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
>>>>>>> ca274ec (Manifest_cache true)
=======
=======
          
      77. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 9e081dc (Fix)
=======
=======
>>>>>>> 0b43b18 (Manifest_cache true)
>>>>>>> 1cce66c (Manifest_cache true)
            
            

            

                [
          
        78. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 42e9c2e (Manifest_cache true)
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c0159bf (Manifest_cache true)
=======
>>>>>>> ca274ec (Manifest_cache true)
=======
>>>>>>> 9e081dc (Fix)
=======
>>>>>>> 1cce66c (Manifest_cache true)
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
=======
>>>>>>> b15044a (Manifest_cache true)
>>>>>>> 64dceec (Manifest_cache true)
=======
=======
>>>>>>> 551c6ab (Manifest_cache true)
=======
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
>>>>>>> fd310ed (Manifest_cache true)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
>>>>>>> 42e9c2e (Manifest_cache true)
<<<<<<< HEAD
=======
=======
>>>>>>> 0b43b18 (Manifest_cache true)
>>>>>>> 1cce66c (Manifest_cache true)
          
      78. 
            3
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
=======
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> 551c6ab (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
          
      79. 
=======
<<<<<<< HEAD
          
      80. 
=======
          
      81. 
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
=======
          
      82. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
      83. 
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
      84. 
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
      85. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 00f8b58 (Manifest_cache true)
>>>>>>> 84003439 (Featire specs)
          
      86. 
            2
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> e18eb87 (Fix)
=======
          
      87. 
            1
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 845dac1 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 845dac1 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> 551c6ab (Manifest_cache true)
          
      88. 
            1
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
=======
          
      89. 
            1
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
=======
=======
          
      90. 
            1
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 64dceec (Manifest_cache true)
=======
=======
          
      91. 
            2
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
=======
=======
          
      92. 
            2
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 31d15e66 (Fix)
=======
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> bd30d038 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> 8887ba5b (Fix)
=======
>>>>>>> 56531f25 (Manifest_cache true)
=======
          
      93. 
>>>>>>> c033601 (Rebased)
            2
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> b28889f (Fix)
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> fdab719f (Fix)
=======
=======
>>>>>>> b28889f (Fix)
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> 8288136d (Fix)
=======
=======
>>>>>>> b28889f (Fix)
=======
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> b28889f (Fix)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 551c6ab (Manifest_cache true)
=======
          
      94. 
            2
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a304bcf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> bd30d038 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      95. 
            2
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 35d17b9 (Manifest_cache true)
>>>>>>> 255dd8d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d4235040 (Manifest_cache true)
=======
=======
<<<<<<< HEAD
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      96. 
            2
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
=======
          
      97. 
            2
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4367ccb1 (Manifest_cache true)
=======
=======
=======
=======
          
      98. 
            2
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 64dceec (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4fac471d (Manifest_cache true)
=======
=======
=======
          
      99. 
            3
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
>>>>>>> ef483b6d (Fix)
=======
=======
          
      100. 
>>>>>>> c033601 (Rebased)
            2
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> b28889f (Fix)
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
>>>>>>> b28889f (Fix)
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 0c57e4e (Fix)
<<<<<<< HEAD
>>>>>>> 8887ba5b (Fix)
=======
=======
=======
>>>>>>> fd310ed (Manifest_cache true)
=======
>>>>>>> 1cce66c (Manifest_cache true)
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 551c6ab (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 56531f25 (Manifest_cache true)
=======
=======
=======
=======
=======
>>>>>>> 0b43b18 (Manifest_cache true)
=======
          
      101. 
            2
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 35d17b9 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> fd310ed (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 86229876 (Manifest_cache true)
=======
=======
=======
=======
=======
          
      102. 
            2
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> add330c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 42e9c2e (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 16ebb0ff (Manifest_cache true)
=======
=======
=======
=======
=======
          
      103. 
            2
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 15bff2e (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> c0159bf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1d0f5cbf (Manifest_cache true)
=======
=======
=======
=======
=======
          
      104. 
            2
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 6c71f00 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> ca274ec (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a56ba36d (Manifest_cache true)
=======
=======
=======
=======
          
      105. 
            3
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
=======
>>>>>>> 0b43b18 (Manifest_cache true)
>>>>>>> 1cce66c (Manifest_cache true)
>>>>>>> d365be68 (Manifest_cache true)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                ]
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
                ]
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
=======
>>>>>>> b15044a (Manifest_cache true)
>>>>>>> 64dceec (Manifest_cache true)
<<<<<<< HEAD
=======
>>>>>>> 7c4ea7f (Fix)
=======
>>>>>>> 31d15e66 (Fix)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> 4367ccb1 (Manifest_cache true)
=======
>>>>>>> 4fac471d (Manifest_cache true)
=======
>>>>>>> ef483b6d (Fix)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> 8887ba5b (Fix)
=======
>>>>>>> 56531f25 (Manifest_cache true)
=======
>>>>>>> 86229876 (Manifest_cache true)
=======
>>>>>>> 16ebb0ff (Manifest_cache true)
=======
>>>>>>> 1d0f5cbf (Manifest_cache true)
=======
>>>>>>> a56ba36d (Manifest_cache true)
=======
>>>>>>> 1049b80c (Fix)
=======
>>>>>>> d365be68 (Manifest_cache true)
              let(:author) { create(:author) }
<<<<<<< HEAD
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
>>>>>>> b15044a (Manifest_cache true)
=======
>>>>>>> 0b43b18 (Manifest_cache true)
                  create(:category, name: FFaker::Book.genre),
>>>>>>> 2722d07 (Manifest_cache true)
=======
                  create(:category, name: FFaker::Book.genre),
>>>>>>> 96aecde (Manifest_cache true)
=======
=======
<<<<<<< HEAD
              let(:author) { create(:author) }
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
              let(:author) { create(:author) }
=======
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              let(:author) { create(:author) }
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
=======
=======
<<<<<<< HEAD
              let(:author) { create(:author) }
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
=======
>>>>>>> b15044a (Manifest_cache true)
>>>>>>> 64dceec (Manifest_cache true)
                  create(:category, name: FFaker::Book.genre),
>>>>>>> 2722d07 (Manifest_cache true)
=======
                  create(:category, name: FFaker::Book.genre),
>>>>>>> 96aecde (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a304bcf (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> bd8bda4 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> cc390719 (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> 0e864a5 (Manifest_cache true)
=======
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
=======
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> 64dceec (Manifest_cache true)
=======
>>>>>>> c59d1a99 (Manifest_cache true)
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> cc390719 (Manifest_cache true)
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
>>>>>>> 0e864a5 (Manifest_cache true)
>>>>>>> cc390719 (Manifest_cache true)
            RSpec.describe BookDecorator do
=======
<<<<<<< HEAD
>>>>>>> 5b7749a (Fix)
=======
              let(:author) { create(:author) }
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 31d15e66 (Fix)
=======
=======
              let(:author) { create(:author) }
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> 8887ba5b (Fix)
=======
              let(:author) { create(:author) }
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> b28889f (Fix)
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> fdab719f (Fix)
=======
=======
>>>>>>> b28889f (Fix)
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> 8288136d (Fix)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
              let(:author) { create(:author) }
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> b28889f (Fix)
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
>>>>>>> b28889f (Fix)
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 0c57e4e (Fix)
<<<<<<< HEAD
>>>>>>> 8887ba5b (Fix)
=======
=======
=======
                  FactoryBot.create(:category, name: 'Poetry'),
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 0b43b18 (Manifest_cache true)
>>>>>>> 1cce66c (Manifest_cache true)
>>>>>>> d365be68 (Manifest_cache true)
          
        106. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
          
      106. 
>>>>>>> 0b43b18 (Manifest_cache true)
=======
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
          
      107. 
            3
            

            

<<<<<<< HEAD
              subject(:book_decorator) { described_class.new(book) }
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 86d584a (Manifest_cache true)
>>>>>>> 02a399d (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> bd8bda4 (Manifest_cache true)
=======
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
=======
>>>>>>> 183b6c5 (Manifest_cache true)
=======
>>>>>>> fd6db03 (Manifest_cache true)
=======
              let(:book_decorator) { described_class.new(book) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
                  FactoryBot.create(:category, name: 'Poetry'),
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
=======
=======
=======
                  FactoryBot.create(:category, name: 'Poetry'),
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 35d17b9 (Manifest_cache true)
=======
=======
=======
                  FactoryBot.create(:category, name: 'Poetry'),
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> add330c (Manifest_cache true)
=======
=======
=======
                  FactoryBot.create(:category, name: 'Poetry'),
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 15bff2e (Manifest_cache true)
=======
=======
=======
                  FactoryBot.create(:category, name: 'Poetry'),
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 6c71f00 (Manifest_cache true)
=======
=======
                  create(:category, name: FFaker::Book.genre),
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
          
        108. 
        
        
      
        
        
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
          
      108. 
            3
            

            

<<<<<<< HEAD
              subject(:book_decorator) { described_class.new(book) }
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 02a399d (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> bd8bda4 (Manifest_cache true)
=======
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 183b6c5 (Manifest_cache true)
=======
>>>>>>> fd6db03 (Manifest_cache true)
=======
              let(:book_decorator) { described_class.new(book) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
                  FactoryBot.create(:category, name: 'Poetry'),
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                  FactoryBot.create(:category, name: 'Poetry'),
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 35d17b9 (Manifest_cache true)
          
        109. 
        
        
      
        
        
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
          
      109. 
            3
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
              subject(:book_decorator) { described_class.new(book) }
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
>>>>>>> c59d1a99 (Manifest_cache true)
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 845dac1 (Manifest_cache true)
=======
=======
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96aecde (Manifest_cache true)
=======
=======
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2722d07 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 2722d07 (Manifest_cache true)
=======
=======
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 5b6aeb7 (Manifest_cache true)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
=======
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
=======
=======
              let(:book_decorator) { described_class.new(book) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
=======
              subject(:book_decorator) { described_class.new(book) }
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
>>>>>>> 64dceec (Manifest_cache true)
=======
=======
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> c59d1a99 (Manifest_cache true)
=======
=======
              let(:book_decorator) { described_class.new(book) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
<<<<<<< HEAD
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                  FactoryBot.create(:category, name: 'Poetry'),
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
=======
                  FactoryBot.create(:category, name: 'Poetry'),
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4367ccb1 (Manifest_cache true)
=======
=======
=======
=======
                  FactoryBot.create(:category, name: 'Poetry'),
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 64dceec (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4fac471d (Manifest_cache true)
=======
=======
=======
                  create(:category, name: FFaker::Book.genre),
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
>>>>>>> ef483b6d (Fix)
          
        110. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> d4235040 (Manifest_cache true)
=======
>>>>>>> 4367ccb1 (Manifest_cache true)
=======
>>>>>>> 4fac471d (Manifest_cache true)
=======
>>>>>>> ef483b6d (Fix)
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
=======
>>>>>>> b15044a (Manifest_cache true)
>>>>>>> 64dceec (Manifest_cache true)
          
      110. 
>>>>>>> 96aecde (Manifest_cache true)
>>>>>>> bd30d038 (Manifest_cache true)
=======
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> fd310ed (Manifest_cache true)
=======
>>>>>>> 42e9c2e (Manifest_cache true)
=======
>>>>>>> c0159bf (Manifest_cache true)
=======
>>>>>>> ca274ec (Manifest_cache true)
=======
>>>>>>> 9e081dc (Fix)
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
>>>>>>> b15044a (Manifest_cache true)
          
      111. 
>>>>>>> 96aecde (Manifest_cache true)
>>>>>>> 551c6ab (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
          
      112. 
=======
<<<<<<< HEAD
          
      113. 
=======
          
      114. 
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> 551c6ab (Manifest_cache true)
=======
=======
          
      115. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
      116. 
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
=======
          
      117. 
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
      118. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
          
      119. 
<<<<<<< HEAD
=======
=======
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
=======
>>>>>>> e18eb87 (Fix)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
          
      120. 
            3
            

            

              let(:book) { FactoryBot.create(:book, authors: authors, categories: categories) }
          
        121. 
        
        
      
        
        
          
      121. 
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      122. 
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
      123. 
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
>>>>>>> 557c1b8 (Fix)
=======
=======
          
      124. 
>>>>>>> a5d032d (Fix)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      125. 
>>>>>>> a5d032d (Fix)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0c57e4e (Fix)
=======
          
      126. 
>>>>>>> a5d032d (Fix)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> e18eb87 (Fix)
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
=======
          
      127. 
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
>>>>>>> 0c57e4e (Fix)
            
            

            

            
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 551c6ab (Manifest_cache true)
=======
=======
          
      128. 
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      129. 
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
          
      130. 
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      131. 
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      132. 
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
=======
          
      133. 
>>>>>>> 998f08d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 64dceec (Manifest_cache true)
=======
=======
          
      134. 
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
>>>>>>> 5b7749a (Fix)
=======
>>>>>>> 551c6ab (Manifest_cache true)
=======
=======
          
      135. 
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> fd310ed (Manifest_cache true)
=======
=======
          
      136. 
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 42e9c2e (Manifest_cache true)
=======
=======
          
      137. 
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> c0159bf (Manifest_cache true)
=======
=======
          
      138. 
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> ca274ec (Manifest_cache true)
=======
=======
          
      139. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 9e081dc (Fix)
=======
=======
>>>>>>> 0b43b18 (Manifest_cache true)
>>>>>>> 1cce66c (Manifest_cache true)
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
>>>>>>> 64dceec (Manifest_cache true)
=======
>>>>>>> 5b7749a (Fix)
=======
>>>>>>> fd310ed (Manifest_cache true)
=======
>>>>>>> 42e9c2e (Manifest_cache true)
=======
>>>>>>> c0159bf (Manifest_cache true)
=======
>>>>>>> ca274ec (Manifest_cache true)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0b43b18 (Manifest_cache true)
>>>>>>> 1cce66c (Manifest_cache true)
                  create(:category, name: FFaker::Book.genre)
<<<<<<< HEAD
=======
                  create(:category, name: FFaker::Book.genre)
>>>>>>> 551c6ab (Manifest_cache true)
=======
                  create(:category, name: FFaker::Book.genre)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
=======
                  FactoryBot.create(:category, name: 'Novel')
>>>>>>> 02a399d (Manifest_cache true)
=======
                  FactoryBot.create(:category, name: 'Novel')
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd310ed (Manifest_cache true)
=======
>>>>>>> 1cce66c (Manifest_cache true)
>>>>>>> 96aecde (Manifest_cache true)
=======
=======
                  FactoryBot.create(:category, name: 'Novel')
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 2722d07 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 2722d07 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
                  FactoryBot.create(:category, name: 'Novel')
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
=======
                  FactoryBot.create(:category, name: 'Novel')
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
=======
=======
                  FactoryBot.create(:category, name: 'Novel')
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 64dceec (Manifest_cache true)
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
=======
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> 96aecde (Manifest_cache true)
>>>>>>> 551c6ab (Manifest_cache true)
=======
>>>>>>> 2722d07 (Manifest_cache true)
>>>>>>> fd310ed (Manifest_cache true)
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
=======
                  FactoryBot.create(:category, name: 'Novel')
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 42e9c2e (Manifest_cache true)
=======
=======
=======
                  FactoryBot.create(:category, name: 'Novel')
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> c0159bf (Manifest_cache true)
=======
=======
=======
                  FactoryBot.create(:category, name: 'Novel')
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> ca274ec (Manifest_cache true)
=======
=======
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
=======
=======
=======
                  FactoryBot.create(:category, name: 'Novel')
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 0b43b18 (Manifest_cache true)
>>>>>>> 1cce66c (Manifest_cache true)
          
        140. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> d4235040 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 4367ccb1 (Manifest_cache true)
=======
>>>>>>> 4fac471d (Manifest_cache true)
=======
>>>>>>> ef483b6d (Fix)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8887ba5b (Fix)
=======
>>>>>>> 86229876 (Manifest_cache true)
=======
>>>>>>> 16ebb0ff (Manifest_cache true)
=======
>>>>>>> 1d0f5cbf (Manifest_cache true)
=======
>>>>>>> a56ba36d (Manifest_cache true)
=======
>>>>>>> 1049b80c (Fix)
=======
>>>>>>> d365be68 (Manifest_cache true)
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 255dd8d (Manifest_cache true)
=======
>>>>>>> 42e9c2e (Manifest_cache true)
=======
>>>>>>> c0159bf (Manifest_cache true)
=======
>>>>>>> ca274ec (Manifest_cache true)
=======
>>>>>>> 9e081dc (Fix)
=======
>>>>>>> 1cce66c (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 872e675 (Fix)
=======
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
>>>>>>> 35d17b9 (Manifest_cache true)
          
      140. 
>>>>>>> 96aecde (Manifest_cache true)
>>>>>>> d782a28 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
>>>>>>> 64dceec (Manifest_cache true)
=======
>>>>>>> 5b7749a (Fix)
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
>>>>>>> b15044a (Manifest_cache true)
          
      141. 
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0c57e4e (Fix)
=======
>>>>>>> fd310ed (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 872e675 (Fix)
=======
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 35d17b9 (Manifest_cache true)
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> add330c (Manifest_cache true)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 15bff2e (Manifest_cache true)
=======
=======
>>>>>>> b15044a (Manifest_cache true)
>>>>>>> 6c71f00 (Manifest_cache true)
=======
>>>>>>> 0b43b18 (Manifest_cache true)
          
      142. 
>>>>>>> 96aecde (Manifest_cache true)
>>>>>>> d782a28 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 31d15e66 (Fix)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b15044a (Manifest_cache true)
          
      143. 
=======
          
      144. 
=======
          
      145. 
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6da9530 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> bd30d038 (Manifest_cache true)
=======
>>>>>>> 551c6ab (Manifest_cache true)
=======
>>>>>>> 56531f25 (Manifest_cache true)
=======
          
      146. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
      147. 
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
          
      148. 
>>>>>>> 183b6c5 (Manifest_cache true)
=======
<<<<<<< HEAD
          
      149. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
=======
          
      150. 
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
            
=======
          
      151. 
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      152. 
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
          
      153. 
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2c640cf (Manifest_cache true)
=======
=======
          
      154. 
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
=======
          
      155. 
>>>>>>> 7c4ea7f (Fix)
            
=======
          
      156. 
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      157. 
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
            1
>>>>>>> c033601 (Rebased)
=======
          
      158. 
            1
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
            1
>>>>>>> c033601 (Rebased)
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> fd310ed (Manifest_cache true)
=======
>>>>>>> 42e9c2e (Manifest_cache true)
=======
>>>>>>> 1cce66c (Manifest_cache true)
=======
          
      159. 
>>>>>>> 183b6c5 (Manifest_cache true)
=======
<<<<<<< HEAD
          
      160. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
=======
          
      161. 
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
=======
          
      162. 
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
          
      163. 
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2c640cf (Manifest_cache true)
=======
=======
          
      164. 
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
=======
          
      165. 
>>>>>>> 7c4ea7f (Fix)
=======
>>>>>>> 0b43b18 (Manifest_cache true)
            
=======
          
      166. 
=======
          
      167. 
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
            1
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> 6da9530 (Featire specs)
=======
=======
          
      168. 
            1
>>>>>>> a5d032d (Fix)
>>>>>>> e18eb87 (Fix)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
=======
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 31d15e66 (Fix)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> fdab719f (Fix)
=======
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5890c2 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
=======
=======
>>>>>>> 0c57e4e (Fix)
=======
=======
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> 8288136d (Fix)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> b28889f (Fix)
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
>>>>>>> 0e864a5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> cc390719 (Manifest_cache true)
=======
=======
>>>>>>> 0c57e4e (Fix)
>>>>>>> 8887ba5b (Fix)
              describe '#full_name' do
          
        169. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 255dd8d (Manifest_cache true)
=======
>>>>>>> 42e9c2e (Manifest_cache true)
=======
>>>>>>> c0159bf (Manifest_cache true)
=======
>>>>>>> ca274ec (Manifest_cache true)
=======
>>>>>>> 9e081dc (Fix)
=======
>>>>>>> 1cce66c (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 872e675 (Fix)
=======
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
>>>>>>> 35d17b9 (Manifest_cache true)
          
      169. 
>>>>>>> 96aecde (Manifest_cache true)
>>>>>>> d782a28 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
>>>>>>> 64dceec (Manifest_cache true)
=======
>>>>>>> 5b7749a (Fix)
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
>>>>>>> b15044a (Manifest_cache true)
          
      170. 
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0c57e4e (Fix)
=======
>>>>>>> fd310ed (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 872e675 (Fix)
=======
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 35d17b9 (Manifest_cache true)
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> add330c (Manifest_cache true)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 15bff2e (Manifest_cache true)
=======
=======
>>>>>>> b15044a (Manifest_cache true)
>>>>>>> 6c71f00 (Manifest_cache true)
=======
>>>>>>> 0b43b18 (Manifest_cache true)
          
      171. 
>>>>>>> 96aecde (Manifest_cache true)
>>>>>>> d782a28 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
          
      172. 
=======
<<<<<<< HEAD
          
      173. 
=======
          
      174. 
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> 551c6ab (Manifest_cache true)
=======
=======
          
      175. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
      176. 
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
          
      177. 
>>>>>>> 183b6c5 (Manifest_cache true)
=======
<<<<<<< HEAD
=======
=======
>>>>>>> fd310ed (Manifest_cache true)
=======
>>>>>>> 42e9c2e (Manifest_cache true)
=======
>>>>>>> 1cce66c (Manifest_cache true)
=======
          
      178. 
>>>>>>> 183b6c5 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 6da9530 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> c0159bf (Manifest_cache true)
          
      179. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
          
      180. 
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
          
      181. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
          
      182. 
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
          
      183. 
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
          
      184. 
            
            

            

                [
          
        185. 
        
        
      
        
        
          
      185. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      186. 
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
=======
          
      187. 
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
      188. 
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
>>>>>>> 557c1b8 (Fix)
=======
=======
          
      189. 
>>>>>>> a5d032d (Fix)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      190. 
>>>>>>> a5d032d (Fix)
>>>>>>> e3e66f3 (Featire specs)
=======
          
      191. 
>>>>>>> 6da9530 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0c57e4e (Fix)
=======
          
      192. 
>>>>>>> a5d032d (Fix)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> e18eb87 (Fix)
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
=======
          
      193. 
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
>>>>>>> 0c57e4e (Fix)
            2
            

            

                it { expect(decorated_object.full_name).to eq("#{author.first_name} #{author.last_name}") }
          
        194. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0c57e4e (Fix)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 0c57e4e (Fix)
          
      194. 
>>>>>>> c033601 (Rebased)
=======
          
      195. 
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      196. 
>>>>>>> c033601 (Rebased)
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> c8da2e3 (Fix)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 551c6ab (Manifest_cache true)
=======
=======
          
      197. 
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a304bcf (Manifest_cache true)
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 255dd8d (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> 42e9c2e (Manifest_cache true)
=======
=======
          
      198. 
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      199. 
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
=======
=======
          
      200. 
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 64dceec (Manifest_cache true)
=======
=======
          
      201. 
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
>>>>>>> 5b7749a (Fix)
=======
          
      202. 
>>>>>>> c033601 (Rebased)
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> 551c6ab (Manifest_cache true)
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
>>>>>>> fd310ed (Manifest_cache true)
=======
>>>>>>> 42e9c2e (Manifest_cache true)
=======
=======
          
      203. 
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> c0159bf (Manifest_cache true)
=======
=======
=======
          
      204. 
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
>>>>>>> ca274ec (Manifest_cache true)
=======
=======
          
      205. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 9e081dc (Fix)
=======
=======
>>>>>>> 0b43b18 (Manifest_cache true)
>>>>>>> 1cce66c (Manifest_cache true)
            
            

            

              end
          
        206. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> a304bcf (Manifest_cache true)
=======
>>>>>>> 255dd8d (Manifest_cache true)
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> 0c57e4e (Fix)
=======
>>>>>>> 551c6ab (Manifest_cache true)
=======
>>>>>>> fd310ed (Manifest_cache true)
=======
>>>>>>> 42e9c2e (Manifest_cache true)
=======
>>>>>>> c0159bf (Manifest_cache true)
=======
>>>>>>> ca274ec (Manifest_cache true)
=======
>>>>>>> 9e081dc (Fix)
=======
>>>>>>> 1cce66c (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
>>>>>>> 64dceec (Manifest_cache true)
=======
>>>>>>> 5b7749a (Fix)
=======
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
=======
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
=======
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 64dceec (Manifest_cache true)
=======
=======
>>>>>>> 551c6ab (Manifest_cache true)
=======
>>>>>>> fd310ed (Manifest_cache true)
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
>>>>>>> 42e9c2e (Manifest_cache true)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
>>>>>>> c0159bf (Manifest_cache true)
=======
=======
>>>>>>> b15044a (Manifest_cache true)
>>>>>>> ca274ec (Manifest_cache true)
=======
=======
>>>>>>> 0b43b18 (Manifest_cache true)
>>>>>>> 1cce66c (Manifest_cache true)
          
      206. 
=======
>>>>>>> 7375d4b (Manifest_cache true)
=======
=======
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd310ed (Manifest_cache true)
=======
>>>>>>> 1cce66c (Manifest_cache true)
>>>>>>> 96aecde (Manifest_cache true)
=======
=======
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 2722d07 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 2722d07 (Manifest_cache true)
=======
=======
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 5b6aeb7 (Manifest_cache true)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
=======
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
=======
=======
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 64dceec (Manifest_cache true)
=======
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> 96aecde (Manifest_cache true)
>>>>>>> 551c6ab (Manifest_cache true)
=======
>>>>>>> 2722d07 (Manifest_cache true)
>>>>>>> fd310ed (Manifest_cache true)
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
=======
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 42e9c2e (Manifest_cache true)
=======
=======
=======
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> c0159bf (Manifest_cache true)
=======
=======
=======
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
>>>>>>> ca274ec (Manifest_cache true)
=======
=======
=======
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 0b43b18 (Manifest_cache true)
>>>>>>> 1cce66c (Manifest_cache true)
          
      207. 
>>>>>>> c59d1a99 (Manifest_cache true)
            3
            

            

              let(:book) { FactoryBot.create(:book, authors: authors, categories: categories) }
          
        208. 
        
        
      
        
        
<<<<<<< HEAD
          
      208. 
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
      209. 
>>>>>>> 7c4ea7f (Fix)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 6da9530 (Featire specs)
=======
=======
>>>>>>> bd8bda4 (Manifest_cache true)
=======
>>>>>>> aa7b40c (Manifest_cache true)
=======
>>>>>>> 183b6c5 (Manifest_cache true)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
          
      210. 
<<<<<<< HEAD
=======
>>>>>>> 02a399d (Manifest_cache true)
=======
          
      211. 
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> bd30d038 (Manifest_cache true)
=======
=======
=======
          
      212. 
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d4235040 (Manifest_cache true)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 2722d07 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      213. 
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
=======
          
      214. 
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4367ccb1 (Manifest_cache true)
=======
=======
=======
=======
          
      215. 
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 64dceec (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4fac471d (Manifest_cache true)
=======
=======
=======
          
      216. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
>>>>>>> ef483b6d (Fix)
=======
=======
          
      217. 
>>>>>>> 6da9530 (Featire specs)
>>>>>>> 0f8241bb (Featire specs)
            
            

            

            
          
        218. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      218. 
=======
=======
>>>>>>> ef483b6d (Fix)
=======
>>>>>>> 0f8241bb (Featire specs)
<<<<<<< HEAD
          
      219. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
>>>>>>> 64dceec (Manifest_cache true)
          
      220. 
=======
          
      221. 
>>>>>>> 02a399d (Manifest_cache true)
=======
          
      222. 
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> bd30d038 (Manifest_cache true)
=======
=======
=======
          
      223. 
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d4235040 (Manifest_cache true)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 2722d07 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      224. 
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
=======
          
      225. 
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4367ccb1 (Manifest_cache true)
=======
=======
=======
=======
          
      226. 
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 64dceec (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4fac471d (Manifest_cache true)
=======
=======
=======
          
      227. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
>>>>>>> ef483b6d (Fix)
=======
=======
          
      228. 
>>>>>>> 6da9530 (Featire specs)
>>>>>>> 0f8241bb (Featire specs)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
=======
>>>>>>> b15044a (Manifest_cache true)
>>>>>>> 64dceec (Manifest_cache true)
<<<<<<< HEAD
=======
<<<<<<< HEAD
              describe '#categories_names' do
>>>>>>> 96aecde (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> bd30d038 (Manifest_cache true)
=======
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
              it '#authors_names' do
=======
<<<<<<< HEAD
              context 'when decorate' do
=======
              it '#authors_names' do
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6da9530 (Featire specs)
=======
=======
              it '#authors_names' do
>>>>>>> bd8bda4 (Manifest_cache true)
=======
              it '#authors_names' do
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 0f8241bb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 5b7749a (Fix)
              describe '#full_name' do
=======
              it '#authors_names' do
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d4235040 (Manifest_cache true)
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
>>>>>>> 6da9530 (Featire specs)
>>>>>>> 0f8241bb (Featire specs)
              it '#authors_names' do
>>>>>>> 183b6c5 (Manifest_cache true)
=======
              context 'when decorate' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
=======
              it '#authors_names' do
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> bd30d038 (Manifest_cache true)
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d4235040 (Manifest_cache true)
=======
=======
>>>>>>> fd3f47ab (Featire specs)
<<<<<<< HEAD
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
              it '#authors_names' do
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
=======
              it '#authors_names' do
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4367ccb1 (Manifest_cache true)
=======
=======
=======
=======
              it '#authors_names' do
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 64dceec (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4fac471d (Manifest_cache true)
=======
=======
=======
              describe '#categories_names' do
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
>>>>>>> ef483b6d (Fix)
=======
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 6da9530 (Featire specs)
>>>>>>> 0f8241bb (Featire specs)
          
        229. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      229. 
=======
          
      230. 
>>>>>>> c7a726c5 (Rebased)
            2
=======
=======
>>>>>>> ef483b6d (Fix)
=======
>>>>>>> 0f8241bb (Featire specs)
<<<<<<< HEAD
          
      231. 
            1
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
>>>>>>> 64dceec (Manifest_cache true)
          
      232. 
            2
=======
          
      233. 
            1
>>>>>>> 02a399d (Manifest_cache true)
=======
          
      234. 
            1
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> bd30d038 (Manifest_cache true)
=======
=======
=======
          
      235. 
            1
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d4235040 (Manifest_cache true)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 2722d07 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      236. 
            1
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
=======
          
      237. 
            1
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4367ccb1 (Manifest_cache true)
=======
=======
=======
=======
          
      238. 
            1
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 64dceec (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4fac471d (Manifest_cache true)
=======
=======
=======
          
      239. 
            2
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
>>>>>>> ef483b6d (Fix)
=======
=======
          
      240. 
            1
>>>>>>> 6da9530 (Featire specs)
>>>>>>> 0f8241bb (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
                it { expect(decorated_object.full_name).to eq("#{author.first_name} #{author.last_name}") }
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
=======
>>>>>>> b15044a (Manifest_cache true)
>>>>>>> 64dceec (Manifest_cache true)
<<<<<<< HEAD
                it { expect(decorated_object.categories_names).to eq("#{categories.first.name}, #{categories.last.name}") }
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> 6da9530 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
                expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
=======
<<<<<<< HEAD
                it '#authors_names' do
=======
                expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
>>>>>>> ae2a012 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6da9530 (Featire specs)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
=======
                expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
>>>>>>> bd8bda4 (Manifest_cache true)
=======
                expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
                expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
>>>>>>> 183b6c5 (Manifest_cache true)
=======
                it '#authors_names' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
=======
                expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> bd30d038 (Manifest_cache true)
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d4235040 (Manifest_cache true)
=======
=======
>>>>>>> fd3f47ab (Featire specs)
<<<<<<< HEAD
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
=======
                expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4367ccb1 (Manifest_cache true)
=======
=======
=======
=======
                expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 64dceec (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4fac471d (Manifest_cache true)
=======
=======
=======
                it { expect(decorated_object.categories_names).to eq("#{categories.first.name}, #{categories.last.name}") }
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
>>>>>>> ef483b6d (Fix)
=======
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 6da9530 (Featire specs)
>>>>>>> 0f8241bb (Featire specs)
          
        241. 
        
        
      
        
        
          
      241. 
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 845dac1 (Manifest_cache true)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
          
      242. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
=======
>>>>>>> b15044a (Manifest_cache true)
>>>>>>> 64dceec (Manifest_cache true)
          
      243. 
            1
=======
          
      244. 
            
>>>>>>> fd6db03 (Manifest_cache true)
=======
          
      245. 
            
>>>>>>> 998f08d (Manifest_cache true)
=======
          
      246. 
            1
>>>>>>> 6da9530 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                  expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
=======
              end
>>>>>>> fd6db03 (Manifest_cache true)
=======
              end
>>>>>>> 998f08d (Manifest_cache true)
=======
                  expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
>>>>>>> 6da9530 (Featire specs)
          
        247. 
        
        
      
        
        
          
      247. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6da9530 (Featire specs)
                end
          
        248. 
        
        
      
        
        
          
      248. 
            
            

            

            
          
        249. 
        
        
      
        
        
          
      249. 
            1
            

            

                it '#categories_names' do
          
        250. 
        
        
      
        
        
          
      250. 
            1
            

            

                  expect(book_decorator.categories_names).to eq('Poetry, Novel')
          
        251. 
        
        
      
        
        
          
      251. 
            
            

            

                end
          
        252. 
        
        
      
        
        
          
      252. 
=======
          
      253. 
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
          
      254. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
      255. 
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
          
      256. 
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      257. 
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
            
=======
          
      258. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6da9530 (Featire specs)
            

            

                  expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
          
        259. 
        
        
      
        
        
<<<<<<< HEAD
=======
<<<<<<< HEAD
          
      259. 
=======
>>>>>>> 7375d4b (Manifest_cache true)
          
      260. 
            
            

            

                end
          
        261. 
        
        
      
        
        
          
      261. 
            
            

            

            
          
        262. 
        
        
      
        
        
          
      262. 
            1
            

            

                it '#categories_names' do
          
        263. 
        
        
      
        
        
          
      263. 
            1
            

            

                  expect(book_decorator.categories_names).to eq('Poetry, Novel')
          
        264. 
        
        
      
        
        
          
      264. 
            
            

            

                end
          
        265. 
        
        
      
        
        
          
      265. 
>>>>>>> bd30d038 (Manifest_cache true)
            
            

            

              end
          
        266. 
        
        
      
        
        
<<<<<<< HEAD
=======
<<<<<<< HEAD
          
      266. 
<<<<<<< HEAD
=======
>>>>>>> 551c6ab (Manifest_cache true)
=======
>>>>>>> fd310ed (Manifest_cache true)
=======
>>>>>>> 42e9c2e (Manifest_cache true)
=======
>>>>>>> c0159bf (Manifest_cache true)
=======
>>>>>>> ca274ec (Manifest_cache true)
=======
=======
>>>>>>> 0b43b18 (Manifest_cache true)
>>>>>>> 1cce66c (Manifest_cache true)
=======
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> bd8bda4 (Manifest_cache true)
=======
>>>>>>> aa7b40c (Manifest_cache true)
=======
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
      267. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bb5c652 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
          
      268. 
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9a49b7b (Rebased)
=======
=======
=======
          
      269. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
=======
          
      270. 
>>>>>>> a5d032d (Fix)
>>>>>>> 160fb15 (Fix)
<<<<<<< HEAD
>>>>>>> 31d15e66 (Fix)
=======
=======
=======
          
      271. 
<<<<<<< HEAD
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      272. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      273. 
>>>>>>> a5d032d (Fix)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> fdab719f (Fix)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
      274. 
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> 8288136d (Fix)
=======
=======
=======
          
      275. 
>>>>>>> a5d032d (Fix)
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
=======
          
      276. 
>>>>>>> a5d032d (Fix)
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
          
      277. 
>>>>>>> c033601 (Rebased)
>>>>>>> 6da9530 (Featire specs)
>>>>>>> 0f8241bb (Featire specs)
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
                  FactoryBot.create(:author, first_name: 'Stas', last_name: 'Todorchuk')
          
        278. 
        
        
      
        
        
          
      278. 
            
            

            

                ]
          
        279. 
        
        
      
        
        
          
      279. 
            
            

            

              end
          
        280. 
        
        
      
        
        
          
      280. 
            1
            

            

              let(:categories) do
          
        281. 
        
        
      
        
        
          
      281. 
            
            

            

                [
          
        282. 
        
        
      
        
        
          
      282. 
            2
            

            

                  FactoryBot.create(:category, name: 'Poetry'),
          
        283. 
        
        
      
        
        
          
      283. 
            
            

            

                  FactoryBot.create(:category, name: 'Novel')
          
        284. 
        
        
      
        
        
          
      284. 
            
            

            

                ]
          
        285. 
        
        
      
        
        
          
      285. 
            
            

            

              end
          
        286. 
        
        
      
        
        
=======
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
          
      286. 
<<<<<<< HEAD
=======
>>>>>>> 02a399d (Manifest_cache true)
=======
          
      287. 
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96aecde (Manifest_cache true)
=======
=======
          
      288. 
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2722d07 (Manifest_cache true)
=======
=======
          
      289. 
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
=======
          
      290. 
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2c640cf (Manifest_cache true)
=======
=======
          
      291. 
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
=======
          
      292. 
>>>>>>> 7c4ea7f (Fix)
=======
=======
          
      293. 
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 0b43b18 (Manifest_cache true)
            
            

            

            
          
        294. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      294. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0b43b18 (Manifest_cache true)
<<<<<<< HEAD
          
      295. 
=======
          
      296. 
>>>>>>> 02a399d (Manifest_cache true)
=======
          
      297. 
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96aecde (Manifest_cache true)
=======
=======
          
      298. 
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2722d07 (Manifest_cache true)
=======
=======
          
      299. 
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
=======
          
      300. 
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2c640cf (Manifest_cache true)
=======
=======
          
      301. 
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
=======
          
      302. 
>>>>>>> 7c4ea7f (Fix)
=======
=======
          
      303. 
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 0b43b18 (Manifest_cache true)
            1
            

            

<<<<<<< HEAD
              context 'when decorate' do
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
=======
>>>>>>> 0b43b18 (Manifest_cache true)
              describe '#categories_names' do
>>>>>>> 96aecde (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
              it '#authors_names' do
=======
<<<<<<< HEAD
              context 'when decorate' do
=======
              it '#authors_names' do
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
              it '#authors_names' do
>>>>>>> bd8bda4 (Manifest_cache true)
=======
              it '#authors_names' do
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
              it '#authors_names' do
>>>>>>> 183b6c5 (Manifest_cache true)
=======
              context 'when decorate' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
=======
              it '#authors_names' do
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 551c6ab (Manifest_cache true)
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> fd310ed (Manifest_cache true)
=======
=======
=======
              it '#authors_names' do
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 42e9c2e (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
=======
=======
=======
              it '#authors_names' do
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> c0159bf (Manifest_cache true)
=======
=======
=======
              it '#authors_names' do
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> ca274ec (Manifest_cache true)
=======
=======
              describe '#categories_names' do
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
=======
=======
>>>>>>> 0b43b18 (Manifest_cache true)
>>>>>>> 1cce66c (Manifest_cache true)
          
        304. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      304. 
            1
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0b43b18 (Manifest_cache true)
<<<<<<< HEAD
          
      305. 
            2
=======
          
      306. 
            1
>>>>>>> 02a399d (Manifest_cache true)
=======
          
      307. 
            1
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96aecde (Manifest_cache true)
=======
=======
>>>>>>> 0b43b18 (Manifest_cache true)
=======
          
      308. 
            1
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 2722d07 (Manifest_cache true)
=======
=======
          
      309. 
            1
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
=======
          
      310. 
            1
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2c640cf (Manifest_cache true)
=======
=======
          
      311. 
            1
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
=======
          
      312. 
            2
>>>>>>> 7c4ea7f (Fix)
=======
>>>>>>> 0b43b18 (Manifest_cache true)
            

            

<<<<<<< HEAD
                it '#authors_names' do
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
=======
>>>>>>> 0b43b18 (Manifest_cache true)
                it { expect(decorated_object.categories_names).to eq("#{categories.first.name}, #{categories.last.name}") }
>>>>>>> 96aecde (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
                expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
=======
<<<<<<< HEAD
                it '#authors_names' do
=======
                expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
>>>>>>> ae2a012 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
=======
                expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
>>>>>>> bd8bda4 (Manifest_cache true)
=======
                expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
                expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
>>>>>>> 183b6c5 (Manifest_cache true)
=======
                it '#authors_names' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
=======
                expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 551c6ab (Manifest_cache true)
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> fd310ed (Manifest_cache true)
=======
=======
=======
                expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 42e9c2e (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
=======
=======
=======
                expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> c0159bf (Manifest_cache true)
=======
=======
=======
                expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> ca274ec (Manifest_cache true)
=======
=======
                it { expect(decorated_object.categories_names).to eq("#{categories.first.name}, #{categories.last.name}") }
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
=======
=======
>>>>>>> 0b43b18 (Manifest_cache true)
>>>>>>> 1cce66c (Manifest_cache true)
          
        313. 
        
        
      
        
        
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
          
      313. 
=======
<<<<<<< HEAD
=======
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 551c6ab (Manifest_cache true)
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> fd310ed (Manifest_cache true)
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 42e9c2e (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> c0159bf (Manifest_cache true)
=======
=======
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> ca274ec (Manifest_cache true)
=======
=======
>>>>>>> 0b43b18 (Manifest_cache true)
>>>>>>> 1cce66c (Manifest_cache true)
          
      314. 
            1
=======
          
      315. 
            
>>>>>>> fd6db03 (Manifest_cache true)
=======
          
      316. 
            
>>>>>>> 998f08d (Manifest_cache true)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
                  expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
=======
              end
>>>>>>> fd6db03 (Manifest_cache true)
=======
              end
>>>>>>> 998f08d (Manifest_cache true)
          
        317. 
        
        
      
        
        
          
      317. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
                end
          
        318. 
        
        
      
        
        
          
      318. 
            
            

            

            
          
        319. 
        
        
      
        
        
          
      319. 
            1
            

            

                it '#categories_names' do
          
        320. 
        
        
      
        
        
          
      320. 
            1
            

            

                  expect(book_decorator.categories_names).to eq('Poetry, Novel')
          
        321. 
        
        
      
        
        
          
      321. 
            
            

            

                end
          
        322. 
        
        
      
        
        
          
      322. 
<<<<<<< HEAD
=======
=======
          
      323. 
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
=======
          
      324. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
      325. 
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
=======
          
      326. 
>>>>>>> 183b6c5 (Manifest_cache true)
            
=======
          
      327. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
            

            

                  expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
          
        328. 
        
        
      
        
        
<<<<<<< HEAD
=======
<<<<<<< HEAD
          
      328. 
=======
>>>>>>> 7375d4b (Manifest_cache true)
          
      329. 
            
            

            

                end
          
        330. 
        
        
      
        
        
          
      330. 
            
            

            

            
          
        331. 
        
        
      
        
        
          
      331. 
            1
            

            

                it '#categories_names' do
          
        332. 
        
        
      
        
        
          
      332. 
            1
            

            

                  expect(book_decorator.categories_names).to eq('Poetry, Novel')
          
        333. 
        
        
      
        
        
          
      333. 
            
            

            

                end
          
        334. 
        
        
      
        
        
          
      334. 
<<<<<<< HEAD
>>>>>>> 551c6ab (Manifest_cache true)
=======
=======
>>>>>>> 0b43b18 (Manifest_cache true)
>>>>>>> 1cce66c (Manifest_cache true)
            
            

            

              end
          
        335. 
        
        
      
        
        
          
      335. 
            
            

            

>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
>>>>>>> 557c1b8 (Fix)
=======
=======
>>>>>>> a5d032d (Fix)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> a5d032d (Fix)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
=======
          
      336. 
<<<<<<< HEAD
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
          
      337. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      338. 
>>>>>>> a5d032d (Fix)
>>>>>>> b28889f (Fix)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
          
      339. 
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
                  FactoryBot.create(:author, first_name: 'Stas', last_name: 'Todorchuk')
          
        340. 
        
        
      
        
        
          
      340. 
            
            

            

                ]
          
        341. 
        
        
      
        
        
          
      341. 
            
            

            

              end
          
        342. 
        
        
      
        
        
          
      342. 
            1
            

            

              let(:categories) do
          
        343. 
        
        
      
        
        
          
      343. 
            
            

            

                [
          
        344. 
        
        
      
        
        
          
      344. 
            2
            

            

                  FactoryBot.create(:category, name: 'Poetry'),
          
        345. 
        
        
      
        
        
          
      345. 
            
            

            

                  FactoryBot.create(:category, name: 'Novel')
          
        346. 
        
        
      
        
        
          
      346. 
            
            

            

                ]
          
        347. 
        
        
      
        
        
          
      347. 
            
            

            

              end
          
        348. 
        
        
      
        
        
          
      348. 
            
            

            

            
          
        349. 
        
        
      
        
        
          
      349. 
            1
            

            

              context 'when decorate' do
          
        350. 
        
        
      
        
        
          
      350. 
            1
            

            

                it '#authors_names' do
          
        351. 
        
        
      
        
        
          
      351. 
            1
            

            

                  expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
          
        352. 
        
        
      
        
        
          
      352. 
            
            

            

                end
          
        353. 
        
        
      
        
        
          
      353. 
            
            

            

            
          
        354. 
        
        
      
        
        
          
      354. 
            1
            

            

                it '#categories_names' do
          
        355. 
        
        
      
        
        
          
      355. 
            1
            

            

                  expect(book_decorator.categories_names).to eq('Poetry, Novel')
          
        356. 
        
        
      
        
        
          
      356. 
            
            

            

                end
          
        357. 
        
        
      
        
        
          
      357. 
            
            

            

              end
          
        358. 
        
        
      
        
        
          
      358. 
            
            

            

>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a5d032d (Fix)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> e18eb87 (Fix)
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
>>>>>>> 0c57e4e (Fix)
            end
          
        359. 
        
        
      
    
      
  
      

      

      
<<<<<<< HEAD
        
      
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
        
      
=======
=======
>>>>>>> 9a49b7b (Rebased)
=======
>>>>>>> 98beee2 (Manifest_cache true)
=======
>>>>>>> 160fb15 (Fix)
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> bf137e4 (Manifest_cache true)
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> 0c57e4e (Fix)
=======
>>>>>>> a71befd (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> bd8bda4 (Manifest_cache true)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> aa7b40c (Manifest_cache true)
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
        
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9bfbd88 (Featire specs)
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bf137e4 (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> a71befd (Manifest_cache true)
=======
=======
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 6fa625b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> a71befd (Manifest_cache true)
=======
=======
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
>>>>>>> bf137e4 (Manifest_cache true)
        
      
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> 9a49b7b (Rebased)
=======
=======
        
      
>>>>>>> a5d032d (Fix)
>>>>>>> 160fb15 (Fix)
<<<<<<< HEAD
>>>>>>> 31d15e66 (Fix)
=======
=======
=======
        
      
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
=======
        
      
>>>>>>> a5d032d (Fix)
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> fdab719f (Fix)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 307f31f (Manifest_cache true)
>>>>>>> a71befd (Manifest_cache true)
        
      
>>>>>>> c033601 (Rebased)
=======
        
      
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
        
      
>>>>>>> c033601 (Rebased)
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
        
      
>>>>>>> a5d032d (Fix)
>>>>>>> e18eb87 (Fix)
>>>>>>> 99dad91f (Fix)
  
      
    
      spec/decorators/book_decorator_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
<<<<<<< HEAD
      15 relevant lines.
      15 lines covered and
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 557c1b8 (Fix)
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> bf137e4 (Manifest_cache true)
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> 0c57e4e (Fix)
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> a71befd (Manifest_cache true)
      15 relevant lines.
      15 lines covered and
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> e18eb87 (Fix)
      15 relevant lines.
      15 lines covered and
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
      13 relevant lines.
      13 lines covered and
=======
      12 relevant lines.
      12 lines covered and
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> a71befd (Manifest_cache true)
=======
      15 relevant lines.
      15 lines covered and
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 31d15e66 (Fix)
=======
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> 824ea7c9 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> 8887ba5b (Fix)
=======
>>>>>>> 8a3779d4 (Manifest_cache true)
=======
      15 relevant lines.
      15 lines covered and
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> b28889f (Fix)
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> fdab719f (Fix)
=======
=======
>>>>>>> b28889f (Fix)
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> 8288136d (Fix)
=======
=======
>>>>>>> b28889f (Fix)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> b28889f (Fix)
=======
>>>>>>> 872e675 (Fix)
>>>>>>> a71befd (Manifest_cache true)
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 307f31f (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> bf137e4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 824ea7c9 (Manifest_cache true)
=======
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
      15 relevant lines.
      15 lines covered and
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> b28889f (Fix)
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
>>>>>>> b28889f (Fix)
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 0c57e4e (Fix)
<<<<<<< HEAD
>>>>>>> 8887ba5b (Fix)
=======
=======
>>>>>>> a71befd (Manifest_cache true)
>>>>>>> 8a3779d4 (Manifest_cache true)
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            RSpec.describe BookDecorator do
          
        2. 
        
        
      
        
        
          
      2. 
            4
            

            

              subject(:decorated_object) { described_class.new(book) }
          
        3. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c8da2e3 (Fix)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> 659083f (Featire specs)
=======
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 0c57e4e (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0676508 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> 31d15e66 (Fix)
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0c57e4e (Fix)
=======
>>>>>>> 5e31aeb (Featire specs)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> fdab719f (Fix)
=======
=======
=======
>>>>>>> 659083f (Featire specs)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> 8288136d (Fix)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> d52f9efe (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> b28889f (Fix)
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 0c57e4e (Fix)
<<<<<<< HEAD
>>>>>>> 8887ba5b (Fix)
=======
=======
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
>>>>>>> 5e31aeb (Featire specs)
>>>>>>> 53db2224 (Featire specs)
          
      3. 
            
            

            

            
          
        4. 
        
        
      
        
        
          
      4. 
            1
            

            

<<<<<<< HEAD
              let(:book) do
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> bf137e4 (Manifest_cache true)
=======
>>>>>>> 659083f (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> 0c57e4e (Fix)
=======
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> a71befd (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
=======
=======
>>>>>>> 5e31aeb (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
=======
=======
>>>>>>> 5507b42 (Featire specs)
>>>>>>> a71befd (Manifest_cache true)
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 307f31f (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> bf137e4 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0ed7f7c (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
>>>>>>> e18eb87 (Fix)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 872e675 (Fix)
>>>>>>> 0c57e4e (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> a71befd (Manifest_cache true)
              let(:book) do
=======
              resources :books, only: %i[show index]
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> 5507b42 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 307f31f (Manifest_cache true)
=======
>>>>>>> bf137e4 (Manifest_cache true)
=======
>>>>>>> 659083f (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
=======
>>>>>>> a71befd (Manifest_cache true)
=======
=======
>>>>>>> 5507b42 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> 307f31f (Manifest_cache true)
=======
>>>>>>> a71befd (Manifest_cache true)
            RSpec.describe BookDecorator do
=======
              resources :books, only: %i[show index]
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> 0676508 (Featire specs)
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
=======
>>>>>>> e18eb87 (Fix)
              resources :books, only: %i[show index]
>>>>>>> 4e81ea2 (Featire specs)
=======
              let(:book) do
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 31d15e66 (Fix)
=======
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> 8887ba5b (Fix)
=======
>>>>>>> 53db2224 (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
=======
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 0c57e4e (Fix)
=======
>>>>>>> 5e31aeb (Featire specs)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
=======
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
=======
=======
=======
=======
>>>>>>> 9620751 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 9620751 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
            RSpec.describe BookDecorator do
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
>>>>>>> b28889f (Fix)
>>>>>>> e18eb87 (Fix)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
=======
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 0c57e4e (Fix)
=======
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5e31aeb (Featire specs)
=======
=======
=======
=======
            RSpec.describe BookDecorator do
          
        5. 
        
        
      
        
        
          
      5. 
            3
            

            

<<<<<<< HEAD
              let(:book_decorator) { described_class.new(book) }
=======
              subject(:book_decorator) { described_class.new(book) }
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 307f31f (Manifest_cache true)
>>>>>>> a71befd (Manifest_cache true)
          
        6. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0ed7f7c (Featire specs)
          
      6. 
            3
            

            

<<<<<<< HEAD
              let(:book_decorator) { described_class.new(book) }
=======
              subject(:book_decorator) { described_class.new(book) }
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
>>>>>>> bf137e4 (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> b3f2049 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
          
        7. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> 0c57e4e (Fix)
=======
=======
>>>>>>> 5507b42 (Featire specs)
>>>>>>> 5e31aeb (Featire specs)
          
      7. 
            3
            

            

<<<<<<< HEAD
              let(:book_decorator) { described_class.new(book) }
=======
              subject(:book_decorator) { described_class.new(book) }
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> b3f2049 (Featire specs)
>>>>>>> 009401d (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
          
        8. 
        
        
      
        
        
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
          
      8. 
            3
            

            

<<<<<<< HEAD
              let(:book_decorator) { described_class.new(book) }
=======
              subject(:book_decorator) { described_class.new(book) }
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
          
        9. 
        
        
      
        
        
<<<<<<< HEAD
=======
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 31d15e66 (Fix)
=======
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 8887ba5b (Fix)
=======
>>>>>>> 53db2224 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
=======
>>>>>>> a5d032d (Fix)
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> fdab719f (Fix)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> 8288136d (Fix)
=======
=======
=======
=======
>>>>>>> 9620751 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> d52f9efe (Featire specs)
=======
=======
=======
>>>>>>> 9620751 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
=======
>>>>>>> 9620751 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
>>>>>>> a5d032d (Fix)
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 0c57e4e (Fix)
<<<<<<< HEAD
>>>>>>> 8887ba5b (Fix)
=======
=======
=======
=======
>>>>>>> 9620751 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
>>>>>>> 5e31aeb (Featire specs)
>>>>>>> 53db2224 (Featire specs)
          
      9. 
            3
            

            

                create(:book, price_cents: 123, authors: authors, categories: categories,
          
        10. 
        
        
      
        
        
          
      10. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
=======
>>>>>>> c8da2e3 (Fix)
>>>>>>> fdab719f (Fix)
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 307f31f (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
=======
>>>>>>> e18eb87 (Fix)
=======
=======
>>>>>>> a71befd (Manifest_cache true)
=======
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
<<<<<<< HEAD
>>>>>>> 0c57e4e (Fix)
=======
>>>>>>> 307f31f (Manifest_cache true)
=======
>>>>>>> a71befd (Manifest_cache true)
          
      11. 
>>>>>>> ae2a012 (Manifest_cache true)
=======
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 31d15e66 (Fix)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> 824ea7c9 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> 8887ba5b (Fix)
=======
>>>>>>> 8a3779d4 (Manifest_cache true)
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> b28889f (Fix)
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> fdab719f (Fix)
=======
=======
>>>>>>> b28889f (Fix)
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> 8288136d (Fix)
=======
=======
>>>>>>> b28889f (Fix)
=======
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> b28889f (Fix)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> a71befd (Manifest_cache true)
=======
=======
          
      12. 
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
>>>>>>> bf137e4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 824ea7c9 (Manifest_cache true)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> b28889f (Fix)
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
>>>>>>> b28889f (Fix)
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 0c57e4e (Fix)
<<<<<<< HEAD
>>>>>>> 8887ba5b (Fix)
=======
=======
>>>>>>> 307f31f (Manifest_cache true)
>>>>>>> a71befd (Manifest_cache true)
>>>>>>> 8a3779d4 (Manifest_cache true)
            
            

            

<<<<<<< HEAD
                              categories_count: 0,
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a71befd (Manifest_cache true)
                              categories_count: 0,
=======
=======
<<<<<<< HEAD
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> bf137e4 (Manifest_cache true)
                              categories_count: 0,
=======
<<<<<<< HEAD
=======
                              categories_count: 0,
=======
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0c57e4e (Fix)
                              categories_count: 0,
=======
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> e9f3851 (Manifest_cache true)
=======
                              categories_count: 0,
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
                              categories_count: 0,
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
=======
=======
>>>>>>> e9f3851 (Manifest_cache true)
=======
>>>>>>> 3be4d14 (Manifest_cache true)
            
=======
                              categories_count: 0,
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 31d15e66 (Fix)
=======
=======
                              categories_count: 0,
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> d34a0770 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> 1b8f36d8 (Manifest_cache true)
=======
                              categories_count: 0,
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> b28889f (Fix)
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> fdab719f (Fix)
=======
=======
>>>>>>> b28889f (Fix)
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> 8288136d (Fix)
=======
=======
>>>>>>> b28889f (Fix)
=======
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                              categories_count: 0,
=======
=======
            
=======
                              categories_count: 0,
<<<<<<< HEAD
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> b28889f (Fix)
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 0c57e4e (Fix)
=======
>>>>>>> b28889f (Fix)
=======
>>>>>>> 872e675 (Fix)
=======
=======
=======
                              categories_count: 0,
=======
=======
            
          
        13. 
        
        
      
        
        
<<<<<<< HEAD
          
      13. 
=======
          
      14. 
>>>>>>> ae2a012 (Manifest_cache true)
            1
            

            

>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 1c3ace6 (Manifest_cache true)
              let(:authors) do
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> e9f3851 (Manifest_cache true)
>>>>>>> 3be4d14 (Manifest_cache true)
          
        15. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      15. 
=======
          
      16. 
>>>>>>> ae2a012 (Manifest_cache true)
            1
            

            

>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 1c3ace6 (Manifest_cache true)
              let(:authors) do
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
>>>>>>> b719333 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d34a0770 (Manifest_cache true)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
          
        17. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 307f31f (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 31d15e66 (Fix)
=======
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
          
      17. 
=======
          
      18. 
>>>>>>> ae2a012 (Manifest_cache true)
=======
          
      19. 
>>>>>>> 998f08d (Manifest_cache true)
            1
            

            

<<<<<<< HEAD
>>>>>>> 7375d4b (Manifest_cache true)
              let(:authors) do
>>>>>>> 02a399d (Manifest_cache true)
=======
              let(:authors) do
>>>>>>> bd8bda4 (Manifest_cache true)
=======
              let(:authors) do
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
              let(:authors) do
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
              let(:authors) do
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
              let(:authors) do
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
=======
              let(:authors) do
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> 64dceec (Manifest_cache true)
=======
>>>>>>> c59d1a99 (Manifest_cache true)
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
          
        20. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> c59d1a99 (Manifest_cache true)
=======
>>>>>>> bd8bda4 (Manifest_cache true)
=======
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 86d584a (Manifest_cache true)
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> bd8bda4 (Manifest_cache true)
=======
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
=======
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> 64dceec (Manifest_cache true)
=======
>>>>>>> 5b7749a (Fix)
=======
>>>>>>> c59d1a99 (Manifest_cache true)
=======
=======
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 31d15e66 (Fix)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> 824ea7c9 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> bf137e4 (Manifest_cache true)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> fdab719f (Fix)
=======
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e5890c2 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> 8288136d (Fix)
=======
=======
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 307f31f (Manifest_cache true)
>>>>>>> bf137e4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 824ea7c9 (Manifest_cache true)
=======
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
          
      20. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
>>>>>>> 64dceec (Manifest_cache true)
=======
>>>>>>> c59d1a99 (Manifest_cache true)
=======
>>>>>>> 31d15e66 (Fix)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
                              authors_count: 0)
=======
=======
                              authors_count: 0)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 845dac1 (Manifest_cache true)
                              authors_count: 0)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
                [
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
=======
                [
>>>>>>> bd8bda4 (Manifest_cache true)
=======
                [
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
                [
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                [
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                [
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
=======
                [
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> 64dceec (Manifest_cache true)
=======
                              authors_count: 0)
>>>>>>> 5b7749a (Fix)
=======
>>>>>>> c59d1a99 (Manifest_cache true)
=======
=======
                              authors_count: 0)
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 31d15e66 (Fix)
=======
=======
                              authors_count: 0)
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> d34a0770 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
                              authors_count: 0)
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> b719333 (Manifest_cache true)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> fdab719f (Fix)
=======
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e5890c2 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> 8288136d (Fix)
=======
=======
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> e9f3851 (Manifest_cache true)
>>>>>>> b719333 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d34a0770 (Manifest_cache true)
=======
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
          
        21. 
        
        
      
        
        
=======
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d34a0770 (Manifest_cache true)
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 31d15e66 (Fix)
=======
>>>>>>> c59d1a99 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
          
      21. 
>>>>>>> f7852d17 (Manifest_cache true)
=======
<<<<<<< HEAD
          
      22. 
>>>>>>> fdab719f (Fix)
=======
>>>>>>> 5b7749a (Fix)
          
      23. 
            
<<<<<<< HEAD
=======
          
      24. 
            2
>>>>>>> 02a399d (Manifest_cache true)
=======
          
      25. 
            2
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
      26. 
            2
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      27. 
            2
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      28. 
            2
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
=======
          
      29. 
            2
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> 64dceec (Manifest_cache true)
=======
>>>>>>> 5b7749a (Fix)
=======
>>>>>>> c59d1a99 (Manifest_cache true)
=======
=======
          
      30. 
            
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> 31d15e66 (Fix)
=======
=======
          
      31. 
<<<<<<< HEAD
<<<<<<< HEAD
            
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> b28889f (Fix)
          
      32. 
            
<<<<<<< HEAD
=======
=======
          
      33. 
            2
>>>>>>> 02a399d (Manifest_cache true)
=======
          
      34. 
            2
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
      35. 
            2
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
=======
          
      36. 
            2
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
      37. 
            2
>>>>>>> fd6db03 (Manifest_cache true)
=======
          
      38. 
            
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> fdab719f (Fix)
=======
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e5890c2 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> 8288136d (Fix)
=======
=======
=======
=======
          
      39. 
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      40. 
>>>>>>> ae2a012 (Manifest_cache true)
            
=======
          
      41. 
            2
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
>>>>>>> b719333 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d34a0770 (Manifest_cache true)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
>>>>>>> 64dceec (Manifest_cache true)
=======
>>>>>>> c59d1a99 (Manifest_cache true)
=======
>>>>>>> 31d15e66 (Fix)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
              end
=======
=======
              end
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 845dac1 (Manifest_cache true)
              end
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
                  FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk'),
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
=======
                  FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk'),
>>>>>>> bd8bda4 (Manifest_cache true)
=======
                  FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk'),
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
                  FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk'),
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                  FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk'),
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                  FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk'),
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
=======
                  FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk'),
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> 64dceec (Manifest_cache true)
=======
              end
>>>>>>> 5b7749a (Fix)
=======
              subject(:decorated_object) { described_class.new(author) }
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> c59d1a99 (Manifest_cache true)
=======
=======
              end
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 31d15e66 (Fix)
=======
=======
              end
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> d34a0770 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
              end
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> b719333 (Manifest_cache true)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> fdab719f (Fix)
=======
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e5890c2 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> 8288136d (Fix)
=======
=======
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> e9f3851 (Manifest_cache true)
>>>>>>> b719333 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d34a0770 (Manifest_cache true)
=======
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
          
        42. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
>>>>>>> 64dceec (Manifest_cache true)
=======
>>>>>>> c59d1a99 (Manifest_cache true)
=======
>>>>>>> 31d15e66 (Fix)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
          
      42. 
            1
=======
=======
          
      43. 
            1
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
          
      44. 
            1
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
          
      45. 
            
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
          
      46. 
=======
          
      47. 
>>>>>>> ae2a012 (Manifest_cache true)
            2
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
          
      48. 
            
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
      49. 
            
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      50. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      51. 
=======
          
      52. 
>>>>>>> c7a726c5 (Rebased)
            
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
=======
          
      53. 
            
<<<<<<< HEAD
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> 64dceec (Manifest_cache true)
=======
          
      54. 
            1
>>>>>>> 5b7749a (Fix)
=======
>>>>>>> c59d1a99 (Manifest_cache true)
=======
>>>>>>> fd6db03 (Manifest_cache true)
=======
          
      55. 
            1
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 31d15e66 (Fix)
=======
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> d34a0770 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
          
      56. 
            1
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> b719333 (Manifest_cache true)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> fdab719f (Fix)
=======
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e5890c2 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> 8288136d (Fix)
=======
=======
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b719333 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d34a0770 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 307f31f (Manifest_cache true)
>>>>>>> bf137e4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 824ea7c9 (Manifest_cache true)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
>>>>>>> 64dceec (Manifest_cache true)
=======
>>>>>>> c59d1a99 (Manifest_cache true)
=======
>>>>>>> 31d15e66 (Fix)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
              let(:authors) do
=======
=======
              let(:authors) do
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 845dac1 (Manifest_cache true)
              let(:authors) do
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
                  FactoryBot.create(:author, first_name: 'Stas', last_name: 'Todorchuk')
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
=======
                  FactoryBot.create(:author, first_name: 'Stas', last_name: 'Todorchuk')
>>>>>>> bd8bda4 (Manifest_cache true)
=======
                  FactoryBot.create(:author, first_name: 'Stas', last_name: 'Todorchuk')
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
                  FactoryBot.create(:author, first_name: 'Stas', last_name: 'Todorchuk')
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                  FactoryBot.create(:author, first_name: 'Stas', last_name: 'Todorchuk')
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                  FactoryBot.create(:author, first_name: 'Stas', last_name: 'Todorchuk')
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
=======
                  FactoryBot.create(:author, first_name: 'Stas', last_name: 'Todorchuk')
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> 64dceec (Manifest_cache true)
=======
              let(:authors) do
>>>>>>> 5b7749a (Fix)
=======
            
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> c59d1a99 (Manifest_cache true)
=======
=======
              let(:authors) do
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 31d15e66 (Fix)
=======
=======
              let(:authors) do
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> d34a0770 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
              let(:authors) do
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> b719333 (Manifest_cache true)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> fdab719f (Fix)
=======
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e5890c2 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> 8288136d (Fix)
=======
=======
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> e9f3851 (Manifest_cache true)
>>>>>>> b719333 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d34a0770 (Manifest_cache true)
=======
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
          
        57. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
>>>>>>> 64dceec (Manifest_cache true)
=======
>>>>>>> c59d1a99 (Manifest_cache true)
=======
>>>>>>> 31d15e66 (Fix)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
          
      57. 
=======
=======
          
      58. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
          
      59. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
          
      60. 
>>>>>>> ae2a012 (Manifest_cache true)
<<<<<<< HEAD
=======
          
      61. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
      62. 
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      63. 
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
          
      64. 
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      65. 
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
=======
          
      66. 
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> 64dceec (Manifest_cache true)
=======
          
      67. 
>>>>>>> 5b7749a (Fix)
=======
>>>>>>> c59d1a99 (Manifest_cache true)
=======
=======
          
      68. 
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 31d15e66 (Fix)
=======
=======
          
      69. 
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> 824ea7c9 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
          
      70. 
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> bf137e4 (Manifest_cache true)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> fdab719f (Fix)
=======
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e5890c2 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> 8288136d (Fix)
=======
=======
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 307f31f (Manifest_cache true)
>>>>>>> bf137e4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 824ea7c9 (Manifest_cache true)
=======
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
>>>>>>> 64dceec (Manifest_cache true)
=======
>>>>>>> 5b7749a (Fix)
=======
>>>>>>> c59d1a99 (Manifest_cache true)
=======
=======
>>>>>>> a5d032d (Fix)
>>>>>>> 31d15e66 (Fix)
=======
=======
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> d34a0770 (Manifest_cache true)
=======
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
=======
>>>>>>> b719333 (Manifest_cache true)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> fdab719f (Fix)
=======
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e5890c2 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> 8288136d (Fix)
=======
=======
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> e9f3851 (Manifest_cache true)
>>>>>>> b719333 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d34a0770 (Manifest_cache true)
=======
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
                [
          
        71. 
        
        
      
        
        
<<<<<<< HEAD
          
      71. 
            3
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 557c1b8 (Fix)
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> bf137e4 (Manifest_cache true)
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> e3e66f3 (Featire specs)
          
      72. 
            3
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
          
      73. 
            3
=======
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
          
      74. 
=======
          
      75. 
>>>>>>> ae2a012 (Manifest_cache true)
            
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
          
      76. 
            3
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 31d15e66 (Fix)
=======
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> 824ea7c9 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
          
      77. 
            3
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> b28889f (Fix)
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> fdab719f (Fix)
=======
=======
>>>>>>> b28889f (Fix)
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> 8288136d (Fix)
=======
=======
>>>>>>> b28889f (Fix)
=======
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 307f31f (Manifest_cache true)
>>>>>>> bf137e4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 824ea7c9 (Manifest_cache true)
=======
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
            

            

                  create(:author, first_name: FFaker::Name.first_name, last_name: FFaker::Name.last_name),
          
        78. 
        
        
      
        
        
<<<<<<< HEAD
          
      78. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      79. 
=======
=======
=======
>>>>>>> 557c1b8 (Fix)
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> bf137e4 (Manifest_cache true)
          
      80. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
          
      81. 
=======
>>>>>>> c8da2e3 (Fix)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
          
      82. 
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
          
      83. 
>>>>>>> ae2a012 (Manifest_cache true)
<<<<<<< HEAD
=======
          
      84. 
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 31d15e66 (Fix)
=======
=======
          
      85. 
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> 824ea7c9 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
          
      86. 
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> b28889f (Fix)
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> fdab719f (Fix)
=======
=======
>>>>>>> b28889f (Fix)
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> 8288136d (Fix)
=======
=======
>>>>>>> b28889f (Fix)
=======
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 307f31f (Manifest_cache true)
>>>>>>> bf137e4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 824ea7c9 (Manifest_cache true)
=======
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
            
            

            

                  create(:author, first_name: FFaker::Name.first_name, last_name: FFaker::Name.last_name)
          
        87. 
        
        
      
        
        
          
      87. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> e9f3851 (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 02a399d (Manifest_cache true)
=======
>>>>>>> bd8bda4 (Manifest_cache true)
=======
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
=======
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> 64dceec (Manifest_cache true)
=======
>>>>>>> 5b7749a (Fix)
=======
>>>>>>> c59d1a99 (Manifest_cache true)
=======
=======
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 31d15e66 (Fix)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> d34a0770 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> b719333 (Manifest_cache true)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> fdab719f (Fix)
=======
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e5890c2 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> 8288136d (Fix)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
>>>>>>> b719333 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d34a0770 (Manifest_cache true)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
                ]
          
        88. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
>>>>>>> 64dceec (Manifest_cache true)
=======
>>>>>>> 5b7749a (Fix)
=======
>>>>>>> c59d1a99 (Manifest_cache true)
=======
>>>>>>> 31d15e66 (Fix)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
          
      88. 
<<<<<<< HEAD
=======
=======
          
      89. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 845dac1 (Manifest_cache true)
          
      90. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
          
      91. 
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 59d75f9 (Featire specs)
=======
=======
>>>>>>> d34a0770 (Manifest_cache true)
=======
          
      92. 
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96aecde (Manifest_cache true)
=======
=======
          
      93. 
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 2722d07 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 2722d07 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      94. 
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
=======
          
      95. 
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
=======
=======
          
      96. 
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 64dceec (Manifest_cache true)
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
=======
=======
          
      97. 
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> c59d1a99 (Manifest_cache true)
=======
=======
          
      98. 
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 31d15e66 (Fix)
=======
=======
          
      99. 
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> d34a0770 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
          
      100. 
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> b719333 (Manifest_cache true)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> fdab719f (Fix)
=======
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e5890c2 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> 8288136d (Fix)
=======
=======
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> e9f3851 (Manifest_cache true)
>>>>>>> b719333 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d34a0770 (Manifest_cache true)
=======
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
            
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
            

            

                  expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
          
        101. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
=======
>>>>>>> b15044a (Manifest_cache true)
>>>>>>> 64dceec (Manifest_cache true)
<<<<<<< HEAD
=======
>>>>>>> c59d1a99 (Manifest_cache true)
=======
>>>>>>> 31d15e66 (Fix)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
          
      101. 
>>>>>>> 96aecde (Manifest_cache true)
=======
<<<<<<< HEAD
=======
=======
          
      102. 
=======
>>>>>>> fdab719f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
          
      103. 
=======
>>>>>>> c8da2e3 (Fix)
>>>>>>> fdab719f (Fix)
          
      104. 
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d34a0770 (Manifest_cache true)
=======
<<<<<<< HEAD
          
      105. 
=======
          
      106. 
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 824ea7c9 (Manifest_cache true)
=======
          
      107. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
      108. 
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
          
      109. 
>>>>>>> 183b6c5 (Manifest_cache true)
=======
<<<<<<< HEAD
          
      110. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
=======
          
      111. 
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      112. 
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      113. 
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
=======
=======
          
      114. 
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 64dceec (Manifest_cache true)
=======
=======
          
      115. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
=======
>>>>>>> c59d1a99 (Manifest_cache true)
=======
=======
          
      116. 
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 31d15e66 (Fix)
=======
=======
          
      117. 
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> d34a0770 (Manifest_cache true)
=======
          
      118. 
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> b719333 (Manifest_cache true)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> fdab719f (Fix)
=======
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e5890c2 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> 8288136d (Fix)
=======
=======
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b719333 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d34a0770 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 307f31f (Manifest_cache true)
>>>>>>> bf137e4 (Manifest_cache true)
>>>>>>> 824ea7c9 (Manifest_cache true)
            1
            

            

              let(:categories) do
          
        119. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
=======
>>>>>>> b15044a (Manifest_cache true)
>>>>>>> 64dceec (Manifest_cache true)
<<<<<<< HEAD
=======
>>>>>>> c59d1a99 (Manifest_cache true)
=======
>>>>>>> 31d15e66 (Fix)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> fdab719f (Fix)
          
      119. 
>>>>>>> 96aecde (Manifest_cache true)
=======
<<<<<<< HEAD
=======
=======
          
      120. 
=======
>>>>>>> fdab719f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
          
      121. 
=======
>>>>>>> c8da2e3 (Fix)
>>>>>>> fdab719f (Fix)
          
      122. 
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d34a0770 (Manifest_cache true)
=======
<<<<<<< HEAD
          
      123. 
=======
          
      124. 
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 824ea7c9 (Manifest_cache true)
=======
          
      125. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
      126. 
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
          
      127. 
>>>>>>> 183b6c5 (Manifest_cache true)
=======
<<<<<<< HEAD
          
      128. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
=======
          
      129. 
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      130. 
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      131. 
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
=======
=======
          
      132. 
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 64dceec (Manifest_cache true)
=======
=======
          
      133. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
=======
>>>>>>> c59d1a99 (Manifest_cache true)
=======
=======
          
      134. 
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 31d15e66 (Fix)
=======
=======
          
      135. 
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> d34a0770 (Manifest_cache true)
=======
          
      136. 
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> b719333 (Manifest_cache true)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> fdab719f (Fix)
=======
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e5890c2 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> 8288136d (Fix)
=======
=======
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b719333 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d34a0770 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 307f31f (Manifest_cache true)
>>>>>>> bf137e4 (Manifest_cache true)
>>>>>>> 824ea7c9 (Manifest_cache true)
            
            

            

                [
          
        137. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
=======
>>>>>>> b15044a (Manifest_cache true)
>>>>>>> 64dceec (Manifest_cache true)
<<<<<<< HEAD
=======
>>>>>>> c59d1a99 (Manifest_cache true)
=======
>>>>>>> 31d15e66 (Fix)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> fdab719f (Fix)
          
      137. 
            3
>>>>>>> 96aecde (Manifest_cache true)
=======
<<<<<<< HEAD
=======
=======
          
      138. 
            3
=======
>>>>>>> fdab719f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
          
      139. 
            3
=======
>>>>>>> c8da2e3 (Fix)
>>>>>>> fdab719f (Fix)
          
      140. 
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
<<<<<<< HEAD
          
      141. 
=======
          
      142. 
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
=======
          
      143. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
      144. 
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
      145. 
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
      146. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> b9cc4e9 (Manifest_cache true)
          
      147. 
>>>>>>> c033601 (Rebased)
            2
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      148. 
            1
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
=======
=======
<<<<<<< HEAD
          
      149. 
            1
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
      150. 
            1
>>>>>>> fd6db03 (Manifest_cache true)
=======
          
      151. 
            2
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
=======
>>>>>>> 5a2009f1 (Fix)
=======
>>>>>>> ae884b47 (Fix)
=======
>>>>>>> d245196f (Manifest_cache true)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
          
      152. 
>>>>>>> c033601 (Rebased)
            2
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> b28889f (Fix)
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
=======
=======
>>>>>>> b28889f (Fix)
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> ae884b47 (Fix)
=======
=======
>>>>>>> b28889f (Fix)
=======
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      153. 
            2
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a304bcf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d245196f (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> c59d1a99 (Manifest_cache true)
=======
          
      154. 
            2
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 35d17b9 (Manifest_cache true)
>>>>>>> 255dd8d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 304cd28a (Manifest_cache true)
=======
=======
<<<<<<< HEAD
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
          
      155. 
            2
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
=======
          
      156. 
            2
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e59c273d (Manifest_cache true)
=======
=======
=======
=======
          
      157. 
            2
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 64dceec (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 7afa007b (Manifest_cache true)
=======
=======
=======
          
      158. 
            3
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
>>>>>>> d9d85ca6 (Fix)
=======
>>>>>>> c59d1a99 (Manifest_cache true)
=======
=======
          
      159. 
            3
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 31d15e66 (Fix)
=======
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> d34a0770 (Manifest_cache true)
=======
          
      160. 
            3
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> b719333 (Manifest_cache true)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> fdab719f (Fix)
=======
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e5890c2 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> 8288136d (Fix)
=======
=======
=======
=======
            2
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> e9f3851 (Manifest_cache true)
>>>>>>> b719333 (Manifest_cache true)
>>>>>>> d34a0770 (Manifest_cache true)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
>>>>>>> 84809242 (Featire specs)
=======
>>>>>>> 5a2009f1 (Fix)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e59c273d (Manifest_cache true)
=======
>>>>>>> 7afa007b (Manifest_cache true)
=======
>>>>>>> d9d85ca6 (Fix)
              let(:author) { create(:author) }
=======
=======
<<<<<<< HEAD
              let(:author) { create(:author) }
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              let(:author) { create(:author) }
=======
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
=======
=======
<<<<<<< HEAD
              let(:author) { create(:author) }
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
=======
>>>>>>> b15044a (Manifest_cache true)
>>>>>>> 64dceec (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> c59d1a99 (Manifest_cache true)
=======
>>>>>>> 31d15e66 (Fix)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> fdab719f (Fix)
                  create(:category, name: FFaker::Book.genre),
>>>>>>> 2722d07 (Manifest_cache true)
=======
<<<<<<< HEAD
                  create(:category, name: FFaker::Book.genre),
>>>>>>> 96aecde (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a304bcf (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                  create(:category, name: FFaker::Book.genre),
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 845dac1 (Manifest_cache true)
                  create(:category, name: FFaker::Book.genre),
=======
>>>>>>> c8da2e3 (Fix)
                  FactoryBot.create(:category, name: 'Poetry'),
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> fdab719f (Fix)
=======
<<<<<<< HEAD
>>>>>>> d34a0770 (Manifest_cache true)
=======
>>>>>>> bd8bda4 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 183b6c5 (Manifest_cache true)
=======
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 251144b4 (Manifest_cache true)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
            RSpec.describe BookDecorator do
=======
              let(:author) { create(:author) }
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
              let(:author) { create(:author) }
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> b28889f (Fix)
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> b28889f (Fix)
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
                  FactoryBot.create(:category, name: 'Poetry'),
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c59d1a99 (Manifest_cache true)
=======
=======
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
                  FactoryBot.create(:category, name: 'Poetry'),
>>>>>>> 183b6c5 (Manifest_cache true)
=======
                  FactoryBot.create(:category, name: 'Poetry'),
>>>>>>> fd6db03 (Manifest_cache true)
=======
                  create(:category, name: FFaker::Book.genre),
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 31d15e66 (Fix)
=======
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> d34a0770 (Manifest_cache true)
=======
                  create(:category, name: FFaker::Book.genre),
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
          
        161. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      161. 
>>>>>>> 31d15e66 (Fix)
=======
          
      162. 
>>>>>>> c59d1a99 (Manifest_cache true)
=======
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
          
      163. 
            3
            

            

<<<<<<< HEAD
              subject(:book_decorator) { described_class.new(book) }
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 02a399d (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> bd8bda4 (Manifest_cache true)
=======
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 183b6c5 (Manifest_cache true)
=======
>>>>>>> fd6db03 (Manifest_cache true)
=======
              let(:book_decorator) { described_class.new(book) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
                  FactoryBot.create(:category, name: 'Poetry'),
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                  FactoryBot.create(:category, name: 'Poetry'),
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 35d17b9 (Manifest_cache true)
          
        164. 
        
        
      
        
        
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
          
      164. 
            3
            

            

<<<<<<< HEAD
              subject(:book_decorator) { described_class.new(book) }
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 02a399d (Manifest_cache true)
=======
>>>>>>> bd8bda4 (Manifest_cache true)
=======
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
=======
=======
>>>>>>> 183b6c5 (Manifest_cache true)
=======
>>>>>>> fd6db03 (Manifest_cache true)
=======
              let(:book_decorator) { described_class.new(book) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
<<<<<<< HEAD
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                  FactoryBot.create(:category, name: 'Poetry'),
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
=======
                  FactoryBot.create(:category, name: 'Poetry'),
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e59c273d (Manifest_cache true)
=======
=======
=======
=======
                  FactoryBot.create(:category, name: 'Poetry'),
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 64dceec (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 7afa007b (Manifest_cache true)
=======
=======
=======
                  create(:category, name: FFaker::Book.genre),
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
>>>>>>> d9d85ca6 (Fix)
          
        165. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
=======
>>>>>>> b15044a (Manifest_cache true)
>>>>>>> 64dceec (Manifest_cache true)
          
      165. 
>>>>>>> 96aecde (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
          
      166. 
=======
<<<<<<< HEAD
          
      167. 
=======
          
      168. 
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
          
      169. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
      170. 
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
=======
          
      171. 
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
      172. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
          
      173. 
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
          
      174. 
            3
            

            

              let(:book) { FactoryBot.create(:book, authors: authors, categories: categories) }
          
        175. 
        
        
      
        
        
          
      175. 
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      176. 
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> b719333 (Manifest_cache true)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
      177. 
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
>>>>>>> 557c1b8 (Fix)
=======
=======
          
      178. 
>>>>>>> a5d032d (Fix)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      179. 
>>>>>>> a5d032d (Fix)
>>>>>>> e3e66f3 (Featire specs)
            
            

            

            
=======
=======
          
      180. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
      181. 
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
          
      182. 
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      183. 
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      184. 
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
=======
          
      185. 
>>>>>>> 998f08d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 64dceec (Manifest_cache true)
=======
=======
          
      186. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
=======
>>>>>>> c59d1a99 (Manifest_cache true)
=======
=======
          
      187. 
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> 31d15e66 (Fix)
=======
=======
          
      188. 
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
>>>>>>> 64dceec (Manifest_cache true)
=======
>>>>>>> 5b7749a (Fix)
=======
>>>>>>> c59d1a99 (Manifest_cache true)
=======
>>>>>>> 31d15e66 (Fix)
=======
>>>>>>> 84003439 (Featire specs)
                  create(:category, name: FFaker::Book.genre)
<<<<<<< HEAD
=======
                  FactoryBot.create(:category, name: 'Novel')
>>>>>>> 02a399d (Manifest_cache true)
=======
                  FactoryBot.create(:category, name: 'Novel')
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96aecde (Manifest_cache true)
=======
=======
                  FactoryBot.create(:category, name: 'Novel')
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2722d07 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 2722d07 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
                  FactoryBot.create(:category, name: 'Novel')
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
=======
                  FactoryBot.create(:category, name: 'Novel')
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
=======
=======
                  FactoryBot.create(:category, name: 'Novel')
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 64dceec (Manifest_cache true)
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
=======
=======
                  FactoryBot.create(:category, name: 'Novel')
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> c59d1a99 (Manifest_cache true)
=======
=======
                  create(:category, name: FFaker::Book.genre)
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> 31d15e66 (Fix)
=======
=======
                  create(:category, name: FFaker::Book.genre)
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
                  create(:category, name: FFaker::Book.genre),
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> fdab719f (Fix)
=======
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e5890c2 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> 8288136d (Fix)
=======
=======
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> e9f3851 (Manifest_cache true)
>>>>>>> b719333 (Manifest_cache true)
>>>>>>> d34a0770 (Manifest_cache true)
          
        189. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
          
      189. 
=======
=======
          
      190. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      191. 
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      192. 
>>>>>>> 2722d07 (Manifest_cache true)
=======
          
      193. 
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
          
      194. 
=======
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
          
      195. 
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fdab719f (Fix)
=======
<<<<<<< HEAD
>>>>>>> d34a0770 (Manifest_cache true)
=======
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 255dd8d (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 872e675 (Fix)
=======
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
>>>>>>> 35d17b9 (Manifest_cache true)
=======
>>>>>>> c59d1a99 (Manifest_cache true)
=======
>>>>>>> 31d15e66 (Fix)
=======
>>>>>>> 84003439 (Featire specs)
          
      196. 
>>>>>>> 96aecde (Manifest_cache true)
>>>>>>> d782a28 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
>>>>>>> 64dceec (Manifest_cache true)
=======
>>>>>>> 5b7749a (Fix)
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
>>>>>>> b15044a (Manifest_cache true)
          
      197. 
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
          
      198. 
=======
<<<<<<< HEAD
          
      199. 
=======
          
      200. 
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
          
      201. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
      202. 
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
          
      203. 
>>>>>>> 183b6c5 (Manifest_cache true)
=======
<<<<<<< HEAD
          
      204. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
=======
          
      205. 
=======
<<<<<<< HEAD
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
          
      206. 
=======
          
      207. 
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
          
      208. 
>>>>>>> 824ea7c9 (Manifest_cache true)
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c59d1a99 (Manifest_cache true)
=======
          
      209. 
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      210. 
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> b719333 (Manifest_cache true)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> fdab719f (Fix)
=======
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e5890c2 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> 8288136d (Fix)
=======
=======
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b719333 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d34a0770 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 307f31f (Manifest_cache true)
>>>>>>> bf137e4 (Manifest_cache true)
>>>>>>> 824ea7c9 (Manifest_cache true)
            
=======
          
      211. 
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      212. 
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
          
      213. 
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 2c640cf (Manifest_cache true)
=======
=======
          
      214. 
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
=======
          
      215. 
>>>>>>> 7c4ea7f (Fix)
=======
=======
          
      216. 
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> 31d15e66 (Fix)
=======
=======
          
      217. 
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
            
=======
          
      218. 
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      219. 
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
            1
>>>>>>> c033601 (Rebased)
=======
          
      220. 
            1
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
            1
>>>>>>> c033601 (Rebased)
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
                  create(:category, name: FFaker::Book.genre)
=======
=======
                  create(:category, name: FFaker::Book.genre)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 845dac1 (Manifest_cache true)
                  create(:category, name: FFaker::Book.genre)
=======
>>>>>>> c8da2e3 (Fix)
                  FactoryBot.create(:category, name: 'Novel')
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> fdab719f (Fix)
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> d34a0770 (Manifest_cache true)
=======
                  FactoryBot.create(:category, name: 'Novel')
>>>>>>> bd8bda4 (Manifest_cache true)
=======
                  FactoryBot.create(:category, name: 'Novel')
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
=======
                  FactoryBot.create(:category, name: 'Novel')
>>>>>>> 183b6c5 (Manifest_cache true)
=======
                  FactoryBot.create(:category, name: 'Novel')
>>>>>>> fd6db03 (Manifest_cache true)
=======
                  create(:category, name: FFaker::Book.genre)
>>>>>>> a5d032d (Fix)
>>>>>>> 1d6a89b5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> b719333 (Manifest_cache true)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
=======
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e5890c2 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 251144b4 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> ae884b47 (Fix)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
              describe '#full_name' do
=======
=======
>>>>>>> b28889f (Fix)
>>>>>>> c8da2e3 (Fix)
>>>>>>> fdab719f (Fix)
=======
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e5890c2 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> 8288136d (Fix)
=======
=======
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> e9f3851 (Manifest_cache true)
>>>>>>> b719333 (Manifest_cache true)
>>>>>>> d34a0770 (Manifest_cache true)
          
        221. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
          
      221. 
=======
=======
          
      222. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
          
      223. 
=======
>>>>>>> c8da2e3 (Fix)
          
      224. 
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fdab719f (Fix)
=======
<<<<<<< HEAD
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 824ea7c9 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> d34a0770 (Manifest_cache true)
=======
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 255dd8d (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 872e675 (Fix)
=======
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
>>>>>>> 35d17b9 (Manifest_cache true)
=======
>>>>>>> c59d1a99 (Manifest_cache true)
=======
>>>>>>> 31d15e66 (Fix)
=======
>>>>>>> 84003439 (Featire specs)
          
      225. 
>>>>>>> 96aecde (Manifest_cache true)
>>>>>>> d782a28 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
>>>>>>> 64dceec (Manifest_cache true)
=======
>>>>>>> 5b7749a (Fix)
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
>>>>>>> b15044a (Manifest_cache true)
          
      226. 
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
          
      227. 
=======
<<<<<<< HEAD
          
      228. 
=======
          
      229. 
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
          
      230. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
      231. 
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 824ea7c9 (Manifest_cache true)
<<<<<<< HEAD
=======
=======
          
      232. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
      233. 
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
          
      234. 
>>>>>>> 183b6c5 (Manifest_cache true)
=======
<<<<<<< HEAD
          
      235. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
          
      236. 
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
          
      237. 
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
          
      238. 
>>>>>>> e3e66f3 (Featire specs)
=======
          
      239. 
            
            

            

                [
          
        240. 
        
        
      
        
        
          
      240. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      241. 
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      242. 
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> b719333 (Manifest_cache true)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
      243. 
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
>>>>>>> 557c1b8 (Fix)
=======
=======
          
      244. 
>>>>>>> a5d032d (Fix)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      245. 
>>>>>>> a5d032d (Fix)
>>>>>>> e3e66f3 (Featire specs)
=======
          
      246. 
>>>>>>> c7a726c5 (Rebased)
            2
=======
=======
>>>>>>> 1d6a89b5 (Manifest_cache true)
>>>>>>> c8da2e3 (Fix)
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e5890c2 (Manifest_cache true)
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
=======
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b719333 (Manifest_cache true)
=======
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 307f31f (Manifest_cache true)
>>>>>>> bf137e4 (Manifest_cache true)
            
>>>>>>> fdab719f (Fix)
            

            

<<<<<<< HEAD
                it { expect(decorated_object.full_name).to eq("#{author.first_name} #{author.last_name}") }
=======
              let(:author) { create(:author) }
>>>>>>> c7a726c5 (Rebased)
          
        247. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
          
      247. 
=======
=======
          
      248. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
          
      249. 
=======
>>>>>>> c8da2e3 (Fix)
          
      250. 
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fdab719f (Fix)
=======
<<<<<<< HEAD
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 824ea7c9 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> d34a0770 (Manifest_cache true)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 557c1b8 (Fix)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
          
      251. 
>>>>>>> c033601 (Rebased)
=======
          
      252. 
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      253. 
>>>>>>> c033601 (Rebased)
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> c8da2e3 (Fix)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
=======
          
      254. 
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 824ea7c9 (Manifest_cache true)
=======
          
      255. 
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a304bcf (Manifest_cache true)
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
>>>>>>> 255dd8d (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
<<<<<<< HEAD
=======
          
      256. 
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
          
      257. 
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      258. 
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
=======
=======
          
      259. 
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 64dceec (Manifest_cache true)
=======
=======
          
      260. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
=======
          
      261. 
            
            

            

            
          
        262. 
        
        
      
        
        
          
      262. 
            1
            

            

              describe '#full_name' do
          
        263. 
        
        
      
        
        
          
      263. 
            2
            

            

                it { expect(decorated_object.full_name).to eq("#{author.first_name} #{author.last_name}") }
          
        264. 
        
        
      
        
        
          
      264. 
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> c59d1a99 (Manifest_cache true)
=======
=======
          
      265. 
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 31d15e66 (Fix)
=======
=======
          
      266. 
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> d34a0770 (Manifest_cache true)
=======
          
      267. 
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> b719333 (Manifest_cache true)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> fdab719f (Fix)
=======
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e5890c2 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> 8288136d (Fix)
=======
=======
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b719333 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d34a0770 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 307f31f (Manifest_cache true)
>>>>>>> bf137e4 (Manifest_cache true)
>>>>>>> 824ea7c9 (Manifest_cache true)
            
            

            

              end
          
        268. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
=======
>>>>>>> 5a2009f1 (Fix)
=======
>>>>>>> ae884b47 (Fix)
=======
>>>>>>> d245196f (Manifest_cache true)
=======
>>>>>>> 304cd28a (Manifest_cache true)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> e59c273d (Manifest_cache true)
=======
>>>>>>> 7afa007b (Manifest_cache true)
=======
>>>>>>> d9d85ca6 (Fix)
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> a304bcf (Manifest_cache true)
=======
>>>>>>> 255dd8d (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
>>>>>>> 64dceec (Manifest_cache true)
=======
>>>>>>> 5b7749a (Fix)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
=======
>>>>>>> 7375d4b (Manifest_cache true)
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
=======
>>>>>>> b15044a (Manifest_cache true)
>>>>>>> 64dceec (Manifest_cache true)
=======
>>>>>>> c59d1a99 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 31d15e66 (Fix)
=======
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> fdab719f (Fix)
          
      268. 
=======
=======
          
      269. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
          
      270. 
=======
>>>>>>> c8da2e3 (Fix)
>>>>>>> 7375d4b (Manifest_cache true)
=======
<<<<<<< HEAD
=======
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96aecde (Manifest_cache true)
=======
=======
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 2722d07 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 2722d07 (Manifest_cache true)
=======
=======
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 5b6aeb7 (Manifest_cache true)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
=======
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
=======
=======
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
>>>>>>> 64dceec (Manifest_cache true)
=======
=======
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> c59d1a99 (Manifest_cache true)
=======
=======
<<<<<<< HEAD
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
=======
          
      271. 
=======
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d34a0770 (Manifest_cache true)
=======
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 307f31f (Manifest_cache true)
>>>>>>> 824ea7c9 (Manifest_cache true)
          
      272. 
            3
            

            

              let(:book) { FactoryBot.create(:book, authors: authors, categories: categories) }
          
        273. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> d34a0770 (Manifest_cache true)
=======
>>>>>>> 824ea7c9 (Manifest_cache true)
=======
>>>>>>> 86d584a (Manifest_cache true)
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> c59d1a99 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> e9f3851 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> d34a0770 (Manifest_cache true)
=======
>>>>>>> 307f31f (Manifest_cache true)
=======
>>>>>>> 824ea7c9 (Manifest_cache true)
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> bd8bda4 (Manifest_cache true)
=======
>>>>>>> aa7b40c (Manifest_cache true)
=======
>>>>>>> 183b6c5 (Manifest_cache true)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 824ea7c9 (Manifest_cache true)
          
      273. 
<<<<<<< HEAD
=======
>>>>>>> 02a399d (Manifest_cache true)
=======
          
      274. 
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96aecde (Manifest_cache true)
=======
=======
          
      275. 
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 2722d07 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 2722d07 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
          
      276. 
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
=======
          
      277. 
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
=======
=======
          
      278. 
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 64dceec (Manifest_cache true)
=======
=======
          
      279. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
=======
=======
          
      280. 
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> c59d1a99 (Manifest_cache true)
=======
=======
          
      281. 
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 31d15e66 (Fix)
=======
=======
          
      282. 
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> d34a0770 (Manifest_cache true)
=======
          
      283. 
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> b719333 (Manifest_cache true)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> fdab719f (Fix)
=======
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e5890c2 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> 8288136d (Fix)
=======
=======
=======
=======
          
      284. 
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> e9f3851 (Manifest_cache true)
>>>>>>> b719333 (Manifest_cache true)
>>>>>>> d34a0770 (Manifest_cache true)
            
            

            

            
          
        285. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      285. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
>>>>>>> 64dceec (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> c59d1a99 (Manifest_cache true)
=======
>>>>>>> 31d15e66 (Fix)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> fdab719f (Fix)
          
      286. 
=======
=======
          
      287. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 845dac1 (Manifest_cache true)
          
      288. 
=======
>>>>>>> c8da2e3 (Fix)
          
      289. 
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
=======
          
      290. 
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96aecde (Manifest_cache true)
=======
=======
          
      291. 
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 2722d07 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 2722d07 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
          
      292. 
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
=======
          
      293. 
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
=======
=======
          
      294. 
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 64dceec (Manifest_cache true)
=======
=======
          
      295. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
=======
=======
          
      296. 
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> c59d1a99 (Manifest_cache true)
=======
=======
          
      297. 
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 31d15e66 (Fix)
=======
=======
          
      298. 
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> d34a0770 (Manifest_cache true)
=======
          
      299. 
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> b719333 (Manifest_cache true)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> fdab719f (Fix)
=======
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e5890c2 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> 8288136d (Fix)
=======
=======
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> e9f3851 (Manifest_cache true)
>>>>>>> b719333 (Manifest_cache true)
>>>>>>> d34a0770 (Manifest_cache true)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
=======
>>>>>>> b15044a (Manifest_cache true)
>>>>>>> 64dceec (Manifest_cache true)
<<<<<<< HEAD
=======
>>>>>>> c59d1a99 (Manifest_cache true)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 31d15e66 (Fix)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> fdab719f (Fix)
              describe '#categories_names' do
>>>>>>> 96aecde (Manifest_cache true)
=======
<<<<<<< HEAD
=======
=======
              describe '#categories_names' do
=======
>>>>>>> fdab719f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
              describe '#categories_names' do
=======
>>>>>>> c8da2e3 (Fix)
>>>>>>> fdab719f (Fix)
              it '#authors_names' do
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d34a0770 (Manifest_cache true)
=======
<<<<<<< HEAD
              context 'when decorate' do
=======
              it '#authors_names' do
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 824ea7c9 (Manifest_cache true)
=======
              it '#authors_names' do
>>>>>>> bd8bda4 (Manifest_cache true)
=======
              it '#authors_names' do
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
              it '#authors_names' do
>>>>>>> 183b6c5 (Manifest_cache true)
=======
              context 'when decorate' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
=======
              it '#authors_names' do
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
              it '#authors_names' do
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
=======
              it '#authors_names' do
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
=======
=======
              it '#authors_names' do
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 64dceec (Manifest_cache true)
=======
=======
              describe '#categories_names' do
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
=======
>>>>>>> c59d1a99 (Manifest_cache true)
=======
=======
              context 'when decorate' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
=======
              describe '#categories_names' do
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 31d15e66 (Fix)
=======
=======
              describe '#categories_names' do
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> d34a0770 (Manifest_cache true)
=======
              describe '#categories_names' do
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> b719333 (Manifest_cache true)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> fdab719f (Fix)
=======
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e5890c2 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> 8288136d (Fix)
=======
=======
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b719333 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d34a0770 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 307f31f (Manifest_cache true)
>>>>>>> bf137e4 (Manifest_cache true)
>>>>>>> 824ea7c9 (Manifest_cache true)
          
        300. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      300. 
            1
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
>>>>>>> 64dceec (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> c59d1a99 (Manifest_cache true)
=======
>>>>>>> 31d15e66 (Fix)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> fdab719f (Fix)
          
      301. 
            2
=======
=======
          
      302. 
            2
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 845dac1 (Manifest_cache true)
          
      303. 
            2
=======
>>>>>>> c8da2e3 (Fix)
          
      304. 
            1
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
=======
          
      305. 
            1
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96aecde (Manifest_cache true)
=======
=======
>>>>>>> c59d1a99 (Manifest_cache true)
=======
          
      306. 
            1
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 2722d07 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 2722d07 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
          
      307. 
            1
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
=======
          
      308. 
            1
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
=======
=======
          
      309. 
            1
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 64dceec (Manifest_cache true)
=======
=======
          
      310. 
            2
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
=======
>>>>>>> c59d1a99 (Manifest_cache true)
=======
=======
          
      311. 
            2
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 31d15e66 (Fix)
=======
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> d34a0770 (Manifest_cache true)
=======
          
      312. 
            2
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> b719333 (Manifest_cache true)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> fdab719f (Fix)
=======
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e5890c2 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> 8288136d (Fix)
=======
=======
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> e9f3851 (Manifest_cache true)
>>>>>>> b719333 (Manifest_cache true)
>>>>>>> d34a0770 (Manifest_cache true)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
=======
>>>>>>> b15044a (Manifest_cache true)
>>>>>>> 64dceec (Manifest_cache true)
<<<<<<< HEAD
=======
>>>>>>> c59d1a99 (Manifest_cache true)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 31d15e66 (Fix)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> fdab719f (Fix)
                it { expect(decorated_object.categories_names).to eq("#{categories.first.name}, #{categories.last.name}") }
>>>>>>> 96aecde (Manifest_cache true)
=======
<<<<<<< HEAD
=======
=======
                it { expect(decorated_object.categories_names).to eq("#{categories.first.name}, #{categories.last.name}") }
=======
>>>>>>> fdab719f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
                it { expect(decorated_object.categories_names).to eq("#{categories.first.name}, #{categories.last.name}") }
=======
>>>>>>> c8da2e3 (Fix)
>>>>>>> fdab719f (Fix)
                expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d34a0770 (Manifest_cache true)
=======
<<<<<<< HEAD
                it '#authors_names' do
=======
                expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
>>>>>>> ae2a012 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
=======
>>>>>>> 824ea7c9 (Manifest_cache true)
=======
                expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
>>>>>>> bd8bda4 (Manifest_cache true)
=======
                expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
                expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
>>>>>>> 183b6c5 (Manifest_cache true)
=======
                it '#authors_names' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
=======
                expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
=======
                expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
=======
=======
                expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 64dceec (Manifest_cache true)
=======
=======
                it { expect(decorated_object.categories_names).to eq("#{categories.first.name}, #{categories.last.name}") }
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
=======
>>>>>>> c59d1a99 (Manifest_cache true)
=======
=======
                it '#authors_names' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
=======
                it { expect(decorated_object.categories_names).to eq("#{categories.first.name}, #{categories.last.name}") }
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 31d15e66 (Fix)
=======
=======
                it { expect(decorated_object.categories_names).to eq("#{categories.first.name}, #{categories.last.name}") }
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> d34a0770 (Manifest_cache true)
=======
                it { expect(decorated_object.categories_names).to eq("#{categories.first.name}, #{categories.last.name}") }
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> b719333 (Manifest_cache true)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> fdab719f (Fix)
=======
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e5890c2 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> 8288136d (Fix)
=======
=======
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b719333 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d34a0770 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 307f31f (Manifest_cache true)
>>>>>>> bf137e4 (Manifest_cache true)
>>>>>>> 824ea7c9 (Manifest_cache true)
          
        313. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      313. 
=======
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
          
      314. 
=======
<<<<<<< HEAD
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
=======
>>>>>>> b15044a (Manifest_cache true)
>>>>>>> 64dceec (Manifest_cache true)
=======
>>>>>>> c59d1a99 (Manifest_cache true)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 31d15e66 (Fix)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> d34a0770 (Manifest_cache true)
=======
>>>>>>> 824ea7c9 (Manifest_cache true)
          
      315. 
            1
=======
          
      316. 
=======
          
      317. 
=======
          
      318. 
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 845dac1 (Manifest_cache true)
            
>>>>>>> fd6db03 (Manifest_cache true)
=======
<<<<<<< HEAD
          
      319. 
            
>>>>>>> 998f08d (Manifest_cache true)
=======
          
      320. 
            1
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 824ea7c9 (Manifest_cache true)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
                  expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
=======
              end
>>>>>>> fd6db03 (Manifest_cache true)
=======
<<<<<<< HEAD
              end
>>>>>>> 998f08d (Manifest_cache true)
=======
                  expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 824ea7c9 (Manifest_cache true)
          
        321. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
          
      321. 
=======
<<<<<<< HEAD
          
      322. 
=======
          
      323. 
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 845dac1 (Manifest_cache true)
=======
          
      324. 
>>>>>>> 1c3ace6 (Manifest_cache true)
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 824ea7c9 (Manifest_cache true)
                end
          
        325. 
        
        
      
        
        
          
      325. 
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
          
      326. 
>>>>>>> 02a399d (Manifest_cache true)
=======
<<<<<<< HEAD
=======
          
      327. 
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 31d15e66 (Fix)
=======
=======
          
      328. 
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> 824ea7c9 (Manifest_cache true)
=======
          
      329. 
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> b28889f (Fix)
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> fdab719f (Fix)
=======
=======
>>>>>>> b28889f (Fix)
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> 8288136d (Fix)
=======
=======
>>>>>>> b28889f (Fix)
=======
>>>>>>> 872e675 (Fix)
=======
=======
            
            

            

            
          
        330. 
        
        
      
        
        
          
      330. 
            1
            

            

                it '#categories_names' do
          
        331. 
        
        
      
        
        
          
      331. 
            1
            

            

                  expect(book_decorator.categories_names).to eq('Poetry, Novel')
          
        332. 
        
        
      
        
        
          
      332. 
            
            

            

                end
          
        333. 
        
        
      
        
        
          
      333. 
=======
          
      334. 
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 307f31f (Manifest_cache true)
>>>>>>> bf137e4 (Manifest_cache true)
>>>>>>> 824ea7c9 (Manifest_cache true)
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
=======
>>>>>>> 557c1b8 (Fix)
>>>>>>> 8288136d (Fix)
              end
=======
>>>>>>> c8da2e3 (Fix)
>>>>>>> fdab719f (Fix)
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 31d15e66 (Fix)
            
=======
              end
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
=======
              end
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> b28889f (Fix)
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> b28889f (Fix)
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 557c1b8 (Fix)
          
        335. 
        
        
      
        
        
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> bf137e4 (Manifest_cache true)
          
      335. 
=======
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 307f31f (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 31d15e66 (Fix)
=======
>>>>>>> 84003439 (Featire specs)
          
      336. 
            1
=======
          
      337. 
=======
          
      338. 
>>>>>>> 02a399d (Manifest_cache true)
            
>>>>>>> 1c3ace6 (Manifest_cache true)
            

            

                it '#categories_names' do
          
        339. 
        
        
      
        
        
<<<<<<< HEAD
          
      339. 
=======
          
      340. 
>>>>>>> 02a399d (Manifest_cache true)
            1
            

            

<<<<<<< HEAD
                  expect(book_decorator.categories_names).to eq('Poetry, Novel')
=======
<<<<<<< HEAD
              describe '#authors_names' do
=======
              it '#categories_names' do
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 845dac1 (Manifest_cache true)
          
        341. 
        
        
      
        
        
<<<<<<< HEAD
          
      341. 
            
            

            

                end
          
        342. 
        
        
      
        
        
          
      342. 
=======
          
      343. 
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
=======
          
      344. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
      345. 
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
          
      346. 
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      347. 
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> e3e66f3 (Featire specs)
            
=======
          
      348. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
            

            

                  expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
          
        349. 
        
        
      
        
        
<<<<<<< HEAD
=======
<<<<<<< HEAD
          
      349. 
=======
>>>>>>> 7375d4b (Manifest_cache true)
          
      350. 
            
            

            

                end
          
        351. 
        
        
      
        
        
          
      351. 
            
            

            

            
          
        352. 
        
        
      
        
        
          
      352. 
            1
            

            

                it '#categories_names' do
          
        353. 
        
        
      
        
        
          
      353. 
            1
            

            

                  expect(book_decorator.categories_names).to eq('Poetry, Novel')
          
        354. 
        
        
      
        
        
          
      354. 
            
            

            

                end
          
        355. 
        
        
      
        
        
          
      355. 
=======
>>>>>>> c59d1a99 (Manifest_cache true)
            
=======
          
      356. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
            

            

                  expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
          
        357. 
        
        
      
        
        
<<<<<<< HEAD
          
      357. 
<<<<<<< HEAD
=======
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
=======
>>>>>>> bd8bda4 (Manifest_cache true)
=======
>>>>>>> aa7b40c (Manifest_cache true)
=======
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
      358. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bb5c652 (Fix book_spec decrease quantity and price)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> 89d7dcd2 (Manifest_cache true)
          
      359. 
<<<<<<< HEAD
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9a49b7b (Rebased)
<<<<<<< HEAD
>>>>>>> 490b01d6 (Manifest_cache true)
=======
=======
=======
=======
          
      360. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
      361. 
>>>>>>> a5d032d (Fix)
>>>>>>> 160fb15 (Fix)
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
=======
=======
          
      362. 
<<<<<<< HEAD
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      363. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      364. 
>>>>>>> a5d032d (Fix)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
      365. 
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> ae884b47 (Fix)
=======
=======
=======
          
      366. 
>>>>>>> a5d032d (Fix)
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
=======
          
      367. 
>>>>>>> a5d032d (Fix)
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
                  FactoryBot.create(:author, first_name: 'Stas', last_name: 'Todorchuk')
          
        368. 
        
        
      
        
        
          
      368. 
            
            

            

                ]
          
        369. 
        
        
      
        
        
          
      369. 
            
            

            

              end
          
        370. 
        
        
      
        
        
          
      370. 
            1
            

            

              let(:categories) do
          
        371. 
        
        
      
        
        
          
      371. 
            
            

            

                [
          
        372. 
        
        
      
        
        
          
      372. 
            2
            

            

                  FactoryBot.create(:category, name: 'Poetry'),
          
        373. 
        
        
      
        
        
          
      373. 
            
            

            

                  FactoryBot.create(:category, name: 'Novel')
          
        374. 
        
        
      
        
        
          
      374. 
            
            

            

                ]
          
        375. 
        
        
      
        
        
          
      375. 
            
            

            

              end
          
        376. 
        
        
      
        
        
          
      376. 
            
            

            

            
          
        377. 
        
        
      
        
        
          
      377. 
            1
            

            

              context 'when decorate' do
          
        378. 
        
        
      
        
        
          
      378. 
            1
            

            

                it '#authors_names' do
          
        379. 
        
        
      
        
        
          
      379. 
            1
            

            

                  expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
          
        380. 
        
        
      
        
        
          
      380. 
            
            

            

                end
          
        381. 
        
        
      
        
        
          
      381. 
            
            

            

            
          
        382. 
        
        
      
        
        
          
      382. 
            1
            

            

                it '#categories_names' do
          
        383. 
        
        
      
        
        
          
      383. 
            1
            

            

                  expect(book_decorator.categories_names).to eq('Poetry, Novel')
          
        384. 
        
        
      
        
        
          
      384. 
            
            

            

                end
          
        385. 
        
        
      
        
        
          
      385. 
            
            

            

              end
          
        386. 
        
        
      
        
        
          
      386. 
            
            

            

>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
>>>>>>> 557c1b8 (Fix)
=======
=======
>>>>>>> a5d032d (Fix)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> a5d032d (Fix)
>>>>>>> e3e66f3 (Featire specs)
            end
          
        387. 
        
        
      
    
      
  
      

      

      
<<<<<<< HEAD
<<<<<<< HEAD
        
      
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
        
      
=======
=======
>>>>>>> 9a49b7b (Rebased)
=======
>>>>>>> 98beee2 (Manifest_cache true)
=======
>>>>>>> 160fb15 (Fix)
>>>>>>> 67ab5299 (Fix)
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> bf137e4 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> bd8bda4 (Manifest_cache true)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> aa7b40c (Manifest_cache true)
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
        
      
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
>>>>>>> 9bfbd88 (Featire specs)
<<<<<<< HEAD
=======
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> bf137e4 (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
=======
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 6fa625b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
>>>>>>> bf137e4 (Manifest_cache true)
        
      
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> 9a49b7b (Rebased)
=======
=======
        
      
>>>>>>> a5d032d (Fix)
>>>>>>> 160fb15 (Fix)
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
=======
=======
        
      
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
=======
        
      
>>>>>>> a5d032d (Fix)
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
        
      
>>>>>>> c033601 (Rebased)
=======
        
      
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
  
      
    
      spec/decorators/book_decorator_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
<<<<<<< HEAD
      15 relevant lines.
      15 lines covered and
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 557c1b8 (Fix)
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> bf137e4 (Manifest_cache true)
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> e3e66f3 (Featire specs)
      15 relevant lines.
      15 lines covered and
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
      15 relevant lines.
      15 lines covered and
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
      13 relevant lines.
      13 lines covered and
=======
      12 relevant lines.
      12 lines covered and
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
      15 relevant lines.
      15 lines covered and
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
=======
>>>>>>> 5a2009f1 (Fix)
=======
>>>>>>> ae884b47 (Fix)
=======
>>>>>>> 21793167 (Manifest_cache true)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
      15 relevant lines.
      15 lines covered and
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> b28889f (Fix)
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
=======
=======
>>>>>>> b28889f (Fix)
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> ae884b47 (Fix)
=======
=======
>>>>>>> b28889f (Fix)
=======
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 307f31f (Manifest_cache true)
>>>>>>> bf137e4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 21793167 (Manifest_cache true)
=======
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            RSpec.describe BookDecorator do
          
        2. 
        
        
      
        
        
          
      2. 
            4
            

            

              subject(:decorated_object) { described_class.new(book) }
          
        3. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c8da2e3 (Fix)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> 365d41ed (Featire specs)
=======
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
=======
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> ae884b47 (Fix)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376a (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
          
      3. 
            
            

            

            
          
        4. 
        
        
      
        
        
          
      4. 
            1
            

            

<<<<<<< HEAD
              let(:book) do
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> bf137e4 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
=======
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 307f31f (Manifest_cache true)
>>>>>>> bf137e4 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
              let(:book) do
=======
              resources :books, only: %i[show index]
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> 5507b42 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 307f31f (Manifest_cache true)
=======
>>>>>>> bf137e4 (Manifest_cache true)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
            RSpec.describe BookDecorator do
=======
              resources :books, only: %i[show index]
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
              resources :books, only: %i[show index]
>>>>>>> 4e81ea2 (Featire specs)
=======
              let(:book) do
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
=======
>>>>>>> 5a2009f1 (Fix)
=======
>>>>>>> ae884b47 (Fix)
=======
>>>>>>> f136376a (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
=======
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 932dbec (Featire specs)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
=======
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
=======
=======
=======
=======
>>>>>>> 9620751 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 9620751 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
            RSpec.describe BookDecorator do
          
        5. 
        
        
      
        
        
          
      5. 
            3
            

            

<<<<<<< HEAD
              let(:book_decorator) { described_class.new(book) }
=======
              subject(:book_decorator) { described_class.new(book) }
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
>>>>>>> bf137e4 (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
          
        6. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
          
      6. 
            3
            

            

<<<<<<< HEAD
              let(:book_decorator) { described_class.new(book) }
=======
              subject(:book_decorator) { described_class.new(book) }
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> b3f2049 (Featire specs)
>>>>>>> 009401d (Featire specs)
>>>>>>> d8dd3b4a (Featire specs)
          
        7. 
        
        
      
        
        
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
          
      7. 
            3
            

            

<<<<<<< HEAD
              let(:book_decorator) { described_class.new(book) }
=======
              subject(:book_decorator) { described_class.new(book) }
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
          
        8. 
        
        
      
        
        
<<<<<<< HEAD
=======
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
=======
>>>>>>> ae884b47 (Fix)
=======
>>>>>>> f136376a (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
=======
>>>>>>> a5d032d (Fix)
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> ae884b47 (Fix)
=======
=======
=======
=======
>>>>>>> 9620751 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376a (Featire specs)
=======
=======
=======
>>>>>>> 9620751 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
=======
>>>>>>> 9620751 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
          
      8. 
            3
            

            

                create(:book, price_cents: 123, authors: authors, categories: categories,
          
        9. 
        
        
      
        
        
          
      9. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
=======
>>>>>>> c8da2e3 (Fix)
>>>>>>> 5a2009f1 (Fix)
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 307f31f (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      10. 
>>>>>>> ae2a012 (Manifest_cache true)
=======
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> ae884b47 (Fix)
=======
>>>>>>> 21793167 (Manifest_cache true)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> b28889f (Fix)
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
=======
=======
>>>>>>> b28889f (Fix)
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> ae884b47 (Fix)
=======
=======
>>>>>>> b28889f (Fix)
=======
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      11. 
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
>>>>>>> bf137e4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 21793167 (Manifest_cache true)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
            
            

            

<<<<<<< HEAD
                              categories_count: 0,
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                              categories_count: 0,
=======
=======
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> bf137e4 (Manifest_cache true)
                              categories_count: 0,
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                              categories_count: 0,
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> e9f3851 (Manifest_cache true)
=======
                              categories_count: 0,
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
                              categories_count: 0,
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
            
=======
                              categories_count: 0,
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
=======
                              categories_count: 0,
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> ae884b47 (Fix)
=======
>>>>>>> 0341d6de (Manifest_cache true)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
                              categories_count: 0,
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> b28889f (Fix)
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
=======
=======
>>>>>>> b28889f (Fix)
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> ae884b47 (Fix)
=======
=======
>>>>>>> b28889f (Fix)
=======
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                              categories_count: 0,
=======
=======
            
          
        12. 
        
        
      
        
        
<<<<<<< HEAD
          
      12. 
=======
          
      13. 
>>>>>>> ae2a012 (Manifest_cache true)
            1
            

            

>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 1c3ace6 (Manifest_cache true)
              let(:authors) do
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
>>>>>>> b719333 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0341d6de (Manifest_cache true)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
          
        14. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 307f31f (Manifest_cache true)
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> 67ab5299 (Fix)
=======
>>>>>>> 84809242 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
>>>>>>> 0c57e4e (Fix)
=======
>>>>>>> a71befd (Manifest_cache true)
=======
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 307f31f (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e18eb87 (Fix)
>>>>>>> 99dad91f (Fix)
          
      14. 
=======
          
      15. 
>>>>>>> ae2a012 (Manifest_cache true)
            1
            

            

>>>>>>> 7375d4b (Manifest_cache true)
              let(:authors) do
>>>>>>> 02a399d (Manifest_cache true)
=======
              let(:authors) do
>>>>>>> bd8bda4 (Manifest_cache true)
=======
              let(:authors) do
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> 0e864a5 (Manifest_cache true)
=======
              let(:authors) do
>>>>>>> 183b6c5 (Manifest_cache true)
=======
              let(:authors) do
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 251144b4 (Manifest_cache true)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
>>>>>>> 0e864a5 (Manifest_cache true)
>>>>>>> cc390719 (Manifest_cache true)
          
        16. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 86d584a (Manifest_cache true)
>>>>>>> 251144b4 (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
>>>>>>> 0e864a5 (Manifest_cache true)
=======
>>>>>>> bd8bda4 (Manifest_cache true)
=======
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 490b01d6 (Manifest_cache true)
=======
=======
>>>>>>> 251144b4 (Manifest_cache true)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> cc390719 (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> 0e864a5 (Manifest_cache true)
=======
>>>>>>> 183b6c5 (Manifest_cache true)
=======
>>>>>>> fd6db03 (Manifest_cache true)
=======
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> ae884b47 (Fix)
=======
>>>>>>> 21793167 (Manifest_cache true)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> 8887ba5b (Fix)
=======
>>>>>>> 8a3779d4 (Manifest_cache true)
=======
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> bf137e4 (Manifest_cache true)
=======
>>>>>>> 0c57e4e (Fix)
=======
>>>>>>> a71befd (Manifest_cache true)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
=======
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5890c2 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 251144b4 (Manifest_cache true)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> ae884b47 (Fix)
=======
=======
=======
>>>>>>> a71befd (Manifest_cache true)
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 307f31f (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> bf137e4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 21793167 (Manifest_cache true)
=======
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> b28889f (Fix)
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
>>>>>>> 0e864a5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> cc390719 (Manifest_cache true)
=======
=======
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 0c57e4e (Fix)
<<<<<<< HEAD
>>>>>>> 8887ba5b (Fix)
=======
=======
>>>>>>> a71befd (Manifest_cache true)
>>>>>>> 8a3779d4 (Manifest_cache true)
          
      16. 
            
            

            

<<<<<<< HEAD
                              authors_count: 0)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                              authors_count: 0)
=======
=======
                              authors_count: 0)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 845dac1 (Manifest_cache true)
                              authors_count: 0)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
                [
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
=======
                              authors_count: 0)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 845dac1 (Manifest_cache true)
                              authors_count: 0)
=======
                [
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e18eb87 (Fix)
=======
<<<<<<< HEAD
>>>>>>> 3be4d14 (Manifest_cache true)
=======
                [
>>>>>>> bd8bda4 (Manifest_cache true)
=======
                [
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 490b01d6 (Manifest_cache true)
=======
=======
>>>>>>> 251144b4 (Manifest_cache true)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> cc390719 (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> 0e864a5 (Manifest_cache true)
=======
                [
>>>>>>> 183b6c5 (Manifest_cache true)
=======
                [
>>>>>>> fd6db03 (Manifest_cache true)
=======
                              authors_count: 0)
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
=======
                              authors_count: 0)
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> ae884b47 (Fix)
=======
>>>>>>> 0341d6de (Manifest_cache true)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> 8887ba5b (Fix)
=======
>>>>>>> 1b8f36d8 (Manifest_cache true)
=======
                              authors_count: 0)
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> b719333 (Manifest_cache true)
=======
>>>>>>> 0c57e4e (Fix)
=======
>>>>>>> 3be4d14 (Manifest_cache true)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
=======
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5890c2 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 251144b4 (Manifest_cache true)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> ae884b47 (Fix)
=======
=======
=======
>>>>>>> 3be4d14 (Manifest_cache true)
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b719333 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0341d6de (Manifest_cache true)
=======
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
                              authors_count: 0)
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> b28889f (Fix)
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
>>>>>>> 0e864a5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> cc390719 (Manifest_cache true)
=======
=======
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 0c57e4e (Fix)
<<<<<<< HEAD
>>>>>>> 8887ba5b (Fix)
=======
=======
>>>>>>> 3be4d14 (Manifest_cache true)
>>>>>>> 1b8f36d8 (Manifest_cache true)
          
        17. 
        
        
      
        
        
=======
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 7375d4b (Manifest_cache true)
=======
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
<<<<<<< HEAD
=======
=======
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
=======
>>>>>>> 0c57e4e (Fix)
=======
>>>>>>> 3be4d14 (Manifest_cache true)
=======
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 490b01d6 (Manifest_cache true)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
          
      17. 
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
          
      18. 
            
<<<<<<< HEAD
=======
=======
          
      19. 
            2
>>>>>>> 02a399d (Manifest_cache true)
=======
          
      20. 
            2
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
      21. 
            2
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 490b01d6 (Manifest_cache true)
=======
=======
>>>>>>> cc390719 (Manifest_cache true)
=======
          
      22. 
            2
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
      23. 
            2
>>>>>>> fd6db03 (Manifest_cache true)
=======
          
      24. 
            
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
=======
>>>>>>> 8887ba5b (Fix)
=======
>>>>>>> 1b8f36d8 (Manifest_cache true)
=======
          
      25. 
<<<<<<< HEAD
<<<<<<< HEAD
            
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 0c57e4e (Fix)
=======
<<<<<<< HEAD
>>>>>>> 3be4d14 (Manifest_cache true)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
          
      26. 
            
=======
>>>>>>> b28889f (Fix)
          
      27. 
            
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
=======
=======
          
      28. 
            2
>>>>>>> 02a399d (Manifest_cache true)
=======
          
      29. 
            2
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
      30. 
            2
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e18eb87 (Fix)
=======
          
      31. 
            2
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
      32. 
            2
>>>>>>> fd6db03 (Manifest_cache true)
=======
          
      33. 
            
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
=======
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5890c2 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 251144b4 (Manifest_cache true)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> ae884b47 (Fix)
=======
=======
=======
=======
          
      34. 
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      35. 
>>>>>>> ae2a012 (Manifest_cache true)
=======
=======
=======
          
      36. 
>>>>>>> 3be4d14 (Manifest_cache true)
=======
          
      37. 
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> a71befd (Manifest_cache true)
            
=======
          
      38. 
            2
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
>>>>>>> b719333 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0341d6de (Manifest_cache true)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
          
      39. 
            
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> b28889f (Fix)
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
>>>>>>> 0e864a5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> cc390719 (Manifest_cache true)
=======
=======
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 0c57e4e (Fix)
<<<<<<< HEAD
>>>>>>> 8887ba5b (Fix)
=======
=======
>>>>>>> e9f3851 (Manifest_cache true)
>>>>>>> 3be4d14 (Manifest_cache true)
>>>>>>> 1b8f36d8 (Manifest_cache true)
            

            

<<<<<<< HEAD
              end
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              end
=======
=======
              end
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 845dac1 (Manifest_cache true)
              end
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
                  FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk'),
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
=======
              end
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 845dac1 (Manifest_cache true)
              end
=======
                  FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk'),
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e18eb87 (Fix)
=======
<<<<<<< HEAD
>>>>>>> 3be4d14 (Manifest_cache true)
=======
                  FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk'),
>>>>>>> bd8bda4 (Manifest_cache true)
=======
                  FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk'),
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 490b01d6 (Manifest_cache true)
=======
=======
>>>>>>> 251144b4 (Manifest_cache true)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> cc390719 (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> 0e864a5 (Manifest_cache true)
=======
                  FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk'),
>>>>>>> 183b6c5 (Manifest_cache true)
=======
                  FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk'),
>>>>>>> fd6db03 (Manifest_cache true)
=======
              end
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
=======
              end
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> ae884b47 (Fix)
=======
>>>>>>> 0341d6de (Manifest_cache true)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> 8887ba5b (Fix)
=======
>>>>>>> 1b8f36d8 (Manifest_cache true)
=======
              end
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> b719333 (Manifest_cache true)
=======
>>>>>>> 0c57e4e (Fix)
=======
>>>>>>> 3be4d14 (Manifest_cache true)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
=======
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5890c2 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 251144b4 (Manifest_cache true)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> ae884b47 (Fix)
=======
=======
=======
>>>>>>> 3be4d14 (Manifest_cache true)
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b719333 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0341d6de (Manifest_cache true)
=======
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
              end
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> b28889f (Fix)
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
>>>>>>> 0e864a5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> cc390719 (Manifest_cache true)
=======
=======
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 0c57e4e (Fix)
<<<<<<< HEAD
>>>>>>> 8887ba5b (Fix)
=======
=======
>>>>>>> 3be4d14 (Manifest_cache true)
>>>>>>> 1b8f36d8 (Manifest_cache true)
          
        40. 
        
        
      
        
        
<<<<<<< HEAD
          
      40. 
            1
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      41. 
            1
=======
=======
          
      42. 
            1
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
          
      43. 
            1
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
          
      44. 
            
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
          
      45. 
            1
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
          
      46. 
            1
=======
          
      47. 
            
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e18eb87 (Fix)
=======
<<<<<<< HEAD
>>>>>>> 3be4d14 (Manifest_cache true)
=======
<<<<<<< HEAD
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> a71befd (Manifest_cache true)
=======
          
      48. 
=======
          
      49. 
>>>>>>> ae2a012 (Manifest_cache true)
            2
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> a71befd (Manifest_cache true)
=======
          
      50. 
            
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
      51. 
            
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 490b01d6 (Manifest_cache true)
=======
=======
>>>>>>> 251144b4 (Manifest_cache true)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> cc390719 (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> 0e864a5 (Manifest_cache true)
=======
          
      52. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
      53. 
            
>>>>>>> fd6db03 (Manifest_cache true)
=======
          
      54. 
            1
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
=======
>>>>>>> 5a2009f1 (Fix)
=======
>>>>>>> ae884b47 (Fix)
=======
>>>>>>> 0341d6de (Manifest_cache true)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> 8887ba5b (Fix)
=======
>>>>>>> 1b8f36d8 (Manifest_cache true)
=======
          
      55. 
            1
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> b719333 (Manifest_cache true)
=======
>>>>>>> 0c57e4e (Fix)
=======
>>>>>>> 3be4d14 (Manifest_cache true)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
=======
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5890c2 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 251144b4 (Manifest_cache true)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> ae884b47 (Fix)
=======
=======
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b719333 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0341d6de (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 307f31f (Manifest_cache true)
>>>>>>> bf137e4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 21793167 (Manifest_cache true)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
          
      56. 
            1
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> b28889f (Fix)
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
>>>>>>> 0e864a5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> cc390719 (Manifest_cache true)
=======
=======
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 0c57e4e (Fix)
<<<<<<< HEAD
>>>>>>> 8887ba5b (Fix)
=======
=======
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 3be4d14 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1b8f36d8 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 307f31f (Manifest_cache true)
>>>>>>> a71befd (Manifest_cache true)
>>>>>>> 8a3779d4 (Manifest_cache true)
            

            

<<<<<<< HEAD
              let(:authors) do
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              let(:authors) do
=======
=======
              let(:authors) do
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 845dac1 (Manifest_cache true)
              let(:authors) do
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
                  FactoryBot.create(:author, first_name: 'Stas', last_name: 'Todorchuk')
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
=======
              let(:authors) do
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 845dac1 (Manifest_cache true)
              let(:authors) do
=======
                  FactoryBot.create(:author, first_name: 'Stas', last_name: 'Todorchuk')
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e18eb87 (Fix)
=======
<<<<<<< HEAD
>>>>>>> 3be4d14 (Manifest_cache true)
=======
                  FactoryBot.create(:author, first_name: 'Stas', last_name: 'Todorchuk')
>>>>>>> bd8bda4 (Manifest_cache true)
=======
                  FactoryBot.create(:author, first_name: 'Stas', last_name: 'Todorchuk')
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 490b01d6 (Manifest_cache true)
=======
=======
>>>>>>> 251144b4 (Manifest_cache true)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> cc390719 (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> 0e864a5 (Manifest_cache true)
=======
                  FactoryBot.create(:author, first_name: 'Stas', last_name: 'Todorchuk')
>>>>>>> 183b6c5 (Manifest_cache true)
=======
                  FactoryBot.create(:author, first_name: 'Stas', last_name: 'Todorchuk')
>>>>>>> fd6db03 (Manifest_cache true)
=======
              let(:authors) do
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
=======
              let(:authors) do
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> ae884b47 (Fix)
=======
>>>>>>> 0341d6de (Manifest_cache true)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> 8887ba5b (Fix)
=======
>>>>>>> 1b8f36d8 (Manifest_cache true)
=======
              let(:authors) do
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> b719333 (Manifest_cache true)
=======
>>>>>>> 0c57e4e (Fix)
=======
>>>>>>> 3be4d14 (Manifest_cache true)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
=======
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5890c2 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 251144b4 (Manifest_cache true)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> ae884b47 (Fix)
=======
=======
=======
>>>>>>> 3be4d14 (Manifest_cache true)
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b719333 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0341d6de (Manifest_cache true)
=======
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
              let(:authors) do
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> b28889f (Fix)
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
>>>>>>> 0e864a5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> cc390719 (Manifest_cache true)
=======
=======
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 0c57e4e (Fix)
<<<<<<< HEAD
>>>>>>> 8887ba5b (Fix)
=======
=======
>>>>>>> 3be4d14 (Manifest_cache true)
>>>>>>> 1b8f36d8 (Manifest_cache true)
          
        57. 
        
        
      
        
        
<<<<<<< HEAD
          
      57. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      58. 
=======
=======
          
      59. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
          
      60. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
          
      61. 
>>>>>>> ae2a012 (Manifest_cache true)
<<<<<<< HEAD
=======
          
      62. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
          
      63. 
=======
          
      64. 
>>>>>>> ae2a012 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e18eb87 (Fix)
=======
<<<<<<< HEAD
>>>>>>> a71befd (Manifest_cache true)
=======
          
      65. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
      66. 
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 490b01d6 (Manifest_cache true)
=======
=======
>>>>>>> 251144b4 (Manifest_cache true)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> cc390719 (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> 0e864a5 (Manifest_cache true)
=======
          
      67. 
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
      68. 
>>>>>>> fd6db03 (Manifest_cache true)
=======
          
      69. 
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
=======
          
      70. 
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> ae884b47 (Fix)
=======
>>>>>>> 21793167 (Manifest_cache true)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> 8887ba5b (Fix)
=======
>>>>>>> 8a3779d4 (Manifest_cache true)
=======
=======
>>>>>>> 0c57e4e (Fix)
=======
>>>>>>> a71befd (Manifest_cache true)
>>>>>>> b28889f (Fix)
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 307f31f (Manifest_cache true)
            
            

            

>>>>>>> 0e864a5 (Manifest_cache true)
<<<<<<< HEAD
=======
          
      71. 
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> bf137e4 (Manifest_cache true)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
=======
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e5890c2 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 251144b4 (Manifest_cache true)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> ae884b47 (Fix)
=======
=======
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 307f31f (Manifest_cache true)
>>>>>>> bf137e4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 21793167 (Manifest_cache true)
=======
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
          
      72. 
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> b28889f (Fix)
>>>>>>> e18eb87 (Fix)
>>>>>>> 99dad91f (Fix)
            
            

            

<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
=======
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 490b01d6 (Manifest_cache true)
=======
<<<<<<< HEAD
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 0341d6de (Manifest_cache true)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> 1b8f36d8 (Manifest_cache true)
=======
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> b719333 (Manifest_cache true)
=======
>>>>>>> 3be4d14 (Manifest_cache true)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
=======
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5890c2 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 251144b4 (Manifest_cache true)
=======
=======
=======
>>>>>>> 0c57e4e (Fix)
=======
=======
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> ae884b47 (Fix)
=======
=======
=======
>>>>>>> 3be4d14 (Manifest_cache true)
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b719333 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0341d6de (Manifest_cache true)
=======
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> b28889f (Fix)
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
>>>>>>> 0e864a5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> cc390719 (Manifest_cache true)
=======
=======
>>>>>>> 0c57e4e (Fix)
<<<<<<< HEAD
>>>>>>> 8887ba5b (Fix)
=======
=======
>>>>>>> 3be4d14 (Manifest_cache true)
>>>>>>> 1b8f36d8 (Manifest_cache true)
                [
          
        73. 
        
        
      
        
        
<<<<<<< HEAD
          
      73. 
            3
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 557c1b8 (Fix)
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> bf137e4 (Manifest_cache true)
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> 0c57e4e (Fix)
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> a71befd (Manifest_cache true)
          
      74. 
            3
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> e18eb87 (Fix)
          
      75. 
            3
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
          
      76. 
=======
          
      77. 
>>>>>>> ae2a012 (Manifest_cache true)
            
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> a71befd (Manifest_cache true)
=======
          
      78. 
            3
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
=======
>>>>>>> 5a2009f1 (Fix)
=======
>>>>>>> ae884b47 (Fix)
=======
>>>>>>> 21793167 (Manifest_cache true)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> 8887ba5b (Fix)
=======
>>>>>>> 8a3779d4 (Manifest_cache true)
=======
          
      79. 
            3
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> b28889f (Fix)
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
=======
=======
>>>>>>> b28889f (Fix)
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> ae884b47 (Fix)
=======
=======
>>>>>>> b28889f (Fix)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> b28889f (Fix)
=======
>>>>>>> 872e675 (Fix)
>>>>>>> a71befd (Manifest_cache true)
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 307f31f (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> bf137e4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 21793167 (Manifest_cache true)
=======
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
          
      80. 
            3
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> b28889f (Fix)
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
>>>>>>> b28889f (Fix)
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 0c57e4e (Fix)
<<<<<<< HEAD
>>>>>>> 8887ba5b (Fix)
=======
=======
>>>>>>> a71befd (Manifest_cache true)
>>>>>>> 8a3779d4 (Manifest_cache true)
            

            

                  create(:author, first_name: FFaker::Name.first_name, last_name: FFaker::Name.last_name),
          
        81. 
        
        
      
        
        
<<<<<<< HEAD
          
      81. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      82. 
=======
=======
=======
>>>>>>> 557c1b8 (Fix)
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> bf137e4 (Manifest_cache true)
          
      83. 
=======
=======
          
      84. 
=======
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0c57e4e (Fix)
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> a71befd (Manifest_cache true)
          
      85. 
=======
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
          
      86. 
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
          
      87. 
>>>>>>> ae2a012 (Manifest_cache true)
<<<<<<< HEAD
=======
          
      88. 
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
=======
          
      89. 
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> ae884b47 (Fix)
=======
>>>>>>> 21793167 (Manifest_cache true)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
          
      90. 
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> b28889f (Fix)
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
=======
=======
>>>>>>> b28889f (Fix)
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> ae884b47 (Fix)
=======
=======
>>>>>>> b28889f (Fix)
=======
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 307f31f (Manifest_cache true)
>>>>>>> bf137e4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 21793167 (Manifest_cache true)
=======
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
          
      91. 
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
          
      92. 
>>>>>>> ae2a012 (Manifest_cache true)
<<<<<<< HEAD
=======
          
      93. 
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 0c57e4e (Fix)
<<<<<<< HEAD
>>>>>>> 8887ba5b (Fix)
=======
=======
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 307f31f (Manifest_cache true)
>>>>>>> a71befd (Manifest_cache true)
>>>>>>> 8a3779d4 (Manifest_cache true)
            
            

            

                  create(:author, first_name: FFaker::Name.first_name, last_name: FFaker::Name.last_name)
          
        94. 
        
        
      
        
        
          
      94. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 67ab5299 (Fix)
=======
>>>>>>> 84809242 (Featire specs)
=======
>>>>>>> 0341d6de (Manifest_cache true)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> 8887ba5b (Fix)
=======
>>>>>>> 1b8f36d8 (Manifest_cache true)
=======
=======
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> e9f3851 (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
=======
>>>>>>> e18eb87 (Fix)
=======
=======
>>>>>>> 3be4d14 (Manifest_cache true)
=======
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
<<<<<<< HEAD
>>>>>>> 0c57e4e (Fix)
=======
>>>>>>> e9f3851 (Manifest_cache true)
=======
>>>>>>> 3be4d14 (Manifest_cache true)
>>>>>>> 02a399d (Manifest_cache true)
=======
>>>>>>> bd8bda4 (Manifest_cache true)
=======
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 490b01d6 (Manifest_cache true)
=======
=======
>>>>>>> 251144b4 (Manifest_cache true)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> cc390719 (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> 0e864a5 (Manifest_cache true)
=======
>>>>>>> 183b6c5 (Manifest_cache true)
=======
>>>>>>> fd6db03 (Manifest_cache true)
=======
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> ae884b47 (Fix)
=======
>>>>>>> 0341d6de (Manifest_cache true)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> 8887ba5b (Fix)
=======
>>>>>>> 1b8f36d8 (Manifest_cache true)
=======
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> b719333 (Manifest_cache true)
=======
>>>>>>> 0c57e4e (Fix)
=======
>>>>>>> 3be4d14 (Manifest_cache true)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
=======
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5890c2 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 251144b4 (Manifest_cache true)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> ae884b47 (Fix)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
>>>>>>> b719333 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0341d6de (Manifest_cache true)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> b28889f (Fix)
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
>>>>>>> 0e864a5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> cc390719 (Manifest_cache true)
=======
=======
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 0c57e4e (Fix)
<<<<<<< HEAD
>>>>>>> 8887ba5b (Fix)
=======
=======
=======
=======
=======
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> e9f3851 (Manifest_cache true)
>>>>>>> 3be4d14 (Manifest_cache true)
>>>>>>> 1b8f36d8 (Manifest_cache true)
                ]
          
        95. 
        
        
      
        
        
<<<<<<< HEAD
          
      95. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      96. 
=======
=======
          
      97. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 845dac1 (Manifest_cache true)
          
      98. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
          
      99. 
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
=======
          
      100. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
      101. 
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 490b01d6 (Manifest_cache true)
=======
=======
>>>>>>> 251144b4 (Manifest_cache true)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      102. 
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
      103. 
>>>>>>> fd6db03 (Manifest_cache true)
=======
          
      104. 
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
=======
          
      105. 
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> ae884b47 (Fix)
=======
>>>>>>> 0341d6de (Manifest_cache true)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
          
      106. 
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> b719333 (Manifest_cache true)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
=======
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e5890c2 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 251144b4 (Manifest_cache true)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> ae884b47 (Fix)
=======
=======
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> e9f3851 (Manifest_cache true)
>>>>>>> b719333 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0341d6de (Manifest_cache true)
=======
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
            
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> e18eb87 (Fix)
          
      107. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 845dac1 (Manifest_cache true)
          
      108. 
=======
          
      109. 
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
=======
          
      110. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
      111. 
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
=======
          
      112. 
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
      113. 
>>>>>>> fd6db03 (Manifest_cache true)
=======
          
      114. 
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> e9f3851 (Manifest_cache true)
            
<<<<<<< HEAD
>>>>>>> 6da9530 (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
                  expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
=======
              end
>>>>>>> 6da9530 (Featire specs)
=======
                  expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
          
        115. 
        
        
      
        
        
<<<<<<< HEAD
          
      115. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      116. 
=======
=======
          
      117. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      118. 
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      119. 
>>>>>>> 2722d07 (Manifest_cache true)
=======
          
      120. 
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
          
      121. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
          
      122. 
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
          
      123. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      124. 
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
          
      125. 
>>>>>>> 2722d07 (Manifest_cache true)
=======
          
      126. 
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
          
      127. 
=======
          
      128. 
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e18eb87 (Fix)
=======
<<<<<<< HEAD
>>>>>>> 3be4d14 (Manifest_cache true)
=======
<<<<<<< HEAD
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> a71befd (Manifest_cache true)
=======
          
      129. 
=======
          
      130. 
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> a71befd (Manifest_cache true)
=======
          
      131. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
      132. 
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 490b01d6 (Manifest_cache true)
=======
=======
>>>>>>> 251144b4 (Manifest_cache true)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> cc390719 (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> 0e864a5 (Manifest_cache true)
=======
          
      133. 
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
      134. 
>>>>>>> fd6db03 (Manifest_cache true)
=======
          
      135. 
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
=======
          
      136. 
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> ae884b47 (Fix)
=======
>>>>>>> 0341d6de (Manifest_cache true)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> 8887ba5b (Fix)
=======
>>>>>>> 1b8f36d8 (Manifest_cache true)
=======
          
      137. 
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> b719333 (Manifest_cache true)
=======
>>>>>>> 0c57e4e (Fix)
=======
>>>>>>> 3be4d14 (Manifest_cache true)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
=======
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5890c2 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 251144b4 (Manifest_cache true)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> ae884b47 (Fix)
=======
=======
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b719333 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0341d6de (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 307f31f (Manifest_cache true)
>>>>>>> bf137e4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 21793167 (Manifest_cache true)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
          
      138. 
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> b28889f (Fix)
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
>>>>>>> 0e864a5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> cc390719 (Manifest_cache true)
=======
=======
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 0c57e4e (Fix)
<<<<<<< HEAD
>>>>>>> 8887ba5b (Fix)
=======
=======
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 3be4d14 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1b8f36d8 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 307f31f (Manifest_cache true)
>>>>>>> a71befd (Manifest_cache true)
>>>>>>> 8a3779d4 (Manifest_cache true)
            1
            

            

              let(:categories) do
          
        139. 
        
        
      
        
        
<<<<<<< HEAD
          
      139. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      140. 
=======
=======
          
      141. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
          
      142. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
          
      143. 
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
          
      144. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
          
      145. 
=======
          
      146. 
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e18eb87 (Fix)
=======
<<<<<<< HEAD
>>>>>>> 3be4d14 (Manifest_cache true)
=======
<<<<<<< HEAD
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> a71befd (Manifest_cache true)
=======
          
      147. 
=======
          
      148. 
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> a71befd (Manifest_cache true)
=======
          
      149. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
      150. 
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 490b01d6 (Manifest_cache true)
=======
=======
>>>>>>> 251144b4 (Manifest_cache true)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> cc390719 (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> 0e864a5 (Manifest_cache true)
=======
          
      151. 
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
      152. 
>>>>>>> fd6db03 (Manifest_cache true)
=======
          
      153. 
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
=======
          
      154. 
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> ae884b47 (Fix)
=======
>>>>>>> 0341d6de (Manifest_cache true)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> 8887ba5b (Fix)
=======
>>>>>>> 1b8f36d8 (Manifest_cache true)
=======
          
      155. 
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> b719333 (Manifest_cache true)
=======
>>>>>>> 0c57e4e (Fix)
=======
>>>>>>> 3be4d14 (Manifest_cache true)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
=======
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5890c2 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 251144b4 (Manifest_cache true)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> ae884b47 (Fix)
=======
=======
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b719333 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0341d6de (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 307f31f (Manifest_cache true)
>>>>>>> bf137e4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 21793167 (Manifest_cache true)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
          
      156. 
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> b28889f (Fix)
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
>>>>>>> 0e864a5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> cc390719 (Manifest_cache true)
=======
=======
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 0c57e4e (Fix)
<<<<<<< HEAD
>>>>>>> 8887ba5b (Fix)
=======
=======
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 3be4d14 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1b8f36d8 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 307f31f (Manifest_cache true)
>>>>>>> a71befd (Manifest_cache true)
>>>>>>> 8a3779d4 (Manifest_cache true)
            
            

            

                [
          
        157. 
        
        
      
        
        
<<<<<<< HEAD
          
      157. 
            3
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      158. 
            3
=======
=======
          
      159. 
            3
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
          
      160. 
            3
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
          
      161. 
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
          
      162. 
            3
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
          
      163. 
            3
=======
          
      164. 
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e18eb87 (Fix)
=======
<<<<<<< HEAD
>>>>>>> 3be4d14 (Manifest_cache true)
=======
<<<<<<< HEAD
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> a71befd (Manifest_cache true)
=======
          
      165. 
=======
          
      166. 
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
            2
>>>>>>> 02a399d (Manifest_cache true)
=======
          
      167. 
            2
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
      168. 
            2
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 490b01d6 (Manifest_cache true)
=======
=======
>>>>>>> 251144b4 (Manifest_cache true)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> cc390719 (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> 0e864a5 (Manifest_cache true)
=======
          
      169. 
            2
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
      170. 
            2
>>>>>>> fd6db03 (Manifest_cache true)
=======
          
      171. 
            3
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
=======
>>>>>>> 5a2009f1 (Fix)
=======
>>>>>>> ae884b47 (Fix)
=======
>>>>>>> 0341d6de (Manifest_cache true)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> 8887ba5b (Fix)
=======
>>>>>>> 1b8f36d8 (Manifest_cache true)
=======
          
      172. 
            3
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> b719333 (Manifest_cache true)
=======
>>>>>>> 0c57e4e (Fix)
=======
>>>>>>> 3be4d14 (Manifest_cache true)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
=======
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5890c2 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 251144b4 (Manifest_cache true)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> ae884b47 (Fix)
=======
=======
=======
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
            2
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
>>>>>>> b719333 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0341d6de (Manifest_cache true)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
=======
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> e9f3851 (Manifest_cache true)
>>>>>>> b719333 (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
          
      173. 
            3
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> b28889f (Fix)
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
>>>>>>> 0e864a5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> cc390719 (Manifest_cache true)
=======
=======
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 0c57e4e (Fix)
<<<<<<< HEAD
>>>>>>> 8887ba5b (Fix)
=======
=======
=======
=======
            2
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> e9f3851 (Manifest_cache true)
>>>>>>> 3be4d14 (Manifest_cache true)
>>>>>>> 1b8f36d8 (Manifest_cache true)
            

            

<<<<<<< HEAD
                  create(:category, name: FFaker::Book.genre),
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                  create(:category, name: FFaker::Book.genre),
=======
=======
                  create(:category, name: FFaker::Book.genre),
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 845dac1 (Manifest_cache true)
                  create(:category, name: FFaker::Book.genre),
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
                  FactoryBot.create(:category, name: 'Poetry'),
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
=======
                  create(:category, name: FFaker::Book.genre),
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 845dac1 (Manifest_cache true)
                  create(:category, name: FFaker::Book.genre),
=======
                  FactoryBot.create(:category, name: 'Poetry'),
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e18eb87 (Fix)
=======
<<<<<<< HEAD
>>>>>>> 3be4d14 (Manifest_cache true)
=======
                  FactoryBot.create(:category, name: 'Poetry'),
>>>>>>> bd8bda4 (Manifest_cache true)
=======
                  FactoryBot.create(:category, name: 'Poetry'),
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 490b01d6 (Manifest_cache true)
=======
=======
>>>>>>> 251144b4 (Manifest_cache true)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> cc390719 (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> 0e864a5 (Manifest_cache true)
=======
                  FactoryBot.create(:category, name: 'Poetry'),
>>>>>>> 183b6c5 (Manifest_cache true)
=======
                  FactoryBot.create(:category, name: 'Poetry'),
>>>>>>> fd6db03 (Manifest_cache true)
=======
                  create(:category, name: FFaker::Book.genre),
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
=======
                  create(:category, name: FFaker::Book.genre),
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> ae884b47 (Fix)
=======
>>>>>>> 0341d6de (Manifest_cache true)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> 8887ba5b (Fix)
=======
>>>>>>> 1b8f36d8 (Manifest_cache true)
=======
                  create(:category, name: FFaker::Book.genre),
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> b719333 (Manifest_cache true)
=======
>>>>>>> 0c57e4e (Fix)
=======
>>>>>>> 3be4d14 (Manifest_cache true)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
=======
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5890c2 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 251144b4 (Manifest_cache true)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> ae884b47 (Fix)
=======
=======
=======
>>>>>>> 3be4d14 (Manifest_cache true)
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b719333 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0341d6de (Manifest_cache true)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
                  create(:category, name: FFaker::Book.genre),
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> b28889f (Fix)
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
>>>>>>> 0e864a5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> cc390719 (Manifest_cache true)
=======
=======
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 0c57e4e (Fix)
<<<<<<< HEAD
>>>>>>> 8887ba5b (Fix)
=======
=======
>>>>>>> 3be4d14 (Manifest_cache true)
>>>>>>> 1b8f36d8 (Manifest_cache true)
          
        174. 
        
        
      
        
        
<<<<<<< HEAD
          
      174. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      175. 
=======
=======
          
      176. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
          
      177. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
          
      178. 
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
          
      179. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
          
      180. 
=======
          
      181. 
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e18eb87 (Fix)
=======
<<<<<<< HEAD
>>>>>>> 3be4d14 (Manifest_cache true)
=======
<<<<<<< HEAD
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> a71befd (Manifest_cache true)
=======
          
      182. 
=======
          
      183. 
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> a71befd (Manifest_cache true)
=======
          
      184. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
      185. 
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 490b01d6 (Manifest_cache true)
=======
=======
>>>>>>> 251144b4 (Manifest_cache true)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> cc390719 (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> 0e864a5 (Manifest_cache true)
=======
          
      186. 
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
      187. 
>>>>>>> fd6db03 (Manifest_cache true)
=======
          
      188. 
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
=======
          
      189. 
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> ae884b47 (Fix)
=======
>>>>>>> 0341d6de (Manifest_cache true)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> 8887ba5b (Fix)
=======
>>>>>>> 1b8f36d8 (Manifest_cache true)
=======
          
      190. 
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> b719333 (Manifest_cache true)
=======
>>>>>>> 0c57e4e (Fix)
=======
>>>>>>> 3be4d14 (Manifest_cache true)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
=======
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5890c2 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 251144b4 (Manifest_cache true)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> ae884b47 (Fix)
=======
=======
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b719333 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0341d6de (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 307f31f (Manifest_cache true)
>>>>>>> bf137e4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 21793167 (Manifest_cache true)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
          
      191. 
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> b28889f (Fix)
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
>>>>>>> 0e864a5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> cc390719 (Manifest_cache true)
=======
=======
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 0c57e4e (Fix)
<<<<<<< HEAD
>>>>>>> 8887ba5b (Fix)
=======
=======
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 3be4d14 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1b8f36d8 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 307f31f (Manifest_cache true)
>>>>>>> a71befd (Manifest_cache true)
>>>>>>> 8a3779d4 (Manifest_cache true)
            
            

            

<<<<<<< HEAD
                  create(:category, name: FFaker::Book.genre)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                  create(:category, name: FFaker::Book.genre)
=======
=======
                  create(:category, name: FFaker::Book.genre)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 845dac1 (Manifest_cache true)
                  create(:category, name: FFaker::Book.genre)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
                  FactoryBot.create(:category, name: 'Novel')
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
=======
                  create(:category, name: FFaker::Book.genre)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 845dac1 (Manifest_cache true)
                  create(:category, name: FFaker::Book.genre)
=======
                  FactoryBot.create(:category, name: 'Novel')
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e18eb87 (Fix)
=======
<<<<<<< HEAD
>>>>>>> 3be4d14 (Manifest_cache true)
=======
                  FactoryBot.create(:category, name: 'Novel')
>>>>>>> bd8bda4 (Manifest_cache true)
=======
                  FactoryBot.create(:category, name: 'Novel')
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 490b01d6 (Manifest_cache true)
=======
=======
>>>>>>> 251144b4 (Manifest_cache true)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> cc390719 (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> 0e864a5 (Manifest_cache true)
=======
                  FactoryBot.create(:category, name: 'Novel')
>>>>>>> 183b6c5 (Manifest_cache true)
=======
                  FactoryBot.create(:category, name: 'Novel')
>>>>>>> fd6db03 (Manifest_cache true)
=======
                  create(:category, name: FFaker::Book.genre)
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
=======
                  create(:category, name: FFaker::Book.genre)
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> ae884b47 (Fix)
=======
>>>>>>> 0341d6de (Manifest_cache true)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> 8887ba5b (Fix)
=======
>>>>>>> 1b8f36d8 (Manifest_cache true)
=======
                  create(:category, name: FFaker::Book.genre)
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> b719333 (Manifest_cache true)
=======
>>>>>>> 0c57e4e (Fix)
=======
>>>>>>> 3be4d14 (Manifest_cache true)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
=======
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5890c2 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 251144b4 (Manifest_cache true)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> ae884b47 (Fix)
=======
=======
=======
>>>>>>> 3be4d14 (Manifest_cache true)
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b719333 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0341d6de (Manifest_cache true)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
                  create(:category, name: FFaker::Book.genre)
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> b28889f (Fix)
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
>>>>>>> 0e864a5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> cc390719 (Manifest_cache true)
=======
=======
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 0c57e4e (Fix)
<<<<<<< HEAD
>>>>>>> 8887ba5b (Fix)
=======
=======
>>>>>>> 3be4d14 (Manifest_cache true)
>>>>>>> 1b8f36d8 (Manifest_cache true)
          
        192. 
        
        
      
        
        
<<<<<<< HEAD
          
      192. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      193. 
=======
=======
          
      194. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
          
      195. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
          
      196. 
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
          
      197. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
          
      198. 
=======
          
      199. 
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e18eb87 (Fix)
=======
<<<<<<< HEAD
>>>>>>> 3be4d14 (Manifest_cache true)
=======
<<<<<<< HEAD
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> a71befd (Manifest_cache true)
=======
          
      200. 
=======
          
      201. 
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> a71befd (Manifest_cache true)
=======
          
      202. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
      203. 
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 490b01d6 (Manifest_cache true)
=======
=======
>>>>>>> 251144b4 (Manifest_cache true)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> cc390719 (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> 0e864a5 (Manifest_cache true)
=======
          
      204. 
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
      205. 
>>>>>>> fd6db03 (Manifest_cache true)
=======
          
      206. 
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
=======
          
      207. 
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> ae884b47 (Fix)
=======
>>>>>>> 0341d6de (Manifest_cache true)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> 8887ba5b (Fix)
=======
>>>>>>> 1b8f36d8 (Manifest_cache true)
=======
          
      208. 
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> b719333 (Manifest_cache true)
=======
>>>>>>> 0c57e4e (Fix)
=======
>>>>>>> 3be4d14 (Manifest_cache true)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
=======
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5890c2 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 251144b4 (Manifest_cache true)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> ae884b47 (Fix)
=======
=======
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b719333 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0341d6de (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 307f31f (Manifest_cache true)
>>>>>>> bf137e4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 21793167 (Manifest_cache true)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
          
      209. 
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> b28889f (Fix)
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
>>>>>>> 0e864a5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> cc390719 (Manifest_cache true)
=======
=======
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 0c57e4e (Fix)
<<<<<<< HEAD
>>>>>>> 8887ba5b (Fix)
=======
=======
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 3be4d14 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1b8f36d8 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 307f31f (Manifest_cache true)
>>>>>>> a71befd (Manifest_cache true)
>>>>>>> 8a3779d4 (Manifest_cache true)
            
            

            

                ]
          
        210. 
        
        
      
        
        
<<<<<<< HEAD
          
      210. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      211. 
=======
=======
          
      212. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
          
      213. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
          
      214. 
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
          
      215. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
          
      216. 
=======
          
      217. 
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e18eb87 (Fix)
=======
<<<<<<< HEAD
>>>>>>> 3be4d14 (Manifest_cache true)
=======
<<<<<<< HEAD
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> a71befd (Manifest_cache true)
=======
          
      218. 
=======
          
      219. 
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> a71befd (Manifest_cache true)
=======
          
      220. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
      221. 
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 490b01d6 (Manifest_cache true)
=======
=======
>>>>>>> 251144b4 (Manifest_cache true)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> cc390719 (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> 0e864a5 (Manifest_cache true)
=======
          
      222. 
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
      223. 
>>>>>>> fd6db03 (Manifest_cache true)
=======
          
      224. 
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
=======
          
      225. 
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> ae884b47 (Fix)
=======
>>>>>>> 0341d6de (Manifest_cache true)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> 8887ba5b (Fix)
=======
>>>>>>> 1b8f36d8 (Manifest_cache true)
=======
          
      226. 
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> b719333 (Manifest_cache true)
=======
>>>>>>> 0c57e4e (Fix)
=======
>>>>>>> 3be4d14 (Manifest_cache true)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
=======
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5890c2 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 251144b4 (Manifest_cache true)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> ae884b47 (Fix)
=======
=======
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b719333 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0341d6de (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 307f31f (Manifest_cache true)
>>>>>>> bf137e4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 21793167 (Manifest_cache true)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
          
      227. 
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> b28889f (Fix)
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
>>>>>>> 0e864a5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> cc390719 (Manifest_cache true)
=======
=======
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 0c57e4e (Fix)
<<<<<<< HEAD
>>>>>>> 8887ba5b (Fix)
=======
=======
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 3be4d14 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1b8f36d8 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 307f31f (Manifest_cache true)
>>>>>>> a71befd (Manifest_cache true)
>>>>>>> 8a3779d4 (Manifest_cache true)
            
            

            

              end
          
        228. 
        
        
      
        
        
<<<<<<< HEAD
          
      228. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      229. 
=======
=======
          
      230. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 1c3ace6 (Manifest_cache true)
          
      231. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 7375d4b (Manifest_cache true)
=======
<<<<<<< HEAD
=======
          
      232. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
          
      233. 
=======
>>>>>>> 7375d4b (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> e18eb87 (Fix)
=======
<<<<<<< HEAD
>>>>>>> a71befd (Manifest_cache true)
=======
>>>>>>> bd8bda4 (Manifest_cache true)
=======
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> cc390719 (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> 0e864a5 (Manifest_cache true)
=======
>>>>>>> 183b6c5 (Manifest_cache true)
=======
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 251144b4 (Manifest_cache true)
=======
=======
          
      234. 
=======
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0341d6de (Manifest_cache true)
=======
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 307f31f (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 21793167 (Manifest_cache true)
=======
>>>>>>> 8a3779d4 (Manifest_cache true)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
          
      235. 
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0e864a5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> cc390719 (Manifest_cache true)
=======
=======
=======
          
      236. 
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> e9f3851 (Manifest_cache true)
>>>>>>> 3be4d14 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1b8f36d8 (Manifest_cache true)
=======
=======
>>>>>>> a71befd (Manifest_cache true)
>>>>>>> 8a3779d4 (Manifest_cache true)
          
      237. 
            3
            

            

              let(:book) { FactoryBot.create(:book, authors: authors, categories: categories) }
          
        238. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 3be4d14 (Manifest_cache true)
=======
>>>>>>> a71befd (Manifest_cache true)
=======
>>>>>>> 86d584a (Manifest_cache true)
>>>>>>> 251144b4 (Manifest_cache true)
=======
>>>>>>> e9f3851 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
=======
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
>>>>>>> 0e864a5 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> cc390719 (Manifest_cache true)
=======
=======
>>>>>>> 3be4d14 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1b8f36d8 (Manifest_cache true)
=======
=======
>>>>>>> 307f31f (Manifest_cache true)
=======
>>>>>>> a71befd (Manifest_cache true)
>>>>>>> 8a3779d4 (Manifest_cache true)
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a71befd (Manifest_cache true)
=======
=======
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 21793167 (Manifest_cache true)
=======
=======
>>>>>>> e18eb87 (Fix)
>>>>>>> 99dad91f (Fix)
=======
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> a71befd (Manifest_cache true)
>>>>>>> 8a3779d4 (Manifest_cache true)
          
      238. 
>>>>>>> 02a399d (Manifest_cache true)
=======
          
      239. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
      240. 
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 490b01d6 (Manifest_cache true)
=======
=======
>>>>>>> 251144b4 (Manifest_cache true)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> cc390719 (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> 0e864a5 (Manifest_cache true)
=======
          
      241. 
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
      242. 
>>>>>>> fd6db03 (Manifest_cache true)
=======
          
      243. 
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
=======
          
      244. 
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> ae884b47 (Fix)
=======
>>>>>>> 0341d6de (Manifest_cache true)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> 8887ba5b (Fix)
=======
>>>>>>> 1b8f36d8 (Manifest_cache true)
=======
          
      245. 
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> b719333 (Manifest_cache true)
=======
>>>>>>> 0c57e4e (Fix)
=======
>>>>>>> 3be4d14 (Manifest_cache true)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
=======
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5890c2 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 251144b4 (Manifest_cache true)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> ae884b47 (Fix)
=======
=======
=======
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
          
      246. 
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
>>>>>>> b719333 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0341d6de (Manifest_cache true)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
=======
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> e9f3851 (Manifest_cache true)
>>>>>>> b719333 (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
          
      247. 
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> b28889f (Fix)
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
>>>>>>> 0e864a5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> cc390719 (Manifest_cache true)
=======
=======
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 0c57e4e (Fix)
<<<<<<< HEAD
>>>>>>> 8887ba5b (Fix)
=======
=======
=======
=======
          
      248. 
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> e9f3851 (Manifest_cache true)
>>>>>>> 3be4d14 (Manifest_cache true)
>>>>>>> 1b8f36d8 (Manifest_cache true)
            
            

            

            
          
        249. 
        
        
      
        
        
<<<<<<< HEAD
          
      249. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      250. 
=======
=======
          
      251. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 845dac1 (Manifest_cache true)
          
      252. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
          
      253. 
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
=======
          
      254. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 845dac1 (Manifest_cache true)
          
      255. 
=======
          
      256. 
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e18eb87 (Fix)
=======
<<<<<<< HEAD
>>>>>>> 3be4d14 (Manifest_cache true)
=======
          
      257. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
      258. 
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 490b01d6 (Manifest_cache true)
=======
=======
>>>>>>> 251144b4 (Manifest_cache true)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> cc390719 (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> 0e864a5 (Manifest_cache true)
=======
          
      259. 
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
      260. 
>>>>>>> fd6db03 (Manifest_cache true)
=======
          
      261. 
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
=======
          
      262. 
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> ae884b47 (Fix)
=======
>>>>>>> 0341d6de (Manifest_cache true)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> 8887ba5b (Fix)
=======
>>>>>>> 1b8f36d8 (Manifest_cache true)
=======
          
      263. 
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> b719333 (Manifest_cache true)
=======
>>>>>>> 0c57e4e (Fix)
=======
>>>>>>> 3be4d14 (Manifest_cache true)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
=======
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5890c2 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 251144b4 (Manifest_cache true)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> ae884b47 (Fix)
=======
=======
=======
>>>>>>> 3be4d14 (Manifest_cache true)
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b719333 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0341d6de (Manifest_cache true)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
          
      264. 
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> b28889f (Fix)
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
>>>>>>> 0e864a5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> cc390719 (Manifest_cache true)
=======
=======
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 0c57e4e (Fix)
<<<<<<< HEAD
>>>>>>> 8887ba5b (Fix)
=======
=======
>>>>>>> 3be4d14 (Manifest_cache true)
>>>>>>> 1b8f36d8 (Manifest_cache true)
            1
            

            

<<<<<<< HEAD
              describe '#categories_names' do
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              describe '#categories_names' do
=======
=======
              describe '#categories_names' do
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
              describe '#categories_names' do
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
              it '#authors_names' do
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
              describe '#categories_names' do
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
              describe '#categories_names' do
=======
              it '#authors_names' do
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e18eb87 (Fix)
=======
<<<<<<< HEAD
>>>>>>> 3be4d14 (Manifest_cache true)
=======
<<<<<<< HEAD
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> a71befd (Manifest_cache true)
=======
              context 'when decorate' do
=======
              it '#authors_names' do
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> a71befd (Manifest_cache true)
=======
              it '#authors_names' do
>>>>>>> bd8bda4 (Manifest_cache true)
=======
              it '#authors_names' do
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 490b01d6 (Manifest_cache true)
=======
=======
>>>>>>> 251144b4 (Manifest_cache true)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> cc390719 (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> 0e864a5 (Manifest_cache true)
=======
              it '#authors_names' do
>>>>>>> 183b6c5 (Manifest_cache true)
=======
              context 'when decorate' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
              it '#authors_names' do
>>>>>>> fd6db03 (Manifest_cache true)
=======
              describe '#categories_names' do
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
=======
              describe '#categories_names' do
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> ae884b47 (Fix)
=======
>>>>>>> 0341d6de (Manifest_cache true)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> 8887ba5b (Fix)
=======
>>>>>>> 1b8f36d8 (Manifest_cache true)
=======
              describe '#categories_names' do
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> b719333 (Manifest_cache true)
=======
>>>>>>> 0c57e4e (Fix)
=======
>>>>>>> 3be4d14 (Manifest_cache true)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
=======
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5890c2 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 251144b4 (Manifest_cache true)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> ae884b47 (Fix)
=======
=======
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b719333 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0341d6de (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 307f31f (Manifest_cache true)
>>>>>>> bf137e4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 21793167 (Manifest_cache true)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
              describe '#categories_names' do
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> b28889f (Fix)
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
>>>>>>> 0e864a5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> cc390719 (Manifest_cache true)
=======
=======
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 0c57e4e (Fix)
<<<<<<< HEAD
>>>>>>> 8887ba5b (Fix)
=======
=======
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 3be4d14 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1b8f36d8 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 307f31f (Manifest_cache true)
>>>>>>> a71befd (Manifest_cache true)
>>>>>>> 8a3779d4 (Manifest_cache true)
          
        265. 
        
        
      
        
        
<<<<<<< HEAD
          
      265. 
            2
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      266. 
            2
=======
=======
          
      267. 
            2
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 845dac1 (Manifest_cache true)
          
      268. 
            2
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
          
      269. 
            1
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
=======
          
      270. 
            2
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 845dac1 (Manifest_cache true)
          
      271. 
            2
=======
          
      272. 
            1
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e18eb87 (Fix)
=======
<<<<<<< HEAD
>>>>>>> 3be4d14 (Manifest_cache true)
=======
          
      273. 
            1
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
      274. 
            1
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 490b01d6 (Manifest_cache true)
=======
=======
>>>>>>> 251144b4 (Manifest_cache true)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> cc390719 (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> 0e864a5 (Manifest_cache true)
=======
          
      275. 
            1
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
      276. 
            1
>>>>>>> fd6db03 (Manifest_cache true)
=======
          
      277. 
            2
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
=======
>>>>>>> 5a2009f1 (Fix)
=======
>>>>>>> ae884b47 (Fix)
=======
>>>>>>> 0341d6de (Manifest_cache true)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> 8887ba5b (Fix)
=======
>>>>>>> 1b8f36d8 (Manifest_cache true)
=======
          
      278. 
            2
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> b719333 (Manifest_cache true)
=======
>>>>>>> 0c57e4e (Fix)
=======
>>>>>>> 3be4d14 (Manifest_cache true)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
=======
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5890c2 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 251144b4 (Manifest_cache true)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> ae884b47 (Fix)
=======
=======
=======
>>>>>>> 3be4d14 (Manifest_cache true)
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b719333 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0341d6de (Manifest_cache true)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
          
      279. 
            2
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> b28889f (Fix)
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
>>>>>>> 0e864a5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> cc390719 (Manifest_cache true)
=======
=======
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 0c57e4e (Fix)
<<<<<<< HEAD
>>>>>>> 8887ba5b (Fix)
=======
=======
>>>>>>> 3be4d14 (Manifest_cache true)
>>>>>>> 1b8f36d8 (Manifest_cache true)
            

            

<<<<<<< HEAD
                it { expect(decorated_object.categories_names).to eq("#{categories.first.name}, #{categories.last.name}") }
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                it { expect(decorated_object.categories_names).to eq("#{categories.first.name}, #{categories.last.name}") }
=======
=======
                it { expect(decorated_object.categories_names).to eq("#{categories.first.name}, #{categories.last.name}") }
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
                it { expect(decorated_object.categories_names).to eq("#{categories.first.name}, #{categories.last.name}") }
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
                expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
                it { expect(decorated_object.categories_names).to eq("#{categories.first.name}, #{categories.last.name}") }
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
                it { expect(decorated_object.categories_names).to eq("#{categories.first.name}, #{categories.last.name}") }
=======
                expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e18eb87 (Fix)
=======
<<<<<<< HEAD
>>>>>>> 3be4d14 (Manifest_cache true)
=======
<<<<<<< HEAD
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> a71befd (Manifest_cache true)
=======
                it '#authors_names' do
=======
                expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
>>>>>>> ae2a012 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> a71befd (Manifest_cache true)
=======
                expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
>>>>>>> bd8bda4 (Manifest_cache true)
=======
                expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 490b01d6 (Manifest_cache true)
=======
=======
>>>>>>> 251144b4 (Manifest_cache true)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> cc390719 (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> 0e864a5 (Manifest_cache true)
=======
                expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
>>>>>>> 183b6c5 (Manifest_cache true)
=======
                it '#authors_names' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
>>>>>>> fd6db03 (Manifest_cache true)
=======
                it { expect(decorated_object.categories_names).to eq("#{categories.first.name}, #{categories.last.name}") }
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
=======
                it { expect(decorated_object.categories_names).to eq("#{categories.first.name}, #{categories.last.name}") }
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> ae884b47 (Fix)
=======
>>>>>>> 0341d6de (Manifest_cache true)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> 8887ba5b (Fix)
=======
>>>>>>> 1b8f36d8 (Manifest_cache true)
=======
                it { expect(decorated_object.categories_names).to eq("#{categories.first.name}, #{categories.last.name}") }
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> b719333 (Manifest_cache true)
=======
>>>>>>> 0c57e4e (Fix)
=======
>>>>>>> 3be4d14 (Manifest_cache true)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
=======
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5890c2 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 251144b4 (Manifest_cache true)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> ae884b47 (Fix)
=======
=======
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b719333 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0341d6de (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 307f31f (Manifest_cache true)
>>>>>>> bf137e4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 21793167 (Manifest_cache true)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
                it { expect(decorated_object.categories_names).to eq("#{categories.first.name}, #{categories.last.name}") }
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> b28889f (Fix)
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
>>>>>>> 0e864a5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> cc390719 (Manifest_cache true)
=======
=======
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 0c57e4e (Fix)
<<<<<<< HEAD
>>>>>>> 8887ba5b (Fix)
=======
=======
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 3be4d14 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1b8f36d8 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 307f31f (Manifest_cache true)
>>>>>>> a71befd (Manifest_cache true)
>>>>>>> 8a3779d4 (Manifest_cache true)
          
        280. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      280. 
=======
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
=======
          
      281. 
=======
>>>>>>> c8da2e3 (Fix)
=======
          
      282. 
=======
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      283. 
            1
<<<<<<< HEAD
=======
=======
          
      284. 
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 3be4d14 (Manifest_cache true)
=======
          
      285. 
=======
          
      286. 
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
            
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0341d6de (Manifest_cache true)
=======
=======
          
      287. 
            1
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 21793167 (Manifest_cache true)
            

            

<<<<<<< HEAD
                  expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
=======
<<<<<<< HEAD
<<<<<<< HEAD
                  expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
=======
              end
>>>>>>> fd6db03 (Manifest_cache true)
=======
                  expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 21793167 (Manifest_cache true)
          
        288. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
          
      288. 
=======
<<<<<<< HEAD
          
      289. 
=======
          
      290. 
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 845dac1 (Manifest_cache true)
=======
          
      291. 
>>>>>>> 1c3ace6 (Manifest_cache true)
            
            

            

<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 21793167 (Manifest_cache true)
                end
>>>>>>> 7375d4b (Manifest_cache true)
          
        292. 
        
        
      
        
        
<<<<<<< HEAD
          
      292. 
<<<<<<< HEAD
=======
          
      293. 
>>>>>>> 02a399d (Manifest_cache true)
=======
<<<<<<< HEAD
=======
          
      294. 
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
          
      295. 
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> b28889f (Fix)
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> b28889f (Fix)
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> b28889f (Fix)
=======
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      296. 
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> ef483b6d (Fix)
=======
=======
          
      297. 
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
>>>>>>> 3be4d14 (Manifest_cache true)
>>>>>>> 1b8f36d8 (Manifest_cache true)
            
>>>>>>> fd6db03 (Manifest_cache true)
=======
          
      298. 
            1
>>>>>>> 1c3ace6 (Manifest_cache true)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              end
=======
=======
>>>>>>> fd6db03 (Manifest_cache true)
=======
>>>>>>> 998f08d (Manifest_cache true)
            
>>>>>>> 4367ccb1 (Manifest_cache true)
=======
              end
>>>>>>> ef483b6d (Fix)
=======
=======
>>>>>>> 8a3779d4 (Manifest_cache true)
                  expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
=======
              end
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
                  expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 8a3779d4 (Manifest_cache true)
          
        299. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4367ccb1 (Manifest_cache true)
=======
>>>>>>> 4fac471d (Manifest_cache true)
=======
>>>>>>> ef483b6d (Fix)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 1b8f36d8 (Manifest_cache true)
=======
>>>>>>> 8a3779d4 (Manifest_cache true)
          
      299. 
            1
=======
=======
>>>>>>> 3be4d14 (Manifest_cache true)
=======
>>>>>>> a71befd (Manifest_cache true)
          
      300. 
=======
<<<<<<< HEAD
          
      301. 
=======
          
      302. 
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 845dac1 (Manifest_cache true)
=======
          
      303. 
>>>>>>> 1c3ace6 (Manifest_cache true)
            
>>>>>>> e18eb87 (Fix)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> a71befd (Manifest_cache true)
                end
>>>>>>> 7375d4b (Manifest_cache true)
          
        304. 
        
        
      
        
        
<<<<<<< HEAD
          
      304. 
<<<<<<< HEAD
=======
          
      305. 
>>>>>>> 02a399d (Manifest_cache true)
=======
<<<<<<< HEAD
=======
          
      306. 
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
=======
>>>>>>> 872e675 (Fix)
=======
=======
=======
          
      307. 
>>>>>>> 7c4ea7f (Fix)
            
            

            

              end
          
        308. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      308. 
            1
            

            

                it '#categories_names' do
          
        309. 
        
        
      
        
        
          
      309. 
            1
            

            

                  expect(book_decorator.categories_names).to eq('Poetry, Novel')
          
        310. 
        
        
      
        
        
          
      310. 
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
            
            

            

                end
          
        311. 
        
        
      
        
        
          
      311. 
=======
          
      312. 
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 307f31f (Manifest_cache true)
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
              end
=======
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> fd6db03 (Manifest_cache true)
            
=======
              end
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
=======
>>>>>>> 872e675 (Fix)
          
        313. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      313. 
=======
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 307f31f (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
          
      314. 
            1
=======
          
      315. 
=======
          
      316. 
>>>>>>> 02a399d (Manifest_cache true)
            
>>>>>>> 1c3ace6 (Manifest_cache true)
            

            

>>>>>>> e18eb87 (Fix)
                it '#categories_names' do
          
        317. 
        
        
      
        
        
<<<<<<< HEAD
          
      317. 
=======
          
      318. 
>>>>>>> 02a399d (Manifest_cache true)
            1
            

            

<<<<<<< HEAD
                  expect(book_decorator.categories_names).to eq('Poetry, Novel')
=======
<<<<<<< HEAD
              describe '#authors_names' do
=======
              it '#categories_names' do
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 845dac1 (Manifest_cache true)
          
        319. 
        
        
      
        
        
<<<<<<< HEAD
          
      319. 
<<<<<<< HEAD
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
=======
>>>>>>> e18eb87 (Fix)
            
            

            

                end
          
        320. 
        
        
      
        
        
          
      320. 
=======
          
      321. 
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 307f31f (Manifest_cache true)
>>>>>>> bf137e4 (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
            
=======
=======
          
      322. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
      323. 
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
      324. 
>>>>>>> 183b6c5 (Manifest_cache true)
            
=======
          
      325. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> e18eb87 (Fix)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
=======
=======
>>>>>>> 557c1b8 (Fix)
>>>>>>> ae884b47 (Fix)
              end
=======
>>>>>>> c8da2e3 (Fix)
>>>>>>> 5a2009f1 (Fix)
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 67ab5299 (Fix)
            
=======
              end
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
              end
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> b28889f (Fix)
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> b28889f (Fix)
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
                  expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
>>>>>>> e18eb87 (Fix)
>>>>>>> 99dad91f (Fix)
          
        326. 
        
        
      
        
        
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> bf137e4 (Manifest_cache true)
          
      326. 
=======
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 307f31f (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
          
      327. 
            1
=======
=======
>>>>>>> e18eb87 (Fix)
          
      328. 
=======
          
      329. 
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
            
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
=======
          
      330. 
>>>>>>> a5d032d (Fix)
>>>>>>> b28889f (Fix)
            
>>>>>>> e18eb87 (Fix)
            

            

<<<<<<< HEAD
                it '#categories_names' do
=======
            
>>>>>>> e18eb87 (Fix)
          
        331. 
        
        
      
        
        
<<<<<<< HEAD
          
      331. 
=======
<<<<<<< HEAD
          
      332. 
>>>>>>> 02a399d (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
          
      333. 
=======
          
      334. 
>>>>>>> 02a399d (Manifest_cache true)
=======
          
      335. 
>>>>>>> fd6db03 (Manifest_cache true)
=======
          
      336. 
>>>>>>> a5d032d (Fix)
>>>>>>> b28889f (Fix)
>>>>>>> e18eb87 (Fix)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
                  expect(book_decorator.categories_names).to eq('Poetry, Novel')
=======
<<<<<<< HEAD
=======
              describe '#authors_names' do
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e18eb87 (Fix)
              describe '#authors_names' do
=======
              it '#categories_names' do
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 845dac1 (Manifest_cache true)
=======
=======
              it '#categories_names' do
>>>>>>> fd6db03 (Manifest_cache true)
=======
              describe '#authors_names' do
>>>>>>> a5d032d (Fix)
>>>>>>> b28889f (Fix)
>>>>>>> e18eb87 (Fix)
          
        337. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
          
      337. 
            
            

            

                end
          
        338. 
        
        
      
        
        
          
      338. 
=======
          
      339. 
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
=======
          
      340. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
      341. 
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 490b01d6 (Manifest_cache true)
            
            

            

              end
          
        342. 
        
        
      
        
        
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 490b01d6 (Manifest_cache true)
          
      342. 
=======
          
      343. 
>>>>>>> 02a399d (Manifest_cache true)
=======
          
      344. 
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
=======
          
      345. 
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> ae884b47 (Fix)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> d9d85ca6 (Fix)
=======
          
      346. 
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> b28889f (Fix)
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
=======
=======
>>>>>>> b28889f (Fix)
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> ae884b47 (Fix)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
          
      347. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
>>>>>>> d9d85ca6 (Fix)
            
            

            

            
          
        348. 
        
        
      
        
        
<<<<<<< HEAD
          
      348. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 557c1b8 (Fix)
          
      349. 
=======
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 5b7749a (Fix)
          
      350. 
=======
          
      351. 
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
=======
          
      352. 
>>>>>>> fd6db03 (Manifest_cache true)
=======
          
      353. 
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
=======
          
      354. 
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> ae884b47 (Fix)
=======
>>>>>>> 0341d6de (Manifest_cache true)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
          
      355. 
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> b28889f (Fix)
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
=======
=======
>>>>>>> b28889f (Fix)
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> ae884b47 (Fix)
=======
=======
>>>>>>> b28889f (Fix)
=======
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
<<<<<<< HEAD
          
      356. 
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
>>>>>>> b719333 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0341d6de (Manifest_cache true)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
          
      357. 
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e59c273d (Manifest_cache true)
=======
=======
=======
          
      358. 
>>>>>>> 998f08d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 64dceec (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 7afa007b (Manifest_cache true)
=======
=======
=======
          
      359. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
>>>>>>> d9d85ca6 (Fix)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
              describe '#authors_names' do
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d9d85ca6 (Fix)
              describe '#authors_names' do
          
        360. 
        
        
      
        
        
<<<<<<< HEAD
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
          
      360. 
=======
          
      361. 
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 845dac1 (Manifest_cache true)
=======
=======
          
      362. 
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 2c640cf (Manifest_cache true)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
              describe '#authors_names' do
=======
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
              describe '#authors_names' do
=======
              it '#categories_names' do
>>>>>>> 02a399d (Manifest_cache true)
=======
              it '#categories_names' do
>>>>>>> fd6db03 (Manifest_cache true)
=======
              describe '#authors_names' do
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
=======
              describe '#authors_names' do
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> ae884b47 (Fix)
=======
>>>>>>> 0341d6de (Manifest_cache true)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
              describe '#authors_names' do
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> b28889f (Fix)
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
=======
=======
>>>>>>> b28889f (Fix)
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> ae884b47 (Fix)
=======
=======
>>>>>>> b28889f (Fix)
=======
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
                it {
=======
                expect(book_decorator.categories_names).to eq('Poetry, Novel')
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
>>>>>>> b719333 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0341d6de (Manifest_cache true)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
=======
                expect(book_decorator.categories_names).to eq('Poetry, Novel')
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 2c640cf (Manifest_cache true)
>>>>>>> 8cbdfeb (Manifest_cache true)
>>>>>>> e59c273d (Manifest_cache true)
          
        363. 
        
        
      
        
        
<<<<<<< HEAD
          
      363. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      364. 
=======
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
>>>>>>> 64dceec (Manifest_cache true)
<<<<<<< HEAD
          
      365. 
=======
          
      366. 
>>>>>>> 02a399d (Manifest_cache true)
=======
          
      367. 
>>>>>>> fd6db03 (Manifest_cache true)
=======
<<<<<<< HEAD
          
      368. 
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
=======
          
      369. 
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> ae884b47 (Fix)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 7afa007b (Manifest_cache true)
=======
          
      370. 
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> b28889f (Fix)
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
=======
=======
>>>>>>> b28889f (Fix)
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> ae884b47 (Fix)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
          
      371. 
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 64dceec (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 7afa007b (Manifest_cache true)
=======
=======
=======
          
      372. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
>>>>>>> d9d85ca6 (Fix)
            1
            

            

<<<<<<< HEAD
                it {
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
                it {
=======
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 5b7749a (Fix)
                it {
<<<<<<< HEAD
=======
                expect(book_decorator.categories_names).to eq('Poetry, Novel')
>>>>>>> 02a399d (Manifest_cache true)
=======
                expect(book_decorator.categories_names).to eq('Poetry, Novel')
>>>>>>> fd6db03 (Manifest_cache true)
=======
<<<<<<< HEAD
                it {
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
=======
                it {
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> ae884b47 (Fix)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 7afa007b (Manifest_cache true)
=======
                it {
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> b28889f (Fix)
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
=======
=======
>>>>>>> b28889f (Fix)
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> ae884b47 (Fix)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
                expect(book_decorator.categories_names).to eq('Poetry, Novel')
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 64dceec (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 7afa007b (Manifest_cache true)
=======
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
>>>>>>> d9d85ca6 (Fix)
          
        373. 
        
        
      
        
        
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 0341d6de (Manifest_cache true)
=======
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> b719333 (Manifest_cache true)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
=======
=======
=======
=======
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> ae884b47 (Fix)
=======
=======
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> e9f3851 (Manifest_cache true)
>>>>>>> b719333 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0341d6de (Manifest_cache true)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> a5d032d (Fix)
=======
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> a5d032d (Fix)
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e59c273d (Manifest_cache true)
=======
=======
=======
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 64dceec (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 7afa007b (Manifest_cache true)
=======
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
>>>>>>> d9d85ca6 (Fix)
          
      373. 
            1
            

            

                  expect(decorated_object.authors_names).to eq("#{authors.first.first_name} #{authors.first.last_name}, " \
          
        374. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 67ab5299 (Fix)
          
      374. 
<<<<<<< HEAD
=======
=======
=======
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> bf137e4 (Manifest_cache true)
          
      375. 
=======
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> 5b7749a (Fix)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 307f31f (Manifest_cache true)
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 7375d4b (Manifest_cache true)
          
      376. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
=======
<<<<<<< HEAD
>>>>>>> bf137e4 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> a304bcf (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> bd8bda4 (Manifest_cache true)
=======
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 304cd28a (Manifest_cache true)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 183b6c5 (Manifest_cache true)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 21793167 (Manifest_cache true)
=======
=======
=======
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d245196f (Manifest_cache true)
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 304cd28a (Manifest_cache true)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
<<<<<<< HEAD
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
          
      377. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 74240509 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
                end
          
        378. 
        
        
      
        
        
          
      378. 
            
            

            

=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 21793167 (Manifest_cache true)
            
=======
                end
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
          
        379. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> 21793167 (Manifest_cache true)
          
      379. 
            1
=======
          
      380. 
            
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
            

            

            
          
        381. 
        
        
      
        
        
<<<<<<< HEAD
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 21793167 (Manifest_cache true)
          
      381. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
                expect(book_decorator.categories_names).to eq('Poetry, Novel')
=======
=======
>>>>>>> 74240509 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
                it '#categories_names' do
=======
                expect(book_decorator.categories_names).to eq('Poetry, Novel')
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 21793167 (Manifest_cache true)
=======
=======
                it '#categories_names' do
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 74240509 (Fix book_spec decrease quantity and price)
          
        382. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      382. 
=======
=======
>>>>>>> 21793167 (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 74240509 (Fix book_spec decrease quantity and price)
          
      383. 
            1
            

            

                  expect(book_decorator.categories_names).to eq('Poetry, Novel')
          
        384. 
        
        
      
        
        
          
      384. 
            
            

            

                end
          
        385. 
        
        
      
        
        
          
      385. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
          
      386. 
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
=======
          
      387. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
      388. 
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 251144b4 (Manifest_cache true)
=======
=======
=======
          
      389. 
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 307f31f (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 21793167 (Manifest_cache true)
=======
=======
=======
          
      390. 
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      391. 
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 74240509 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
            
            

            

              end
          
        392. 
        
        
      
        
        
<<<<<<< HEAD
          
      392. 
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
          
      393. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      394. 
=======
          
      395. 
>>>>>>> 02a399d (Manifest_cache true)
=======
          
      396. 
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      397. 
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> b28889f (Fix)
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> b28889f (Fix)
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> b28889f (Fix)
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 9e081dc (Fix)
=======
=======
          
      398. 
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
>>>>>>> 5b7749a (Fix)
=======
          
      399. 
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> b28889f (Fix)
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 0c57e4e (Fix)
=======
>>>>>>> 1d59aaa (Fix)
>>>>>>> 9e081dc (Fix)
            
            

            

            
          
        400. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 0c57e4e (Fix)
=======
>>>>>>> 9e081dc (Fix)
          
      400. 
=======
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 5b7749a (Fix)
          
      401. 
=======
          
      402. 
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 4367ccb1 (Manifest_cache true)
=======
          
      403. 
>>>>>>> fd6db03 (Manifest_cache true)
=======
          
      404. 
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 31d15e66 (Fix)
=======
=======
          
      405. 
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> d34a0770 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 8887ba5b (Fix)
=======
>>>>>>> 1b8f36d8 (Manifest_cache true)
=======
          
      406. 
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> b28889f (Fix)
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> fdab719f (Fix)
=======
=======
>>>>>>> b28889f (Fix)
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> 8288136d (Fix)
=======
=======
>>>>>>> b28889f (Fix)
=======
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
<<<<<<< HEAD
          
      407. 
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
>>>>>>> b719333 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d34a0770 (Manifest_cache true)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
          
      408. 
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4367ccb1 (Manifest_cache true)
=======
=======
=======
          
      409. 
>>>>>>> 998f08d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 64dceec (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4fac471d (Manifest_cache true)
=======
=======
=======
          
      410. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
>>>>>>> ef483b6d (Fix)
=======
=======
          
      411. 
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> b28889f (Fix)
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 0c57e4e (Fix)
<<<<<<< HEAD
>>>>>>> 8887ba5b (Fix)
=======
=======
>>>>>>> b28889f (Fix)
=======
>>>>>>> 872e675 (Fix)
=======
=======
=======
<<<<<<< HEAD
          
      412. 
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 3be4d14 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1b8f36d8 (Manifest_cache true)
=======
=======
=======
=======
          
      413. 
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 15bff2e (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> c0159bf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1d0f5cbf (Manifest_cache true)
=======
=======
=======
=======
          
      414. 
>>>>>>> 998f08d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 6c71f00 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> ca274ec (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a56ba36d (Manifest_cache true)
=======
=======
=======
=======
          
      415. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
>>>>>>> 9e081dc (Fix)
>>>>>>> 1049b80c (Fix)
            1
            

            

<<<<<<< HEAD
              describe '#authors_names' do
<<<<<<< HEAD
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9e081dc (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
              describe '#authors_names' do
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 1d59aaa (Fix)
              describe '#authors_names' do
          
        416. 
        
        
      
        
        
<<<<<<< HEAD
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
          
      416. 
=======
          
      417. 
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 845dac1 (Manifest_cache true)
=======
=======
          
      418. 
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 2c640cf (Manifest_cache true)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              describe '#authors_names' do
=======
              it '#categories_names' do
>>>>>>> 02a399d (Manifest_cache true)
=======
              it '#categories_names' do
>>>>>>> fd6db03 (Manifest_cache true)
=======
              describe '#authors_names' do
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 0c57e4e (Fix)
=======
=======
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
                it {
=======
                expect(book_decorator.categories_names).to eq('Poetry, Novel')
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 3be4d14 (Manifest_cache true)
=======
=======
=======
=======
                expect(book_decorator.categories_names).to eq('Poetry, Novel')
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 2c640cf (Manifest_cache true)
>>>>>>> 15bff2e (Manifest_cache true)
>>>>>>> c0159bf (Manifest_cache true)
          
        419. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 2c640cf (Manifest_cache true)
=======
          
      419. 
=======
<<<<<<< HEAD
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      420. 
=======
          
      421. 
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 845dac1 (Manifest_cache true)
=======
=======
          
      422. 
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 2c640cf (Manifest_cache true)
=======
          
      423. 
>>>>>>> 6da9530 (Featire specs)
=======
=======
          
      424. 
>>>>>>> fd6db03 (Manifest_cache true)
=======
<<<<<<< HEAD
          
      425. 
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> e18eb87 (Fix)
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 0c57e4e (Fix)
=======
=======
=======
          
      426. 
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 6c71f00 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> ca274ec (Manifest_cache true)
=======
=======
=======
          
      427. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
>>>>>>> 9e081dc (Fix)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
              describe '#authors_names' do
=======
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> fdab719f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 31d15e66 (Fix)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> d34a0770 (Manifest_cache true)
              describe '#authors_names' do
=======
              it '#categories_names' do
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
=======
=======
              it '#categories_names' do
>>>>>>> fd6db03 (Manifest_cache true)
=======
              describe '#authors_names' do
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 31d15e66 (Fix)
=======
=======
              describe '#authors_names' do
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> d34a0770 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
              describe '#authors_names' do
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> b28889f (Fix)
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> fdab719f (Fix)
=======
=======
>>>>>>> b28889f (Fix)
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> 8288136d (Fix)
=======
=======
>>>>>>> b28889f (Fix)
=======
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
                it {
=======
                expect(book_decorator.categories_names).to eq('Poetry, Novel')
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
>>>>>>> b719333 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d34a0770 (Manifest_cache true)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
=======
                expect(book_decorator.categories_names).to eq('Poetry, Novel')
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 2c640cf (Manifest_cache true)
>>>>>>> 8cbdfeb (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4367ccb1 (Manifest_cache true)
=======
=======
                it {
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
>>>>>>> 9e081dc (Fix)
                it {
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 1d59aaa (Fix)
                it {
<<<<<<< HEAD
=======
                expect(book_decorator.categories_names).to eq('Poetry, Novel')
>>>>>>> 02a399d (Manifest_cache true)
=======
                expect(book_decorator.categories_names).to eq('Poetry, Novel')
>>>>>>> fd6db03 (Manifest_cache true)
=======
<<<<<<< HEAD
                it {
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 0c57e4e (Fix)
<<<<<<< HEAD
>>>>>>> 8887ba5b (Fix)
=======
=======
=======
=======
                expect(book_decorator.categories_names).to eq('Poetry, Novel')
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 6c71f00 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> ca274ec (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a56ba36d (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
>>>>>>> 9e081dc (Fix)
>>>>>>> 1049b80c (Fix)
          
        428. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 99dad91f (Fix)
          
      428. 
=======
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> fdab719f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
>>>>>>> 64dceec (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 31d15e66 (Fix)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> d34a0770 (Manifest_cache true)
          
      429. 
=======
          
      430. 
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
=======
=======
          
      431. 
>>>>>>> fd6db03 (Manifest_cache true)
=======
<<<<<<< HEAD
          
      432. 
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 31d15e66 (Fix)
=======
=======
          
      433. 
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 4fac471d (Manifest_cache true)
=======
          
      434. 
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> b28889f (Fix)
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> fdab719f (Fix)
=======
=======
>>>>>>> b28889f (Fix)
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> 8288136d (Fix)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
          
      435. 
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 64dceec (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4fac471d (Manifest_cache true)
=======
=======
=======
          
      436. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
>>>>>>> ef483b6d (Fix)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
                it {
=======
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> fdab719f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 31d15e66 (Fix)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 8288136d (Fix)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 5b7749a (Fix)
>>>>>>> ef483b6d (Fix)
                it {
<<<<<<< HEAD
=======
                expect(book_decorator.categories_names).to eq('Poetry, Novel')
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
=======
=======
                expect(book_decorator.categories_names).to eq('Poetry, Novel')
>>>>>>> fd6db03 (Manifest_cache true)
=======
<<<<<<< HEAD
                it {
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 31d15e66 (Fix)
=======
=======
                it {
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 4fac471d (Manifest_cache true)
=======
                it {
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> b28889f (Fix)
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> fdab719f (Fix)
=======
=======
>>>>>>> b28889f (Fix)
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> 8288136d (Fix)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
                expect(book_decorator.categories_names).to eq('Poetry, Novel')
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 64dceec (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4fac471d (Manifest_cache true)
=======
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
>>>>>>> ef483b6d (Fix)
          
        437. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> c8da2e3 (Fix)
>>>>>>> fdab719f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 31d15e66 (Fix)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> d34a0770 (Manifest_cache true)
=======
>>>>>>> 1b8f36d8 (Manifest_cache true)
=======
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> b719333 (Manifest_cache true)
=======
>>>>>>> 3be4d14 (Manifest_cache true)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> fdab719f (Fix)
=======
=======
=======
>>>>>>> 0c57e4e (Fix)
=======
=======
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> 8288136d (Fix)
=======
=======
=======
>>>>>>> 3be4d14 (Manifest_cache true)
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b719333 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d34a0770 (Manifest_cache true)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> a5d032d (Fix)
=======
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> a5d032d (Fix)
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4367ccb1 (Manifest_cache true)
=======
=======
=======
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 64dceec (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4fac471d (Manifest_cache true)
=======
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
>>>>>>> ef483b6d (Fix)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> a5d032d (Fix)
>>>>>>> b28889f (Fix)
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
>>>>>>> 0c57e4e (Fix)
<<<<<<< HEAD
>>>>>>> 8887ba5b (Fix)
=======
=======
>>>>>>> 3be4d14 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1b8f36d8 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 15bff2e (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> c0159bf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1d0f5cbf (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 6c71f00 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> ca274ec (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a56ba36d (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
>>>>>>> 9e081dc (Fix)
>>>>>>> 1049b80c (Fix)
          
      437. 
            1
            

            

                  expect(decorated_object.authors_names).to eq("#{authors.first.first_name} #{authors.first.last_name}, " \
          
        438. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 7375d4b (Manifest_cache true)
          
      438. 
=======
=======
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> bf137e4 (Manifest_cache true)
          
      439. 
=======
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> 5b7749a (Fix)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 307f31f (Manifest_cache true)
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 7375d4b (Manifest_cache true)
          
      440. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
=======
<<<<<<< HEAD
>>>>>>> bf137e4 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> a304bcf (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 0c57e4e (Fix)
=======
>>>>>>> a71befd (Manifest_cache true)
=======
>>>>>>> 9e081dc (Fix)
          
      441. 
=======
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 307f31f (Manifest_cache true)
=======
>>>>>>> 7375d4b (Manifest_cache true)
          
      442. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e18eb87 (Fix)
=======
<<<<<<< HEAD
>>>>>>> a71befd (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 551c6ab (Manifest_cache true)
=======
>>>>>>> bd8bda4 (Manifest_cache true)
=======
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 42e9c2e (Manifest_cache true)
=======
>>>>>>> fd310ed (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d4235040 (Manifest_cache true)
=======
=======
>>>>>>> fd3f47ab (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 183b6c5 (Manifest_cache true)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 824ea7c9 (Manifest_cache true)
=======
=======
=======
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bd30d038 (Manifest_cache true)
=======
=======
>>>>>>> 56531f25 (Manifest_cache true)
=======
>>>>>>> 86229876 (Manifest_cache true)
=======
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d4235040 (Manifest_cache true)
=======
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 16ebb0ff (Manifest_cache true)
<<<<<<< HEAD
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> a71befd (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8a3779d4 (Manifest_cache true)
=======
=======
>>>>>>> 551c6ab (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 56531f25 (Manifest_cache true)
=======
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
>>>>>>> fd310ed (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 86229876 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 5b6aeb7 (Manifest_cache true)
>>>>>>> 42e9c2e (Manifest_cache true)
>>>>>>> 16ebb0ff (Manifest_cache true)
          
      443. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> a71befd (Manifest_cache true)
=======
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
                end
          
        444. 
        
        
      
        
        
          
      444. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
            
=======
                end
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
          
        445. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      445. 
            1
=======
          
      446. 
            
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
            

            

=======
>>>>>>> e18eb87 (Fix)
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> a71befd (Manifest_cache true)
            
=======
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
          
        447. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
>>>>>>> e18eb87 (Fix)
=======
=======
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
=======
          
      447. 
            1
=======
          
      448. 
            
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
            

            

            
          
        449. 
        
        
      
        
        
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> a71befd (Manifest_cache true)
          
      449. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a71befd (Manifest_cache true)
=======
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
                it '#categories_names' do
=======
                expect(book_decorator.categories_names).to eq('Poetry, Novel')
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                it '#categories_names' do
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
                it '#categories_names' do
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> a71befd (Manifest_cache true)
=======
=======
                it '#categories_names' do
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
          
        450. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> a71befd (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
          
      450. 
            1
            

            

                  expect(book_decorator.categories_names).to eq('Poetry, Novel')
          
        451. 
        
        
      
        
        
          
      451. 
            
            

            

                end
          
        452. 
        
        
      
        
        
          
      452. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0e864a5 (Manifest_cache true)
=======
>>>>>>> a71befd (Manifest_cache true)
=======
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
=======
=======
          
      453. 
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
=======
          
      454. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
      455. 
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a71befd (Manifest_cache true)
=======
=======
          
      456. 
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 307f31f (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
=======
=======
          
      457. 
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      458. 
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> 0e864a5 (Manifest_cache true)
=======
>>>>>>> a71befd (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
            
            

            

              end
          
        459. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e18eb87 (Fix)
          
      459. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 251144b4 (Manifest_cache true)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> c59d1a99 (Manifest_cache true)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      460. 
=======
          
      461. 
>>>>>>> 02a399d (Manifest_cache true)
            
            

            

            
          
        462. 
        
        
      
        
        
<<<<<<< HEAD
          
      462. 
=======
          
      463. 
>>>>>>> 02a399d (Manifest_cache true)
            1
            

            

<<<<<<< HEAD
              describe '#authors_names' do
=======
              it '#categories_names' do
>>>>>>> 02a399d (Manifest_cache true)
          
        464. 
        
        
      
        
        
<<<<<<< HEAD
          
      464. 
=======
          
      465. 
>>>>>>> 02a399d (Manifest_cache true)
            1
            

            

<<<<<<< HEAD
                it {
=======
                expect(book_decorator.categories_names).to eq('Poetry, Novel')
>>>>>>> 02a399d (Manifest_cache true)
          
        466. 
        
        
      
        
        
<<<<<<< HEAD
          
      466. 
            1
            

            

                  expect(decorated_object.authors_names).to eq("#{authors.first.first_name} #{authors.first.last_name}, " \
          
        467. 
        
        
      
        
        
=======
>>>>>>> 7375d4b (Manifest_cache true)
          
      467. 
=======
=======
>>>>>>> bd8bda4 (Manifest_cache true)
=======
>>>>>>> aa7b40c (Manifest_cache true)
          
      468. 
            
            

            

            
          
        469. 
        
        
      
        
        
          
      469. 
            1
            

            

              it '#categories_names' do
          
        470. 
        
        
      
        
        
          
      470. 
            1
            

            

                expect(book_decorator.categories_names).to eq('Poetry, Novel')
          
        471. 
        
        
      
        
        
          
      471. 
            
            

            

              end
          
        472. 
        
        
      
        
        
          
      472. 
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> e18eb87 (Fix)
>>>>>>> 99dad91f (Fix)
>>>>>>> ae2a012 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 490b01d6 (Manifest_cache true)
=======
=======
          
      473. 
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
=======
          
      474. 
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> ae884b47 (Fix)
=======
>>>>>>> 21793167 (Manifest_cache true)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> 824ea7c9 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
=======
          
      475. 
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> b28889f (Fix)
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
=======
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> b28889f (Fix)
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ae884b47 (Fix)
=======
=======
>>>>>>> 824ea7c9 (Manifest_cache true)
=======
>>>>>>> b28889f (Fix)
=======
>>>>>>> 872e675 (Fix)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 0e864a5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> cc390719 (Manifest_cache true)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
>>>>>>> 0f24a043 (Fix book_spec decrease quantity and price)
          
      476. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      477. 
=======
          
      478. 
>>>>>>> 02a399d (Manifest_cache true)
            
            

            

            
          
        479. 
        
        
      
        
        
<<<<<<< HEAD
          
      479. 
=======
          
      480. 
>>>>>>> 02a399d (Manifest_cache true)
            1
            

            

<<<<<<< HEAD
              describe '#authors_names' do
=======
              it '#categories_names' do
>>>>>>> 02a399d (Manifest_cache true)
          
        481. 
        
        
      
        
        
<<<<<<< HEAD
          
      481. 
=======
          
      482. 
>>>>>>> 02a399d (Manifest_cache true)
            1
            

            

<<<<<<< HEAD
                it {
=======
                expect(book_decorator.categories_names).to eq('Poetry, Novel')
>>>>>>> 02a399d (Manifest_cache true)
          
        483. 
        
        
      
        
        
<<<<<<< HEAD
          
      483. 
            1
            

            

                  expect(decorated_object.authors_names).to eq("#{authors.first.first_name} #{authors.first.last_name}, " \
          
        484. 
        
        
      
        
        
=======
>>>>>>> 7375d4b (Manifest_cache true)
          
      484. 
=======
=======
>>>>>>> bd8bda4 (Manifest_cache true)
=======
>>>>>>> aa7b40c (Manifest_cache true)
          
      485. 
            
            

            

            
          
        486. 
        
        
      
        
        
          
      486. 
            1
            

            

              it '#categories_names' do
          
        487. 
        
        
      
        
        
          
      487. 
            1
            

            

                expect(book_decorator.categories_names).to eq('Poetry, Novel')
          
        488. 
        
        
      
        
        
          
      488. 
            
            

            

              end
          
        489. 
        
        
      
        
        
          
      489. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 86d584a (Manifest_cache true)
=======
>>>>>>> 0b43b18 (Manifest_cache true)
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
>>>>>>> bf137e4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 21793167 (Manifest_cache true)
=======
=======
<<<<<<< HEAD
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
          
      490. 
<<<<<<< HEAD
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
>>>>>>> d9d85ca6 (Fix)
=======
=======
          
      491. 
>>>>>>> a5d032d (Fix)
>>>>>>> 31d15e66 (Fix)
=======
=======
          
      492. 
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
          
      493. 
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> b28889f (Fix)
>>>>>>> c8da2e3 (Fix)
>>>>>>> fdab719f (Fix)
=======
>>>>>>> 8288136d (Fix)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
          
      494. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
>>>>>>> bf137e4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 824ea7c9 (Manifest_cache true)
=======
=======
<<<<<<< HEAD
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
          
      495. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
>>>>>>> ef483b6d (Fix)
=======
=======
          
      496. 
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> b28889f (Fix)
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 0c57e4e (Fix)
<<<<<<< HEAD
>>>>>>> 8887ba5b (Fix)
=======
=======
=======
=======
          
      497. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a71befd (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8a3779d4 (Manifest_cache true)
=======
=======
=======
=======
          
      498. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
>>>>>>> 9e081dc (Fix)
>>>>>>> 1049b80c (Fix)
            
            

            

                                                                  "#{authors.last.first_name} #{authors.last.last_name}")
          
        499. 
        
        
      
        
        
          
      499. 
            
            

            

                }
          
        500. 
        
        
      
        
        
          
      500. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
=======
>>>>>>> c8da2e3 (Fix)
>>>>>>> 5a2009f1 (Fix)
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> e9f3851 (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 5b7749a (Fix)
=======
>>>>>>> 31d15e66 (Fix)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> d34a0770 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> ef483b6d (Fix)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> 8887ba5b (Fix)
=======
>>>>>>> 1b8f36d8 (Manifest_cache true)
=======
=======
>>>>>>> 9e081dc (Fix)
>>>>>>> 1049b80c (Fix)
=======
=======
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> e9f3851 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 5b7749a (Fix)
=======
=======
=======
<<<<<<< HEAD
=======
>>>>>>> e18eb87 (Fix)
=======
=======
>>>>>>> 3be4d14 (Manifest_cache true)
=======
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
<<<<<<< HEAD
>>>>>>> 0c57e4e (Fix)
=======
>>>>>>> e9f3851 (Manifest_cache true)
=======
>>>>>>> 3be4d14 (Manifest_cache true)
=======
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> 9e081dc (Fix)
          
      501. 
>>>>>>> 02a399d (Manifest_cache true)
=======
          
      502. 
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4367ccb1 (Manifest_cache true)
=======
>>>>>>> 4fac471d (Manifest_cache true)
=======
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> 1d0f5cbf (Manifest_cache true)
=======
>>>>>>> a56ba36d (Manifest_cache true)
=======
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> ae884b47 (Fix)
=======
>>>>>>> 0341d6de (Manifest_cache true)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> d34a0770 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> b28889f (Fix)
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
=======
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> b28889f (Fix)
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ae884b47 (Fix)
=======
=======
>>>>>>> d34a0770 (Manifest_cache true)
=======
>>>>>>> b28889f (Fix)
=======
>>>>>>> 872e675 (Fix)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> d34a0770 (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
          
      503. 
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
>>>>>>> b719333 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0341d6de (Manifest_cache true)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e59c273d (Manifest_cache true)
=======
=======
=======
=======
          
      504. 
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 64dceec (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 7afa007b (Manifest_cache true)
=======
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
>>>>>>> d9d85ca6 (Fix)
=======
=======
>>>>>>> a5d032d (Fix)
>>>>>>> 31d15e66 (Fix)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> b28889f (Fix)
>>>>>>> c8da2e3 (Fix)
>>>>>>> fdab719f (Fix)
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> e9f3851 (Manifest_cache true)
>>>>>>> b719333 (Manifest_cache true)
>>>>>>> d34a0770 (Manifest_cache true)
=======
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 4367ccb1 (Manifest_cache true)
>>>>>>> e9f3851 (Manifest_cache true)
>>>>>>> b719333 (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4367ccb1 (Manifest_cache true)
=======
=======
=======
=======
          
      505. 
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 64dceec (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4fac471d (Manifest_cache true)
=======
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
>>>>>>> ef483b6d (Fix)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
>>>>>>> c0159bf (Manifest_cache true)
=======
>>>>>>> ca274ec (Manifest_cache true)
=======
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 0c57e4e (Fix)
<<<<<<< HEAD
>>>>>>> 8887ba5b (Fix)
=======
=======
=======
=======
=======
          
      506. 
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 3be4d14 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1b8f36d8 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 15bff2e (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> c0159bf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1d0f5cbf (Manifest_cache true)
=======
=======
=======
=======
=======
          
      507. 
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 6c71f00 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> ca274ec (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a56ba36d (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
>>>>>>> 9e081dc (Fix)
>>>>>>> 1049b80c (Fix)
            
            

            

              end
          
        508. 
        
        
      
        
        
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
=======
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 0341d6de (Manifest_cache true)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> 1b8f36d8 (Manifest_cache true)
=======
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> b719333 (Manifest_cache true)
=======
>>>>>>> 3be4d14 (Manifest_cache true)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
=======
=======
=======
>>>>>>> 0c57e4e (Fix)
=======
=======
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> ae884b47 (Fix)
=======
=======
=======
>>>>>>> 3be4d14 (Manifest_cache true)
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b719333 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0341d6de (Manifest_cache true)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> fd3f47ab (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> a5d032d (Fix)
=======
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e59c273d (Manifest_cache true)
=======
=======
=======
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 64dceec (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 7afa007b (Manifest_cache true)
=======
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
>>>>>>> d9d85ca6 (Fix)
=======
=======
>>>>>>> a5d032d (Fix)
>>>>>>> 31d15e66 (Fix)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> d34a0770 (Manifest_cache true)
=======
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> b719333 (Manifest_cache true)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> fdab719f (Fix)
=======
=======
=======
=======
>>>>>>> a5d032d (Fix)
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> 8288136d (Fix)
=======
=======
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> e9f3851 (Manifest_cache true)
>>>>>>> b719333 (Manifest_cache true)
>>>>>>> d34a0770 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4367ccb1 (Manifest_cache true)
=======
=======
=======
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 64dceec (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4fac471d (Manifest_cache true)
=======
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
>>>>>>> ef483b6d (Fix)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> a5d032d (Fix)
>>>>>>> b28889f (Fix)
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
>>>>>>> 0c57e4e (Fix)
<<<<<<< HEAD
>>>>>>> 8887ba5b (Fix)
=======
=======
>>>>>>> 3be4d14 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1b8f36d8 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 15bff2e (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> c0159bf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1d0f5cbf (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 6c71f00 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> ca274ec (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a56ba36d (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
>>>>>>> 9e081dc (Fix)
>>>>>>> 1049b80c (Fix)
          
      508. 
            
            

            

            
          
        509. 
        
        
      
        
        
          
      509. 
            1
            

            

              describe '#price' do
          
        510. 
        
        
      
        
        
          
      510. 
            2
            

            

                it { expect(decorated_object.price).to eq(1.23.to_money) }
          
        511. 
        
        
      
        
        
          
      511. 
            
            

            

              end
          
        512. 
        
        
      
        
        
          
      512. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> 67ab5299 (Fix)
=======
>>>>>>> 84809242 (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> ef483b6d (Fix)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 8887ba5b (Fix)
=======
>>>>>>> 53db2224 (Featire specs)
=======
>>>>>>> 1049b80c (Fix)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> c8da2e3 (Fix)
>>>>>>> 5a2009f1 (Fix)
=======
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> 5b7749a (Fix)
=======
>>>>>>> 31d15e66 (Fix)
=======
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> c8da2e3 (Fix)
>>>>>>> fdab719f (Fix)
=======
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> 9e081dc (Fix)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> 5b7749a (Fix)
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> 659083f (Featire specs)
=======
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 0c57e4e (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> 1d59aaa (Fix)
=======
          
      513. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
=======
=======
          
      514. 
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      515. 
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
          
      516. 
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      517. 
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
          
      518. 
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d34a0770 (Manifest_cache true)
=======
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
          
      519. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> bd8bda4 (Manifest_cache true)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
          
      520. 
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 490b01d6 (Manifest_cache true)
=======
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
      521. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      522. 
>>>>>>> fd6db03 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
=======
=======
          
      523. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> b3f2049 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
>>>>>>> b3f2049 (Featire specs)
=======
=======
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
          
      524. 
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 16ebb0ff (Manifest_cache true)
=======
>>>>>>> d365be68 (Manifest_cache true)
=======
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
      525. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0f24a043 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1d0f5cbf (Manifest_cache true)
=======
          
      526. 
>>>>>>> fd6db03 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
=======
=======
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> 84003439 (Featire specs)
=======
=======
          
      527. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e5890c2 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 251144b4 (Manifest_cache true)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> ae884b47 (Fix)
=======
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376a (Featire specs)
=======
=======
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b719333 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0341d6de (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      528. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0ea (Featire specs)
=======
=======
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a304bcf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d245196f (Manifest_cache true)
=======
=======
=======
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      529. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888bf (Featire specs)
=======
=======
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
>>>>>>> 35d17b9 (Manifest_cache true)
>>>>>>> 255dd8d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 304cd28a (Manifest_cache true)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
=======
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 74240509 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
=======
          
      530. 
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e59c273d (Manifest_cache true)
=======
=======
=======
          
      531. 
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 64dceec (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 7afa007b (Manifest_cache true)
=======
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
>>>>>>> d9d85ca6 (Fix)
=======
          
      532. 
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> c59d1a99 (Manifest_cache true)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 31d15e66 (Fix)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> b3f2049 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
>>>>>>> b3f2049 (Featire specs)
=======
=======
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      533. 
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
=======
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
      534. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      535. 
>>>>>>> fd6db03 (Manifest_cache true)
=======
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> fdab719f (Fix)
=======
=======
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      536. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e5890c2 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> 8288136d (Fix)
=======
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> d52f9efe (Featire specs)
=======
=======
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b719333 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d34a0770 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      537. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a304bcf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> bd30d038 (Manifest_cache true)
=======
=======
=======
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      538. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> c12b71de (Featire specs)
=======
=======
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
>>>>>>> 35d17b9 (Manifest_cache true)
>>>>>>> 255dd8d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d4235040 (Manifest_cache true)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
=======
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
=======
          
      539. 
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4367ccb1 (Manifest_cache true)
=======
=======
=======
          
      540. 
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 64dceec (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4fac471d (Manifest_cache true)
=======
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
>>>>>>> ef483b6d (Fix)
=======
=======
=======
          
      541. 
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
          
      542. 
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      543. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
=======
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      544. 
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
=======
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
      545. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      546. 
>>>>>>> fd6db03 (Manifest_cache true)
=======
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      547. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0e864a5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> cc390719 (Manifest_cache true)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 0c57e4e (Fix)
<<<<<<< HEAD
>>>>>>> 8887ba5b (Fix)
=======
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5e31aeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 53db2224 (Featire specs)
=======
=======
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 3be4d14 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1b8f36d8 (Manifest_cache true)
=======
=======
=======
=======
=======
          
      548. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 551c6ab (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 56531f25 (Manifest_cache true)
=======
=======
=======
=======
=======
          
      549. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 35d17b9 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> fd310ed (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 86229876 (Manifest_cache true)
=======
=======
=======
=======
=======
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> add330c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 42e9c2e (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 16ebb0ff (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0f24a043 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
=======
          
      550. 
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 15bff2e (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> c0159bf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1d0f5cbf (Manifest_cache true)
=======
=======
=======
=======
          
      551. 
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 6c71f00 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> ca274ec (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a56ba36d (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
=======
=======
          
      552. 
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
          
      553. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 0b43b18 (Manifest_cache true)
>>>>>>> 1cce66c (Manifest_cache true)
>>>>>>> d365be68 (Manifest_cache true)
            
            

            

            end
          
        554. 
        
        
      
    
      
  
      

      

      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 490b01d6 (Manifest_cache true)
=======
<<<<<<< HEAD
=======
>>>>>>> bf554f4 (Rebased)
>>>>>>> 75fa7e1b (Rebased)
=======
=======
>>>>>>> 84809242 (Featire specs)
=======
>>>>>>> d8dd3b4a (Featire specs)
=======
>>>>>>> 5a2009f1 (Fix)
=======
>>>>>>> 4f4ea3f9 (Featire specs)
=======
>>>>>>> 365d41ed (Featire specs)
=======
>>>>>>> c05ee511 (Featire specs)
=======
>>>>>>> 251144b4 (Manifest_cache true)
=======
>>>>>>> e59c273d (Manifest_cache true)
=======
>>>>>>> 7afa007b (Manifest_cache true)
=======
>>>>>>> d9d85ca6 (Fix)
<<<<<<< HEAD
=======
>>>>>>> 4367ccb1 (Manifest_cache true)
=======
>>>>>>> 4fac471d (Manifest_cache true)
=======
>>>>>>> ef483b6d (Fix)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> e6fc67c7 (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> cc390719 (Manifest_cache true)
=======
>>>>>>> 73f364d8 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> d365be68 (Manifest_cache true)
=======
>>>>>>> bf554f4 (Rebased)
=======
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> c51bf93 (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> e5890c2 (Manifest_cache true)
=======
>>>>>>> fb61c5a (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> 1cce66c (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> bf554f4 (Rebased)
=======
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e5890c2 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 251144b4 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> bf554f4 (Rebased)
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> 13fca83d (Rebased)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> ae884b47 (Fix)
=======
=======
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376a (Featire specs)
=======
=======
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b719333 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0341d6de (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0ea (Featire specs)
=======
=======
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a304bcf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d245196f (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888bf (Featire specs)
=======
=======
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
>>>>>>> 35d17b9 (Manifest_cache true)
>>>>>>> 255dd8d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 304cd28a (Manifest_cache true)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e59c273d (Manifest_cache true)
=======
=======
=======
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 64dceec (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 7afa007b (Manifest_cache true)
=======
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
>>>>>>> d9d85ca6 (Fix)
=======
>>>>>>> c59d1a99 (Manifest_cache true)
=======
=======
>>>>>>> bf554f4 (Rebased)
>>>>>>> 11792758 (Rebased)
=======
>>>>>>> 31d15e66 (Fix)
=======
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> c51bf93 (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> e5890c2 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> bf554f4 (Rebased)
=======
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> fdab719f (Fix)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e5890c2 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> bf554f4 (Rebased)
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> bc6bc8d2 (Rebased)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> 8288136d (Fix)
=======
=======
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> d52f9efe (Featire specs)
=======
=======
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b719333 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d34a0770 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a304bcf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> bd30d038 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> c12b71de (Featire specs)
=======
=======
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 35d17b9 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 255dd8d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d4235040 (Manifest_cache true)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4367ccb1 (Manifest_cache true)
=======
=======
=======
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 64dceec (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4fac471d (Manifest_cache true)
=======
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
>>>>>>> ef483b6d (Fix)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> f92a45b (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> 0e864a5 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> bf554f4 (Rebased)
=======
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0e864a5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> cc390719 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> bf554f4 (Rebased)
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 0c57e4e (Fix)
<<<<<<< HEAD
>>>>>>> 8887ba5b (Fix)
=======
=======
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5e31aeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 53db2224 (Featire specs)
=======
=======
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 3be4d14 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1b8f36d8 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 551c6ab (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 56531f25 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
>>>>>>> 35d17b9 (Manifest_cache true)
>>>>>>> fd310ed (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 86229876 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> add330c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 42e9c2e (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 16ebb0ff (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 15bff2e (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> c0159bf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1d0f5cbf (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 6c71f00 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> ca274ec (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a56ba36d (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 0b43b18 (Manifest_cache true)
>>>>>>> 1cce66c (Manifest_cache true)
>>>>>>> d365be68 (Manifest_cache true)
        
      
  
      
    
      spec/factories/addresses.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      2 relevant lines.
      2 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            FactoryBot.define do
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

              factory :address do
          
        3. 
        
        
      
        
        
          
      3. 
            
            

            

              end
          
        4. 
        
        
      
        
        
          
      4. 
            
            

            

            end
          
        5. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/factories/admin_users.rb
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> d52f9efe (Featire specs)
=======
=======
>>>>>>> 311e9fa (Rebased)
=======
>>>>>>> 932dbec (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 02a399d (Manifest_cache true)
=======
>>>>>>> bd8bda4 (Manifest_cache true)
=======
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
=======
=======
=======
>>>>>>> 84809242 (Featire specs)
=======
>>>>>>> c59d1a99 (Manifest_cache true)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> bd8bda4 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> aa7b40c (Manifest_cache true)
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 86d584a (Manifest_cache true)
>>>>>>> 1d6a89b5 (Manifest_cache true)
        
      
  
      
    
      spec/factories/authors.rb
      
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
        
      
  
      
    
      spec/factories/authors.rb
      
>>>>>>> 752f0c0 (Featire specs)
=======
        
      
  
      
    
      spec/factories/authors.rb
      
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 490b01d6 (Manifest_cache true)
=======
>>>>>>> 13fca83d (Rebased)
=======
>>>>>>> f136376a (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> d9d85ca6 (Fix)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> ef483b6d (Fix)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 53db2224 (Featire specs)
=======
>>>>>>> 1049b80c (Fix)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> e055dd0 (Rebased)
>>>>>>> bdc24a1a (Rebased)
=======
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> 9e081dc (Fix)
=======
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
=======
>>>>>>> 932dbec (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> f92a45b (Featire specs)
=======
>>>>>>> 715fac2 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> bd8bda4 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f92a45b (Featire specs)
=======
>>>>>>> 0e864a5 (Manifest_cache true)
=======
=======
>>>>>>> 715fac2 (Featire specs)
>>>>>>> fb61c5a (Featire specs)
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> aa7b40c (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 551c6ab (Manifest_cache true)
>>>>>>> e9f3851 (Manifest_cache true)
=======
=======
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd310ed (Manifest_cache true)
=======
>>>>>>> 1cce66c (Manifest_cache true)
>>>>>>> d782a28 (Manifest_cache true)
=======
=======
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 35d17b9 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 86229876 (Manifest_cache true)
=======
>>>>>>> 16ebb0ff (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
=======
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 02a399d (Manifest_cache true)
=======
>>>>>>> bd8bda4 (Manifest_cache true)
=======
>>>>>>> aa7b40c (Manifest_cache true)
=======
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4367ccb1 (Manifest_cache true)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4fac471d (Manifest_cache true)
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
=======
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> 64dceec (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d52f9efe (Featire specs)
=======
=======
=======
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d34a0770 (Manifest_cache true)
=======
=======
=======
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> d782a28 (Manifest_cache true)
>>>>>>> bd30d038 (Manifest_cache true)
=======
>>>>>>> d4235040 (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 8cbdfeb (Manifest_cache true)
>>>>>>> 4367ccb1 (Manifest_cache true)
=======
>>>>>>> 4fac471d (Manifest_cache true)
=======
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
>>>>>>> 0e864a5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> cc390719 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 5507b42 (Featire specs)
>>>>>>> 5e31aeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 53db2224 (Featire specs)
=======
=======
>>>>>>> e9f3851 (Manifest_cache true)
>>>>>>> 3be4d14 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1b8f36d8 (Manifest_cache true)
=======
=======
>>>>>>> d782a28 (Manifest_cache true)
>>>>>>> 551c6ab (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 56531f25 (Manifest_cache true)
=======
=======
>>>>>>> fd310ed (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 86229876 (Manifest_cache true)
=======
=======
=======
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> add330c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 42e9c2e (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 16ebb0ff (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 15bff2e (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> c0159bf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1d0f5cbf (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> 6c71f00 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> ca274ec (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a56ba36d (Manifest_cache true)
=======
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 715fac2 (Featire specs)
<<<<<<< HEAD
>>>>>>> fb61c5a (Featire specs)
<<<<<<< HEAD
>>>>>>> 73f364d8 (Featire specs)
=======
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 0b43b18 (Manifest_cache true)
>>>>>>> 1cce66c (Manifest_cache true)
>>>>>>> d365be68 (Manifest_cache true)
        
      
  
      
    
      spec/factories/authors.rb
      
<<<<<<< HEAD
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
>>>>>>> 84003439 (Featire specs)
=======
=======
        
      
  
      
    
      spec/factories/authors.rb
      
<<<<<<< HEAD
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 34509eee (Featire specs)
=======
>>>>>>> 75fa7e1b (Rebased)
=======
=======
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84809242 (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 53db2224 (Featire specs)
=======
>>>>>>> 7b22ad7e (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 932dbec (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
        
      
  
      
    
      spec/factories/authors.rb
      
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> bf05825 (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 973ba8c (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
        
      
  
      
    
      spec/factories/authors.rb
      
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
        
      
  
      
    
      spec/factories/authors.rb
      
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 37e48018 (Featire specs)
=======
        
      
  
      
    
      spec/factories/authors.rb
      
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> 13fca83d (Rebased)
=======
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376a (Featire specs)
=======
=======
=======
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0ea (Featire specs)
=======
=======
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888bf (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
        
      
  
      
    
      spec/factories/authors.rb
      
>>>>>>> 4552227 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 393eff3b (Featire specs)
=======
=======
>>>>>>> 5b7749a (Fix)
>>>>>>> d9d85ca6 (Fix)
=======
=======
>>>>>>> ebcdce06 (Featire specs)
        
      
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> bd8bda4 (Manifest_cache true)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> aa7b40c (Manifest_cache true)
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
        
      
>>>>>>> 9bfbd88 (Featire specs)
  
      
    
      spec/decorators/book_decorator_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      15 relevant lines.
      15 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            RSpec.describe BookDecorator do
          
        2. 
        
        
      
        
        
          
      2. 
            4
            

            

              subject(:decorated_object) { described_class.new(book) }
          
        3. 
        
        
      
        
        
          
      3. 
            
            

            

            
          
        4. 
        
        
      
        
        
          
      4. 
            1
            

            

              let(:book) do
          
        5. 
        
        
      
        
        
          
      5. 
            3
            

            

                create(:book, price_cents: 123, authors: authors, categories: categories,
          
        6. 
        
        
      
        
        
          
      6. 
            
            

            

                              categories_count: 0,
          
        7. 
        
        
      
        
        
          
      7. 
            
            

            

                              authors_count: 0)
          
        8. 
        
        
      
        
        
          
      8. 
            
            

            

              end
          
        9. 
        
        
      
        
        
          
      9. 
            1
            

            

              let(:authors) do
          
        10. 
        
        
      
        
        
          
      10. 
            
            

            

                [
          
        11. 
        
        
      
        
        
          
      11. 
            3
            

            

                  create(:author, first_name: FFaker::Name.first_name, last_name: FFaker::Name.last_name),
          
        12. 
        
        
      
        
        
          
      12. 
            
            

            

                  create(:author, first_name: FFaker::Name.first_name, last_name: FFaker::Name.last_name)
          
        13. 
        
        
      
        
        
          
      13. 
            
            

            

                ]
          
        14. 
        
        
      
        
        
          
      14. 
            
            

            

              end
          
        15. 
        
        
      
        
        
          
      15. 
            1
            

            

              let(:categories) do
          
        16. 
        
        
      
        
        
          
      16. 
            
            

            

                [
          
        17. 
        
        
      
        
        
          
      17. 
            3
            

            

                  create(:category, name: FFaker::Book.genre),
          
        18. 
        
        
      
        
        
          
      18. 
            
            

            

                  create(:category, name: FFaker::Book.genre)
          
        19. 
        
        
      
        
        
          
      19. 
            
            

            

                ]
          
        20. 
        
        
      
        
        
          
      20. 
            
            

            

              end
          
        21. 
        
        
      
        
        
          
      21. 
            
            

            

            
          
        22. 
        
        
      
        
        
          
      22. 
            1
            

            

              describe '#categories_names' do
          
        23. 
        
        
      
        
        
          
      23. 
            2
            

            

                it { expect(decorated_object.categories_names).to eq("#{categories.first.name}, #{categories.last.name}") }
          
        24. 
        
        
      
        
        
          
      24. 
            
            

            

              end
          
        25. 
        
        
      
        
        
          
      25. 
            
            

            

            
          
        26. 
        
        
      
        
        
          
      26. 
            1
            

            

              describe '#authors_names' do
          
        27. 
        
        
      
        
        
          
      27. 
            1
            

            

                it {
          
        28. 
        
        
      
        
        
          
      28. 
            1
            

            

                  expect(decorated_object.authors_names).to eq("#{authors.first.first_name} #{authors.first.last_name}, " \
          
        29. 
        
        
      
        
        
          
      29. 
            
            

            

                                                                  "#{authors.last.first_name} #{authors.last.last_name}")
          
        30. 
        
        
      
        
        
          
      30. 
            
            

            

                }
          
        31. 
        
        
      
        
        
          
      31. 
            
            

            

              end
          
        32. 
        
        
      
        
        
          
      32. 
            
            

            

            
          
        33. 
        
        
      
        
        
          
      33. 
            1
            

            

              describe '#price' do
          
        34. 
        
        
      
        
        
          
      34. 
            2
            

            

                it { expect(decorated_object.price).to eq(1.23.to_money) }
          
        35. 
        
        
      
        
        
          
      35. 
            
            

            

              end
          
        36. 
        
        
      
        
        
          
      36. 
            
            

            

            end
          
        37. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/factories/addresses.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      2 relevant lines.
      2 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            FactoryBot.define do
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

              factory :address do
          
        3. 
        
        
      
        
        
          
      3. 
            
            

            

              end
          
        4. 
        
        
      
        
        
          
      4. 
            
            

            

            end
          
        5. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/factories/admin_users.rb
      
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 11792758 (Rebased)
=======
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
=======
>>>>>>> 8f42922 (Featire specs)
=======
=======
=======
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
>>>>>>> 563720e (Featire specs)
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
        
      
  
      
    
      spec/factories/authors.rb
      
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> bf05825 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
        
      
  
      
    
      spec/factories/authors.rb
      
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
        
      
  
      
    
      spec/factories/authors.rb
      
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
        
      
  
      
    
      spec/factories/authors.rb
      
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> bc6bc8d2 (Rebased)
=======
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> d52f9efe (Featire specs)
=======
=======
=======
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> c12b71de (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
        
      
  
      
    
      spec/factories/authors.rb
      
>>>>>>> 4552227 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b904d7ae (Featire specs)
=======
=======
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
>>>>>>> ef483b6d (Fix)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 96394f1 (Featire specs)
=======
        
      
  
      
    
      spec/factories/authors.rb
      
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
        
      
  
      
    
      spec/factories/authors.rb
      
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
        
      
  
      
    
      spec/factories/authors.rb
      
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5e31aeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 53db2224 (Featire specs)
=======
=======
=======
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
=======
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
=======
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
=======
=======
        
      
  
      
    
      spec/factories/authors.rb
      
>>>>>>> 4552227 (Featire specs)
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 392646b5 (Featire specs)
=======
=======
=======
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      4 relevant lines.
      4 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            FactoryBot.define do
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 365d41ed (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
>>>>>>> 13fca83d (Rebased)
=======
>>>>>>> f136376a (Featire specs)
=======
>>>>>>> 1ca9c0ea (Featire specs)
=======
>>>>>>> 4bf888bf (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 393eff3b (Featire specs)
=======
>>>>>>> d9d85ca6 (Fix)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> c12b71de (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> b904d7ae (Featire specs)
=======
>>>>>>> ef483b6d (Fix)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> bdc24a1a (Rebased)
=======
>>>>>>> 53db2224 (Featire specs)
=======
>>>>>>> 7b22ad7e (Featire specs)
=======
>>>>>>> b97bb382 (Featire specs)
=======
>>>>>>> 4a2f2ad8 (Featire specs)
=======
>>>>>>> 21873de0 (Featire specs)
=======
>>>>>>> 392646b5 (Featire specs)
=======
>>>>>>> 1049b80c (Fix)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> e055dd0 (Rebased)
=======
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 973ba8c (Featire specs)
=======
>>>>>>> 8181d13 (Featire specs)
=======
>>>>>>> 72b9cab (Featire specs)
=======
>>>>>>> 15c51b7 (Featire specs)
=======
>>>>>>> 9e081dc (Fix)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> 53db2224 (Featire specs)
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f136376a (Featire specs)
=======
=======
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1ca9c0ea (Featire specs)
=======
=======
>>>>>>> 7b22ad7e (Featire specs)
=======
>>>>>>> b97bb382 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888bf (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> efd6af09 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 5507b42 (Featire specs)
>>>>>>> d52f9efe (Featire specs)
=======
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> ae07231a (Featire specs)
=======
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> c12b71de (Featire specs)
=======
=======
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 392646b5 (Featire specs)
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
              factory :admin_user do
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
              factory :admin_user do
=======
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 393eff3b (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> 37e48018 (Featire specs)
=======
              factory :admin_user do
=======
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 36356d3 (Featire specs)
>>>>>>> b904d7ae (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
>>>>>>> 5507b42 (Featire specs)
>>>>>>> 5e31aeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 53db2224 (Featire specs)
=======
=======
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> 973ba8c (Featire specs)
>>>>>>> b97bb382 (Featire specs)
              factory :admin_user do
=======
              factory :author do
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
              factory :author do
>>>>>>> 752f0c0 (Featire specs)
=======
              factory :author do
>>>>>>> 4e81ea2 (Featire specs)
=======
              factory :author do
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
              factory :author do
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 34509eee (Featire specs)
=======
              factory :admin_user do
>>>>>>> 75fa7e1b (Rebased)
=======
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 53db2224 (Featire specs)
=======
>>>>>>> 7b22ad7e (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 365d41ed (Featire specs)
=======
>>>>>>> c05ee511 (Featire specs)
=======
>>>>>>> f136376a (Featire specs)
=======
>>>>>>> 1ca9c0ea (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
              factory :author do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
              factory :author do
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 973ba8c (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
=======
              factory :author do
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
=======
              factory :author do
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
              factory :author do
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 4e81ea2 (Featire specs)
=======
              factory :author do
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
              factory :author do
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
              factory :admin_user do
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> 13fca83d (Rebased)
=======
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376a (Featire specs)
=======
=======
=======
=======
              factory :author do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0ea (Featire specs)
=======
=======
=======
              factory :author do
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888bf (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
=======
              factory :author do
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
>>>>>>> b904d7ae (Featire specs)
=======
=======
              factory :author do
>>>>>>> 4552227 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 393eff3b (Featire specs)
=======
=======
              factory :admin_user do
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
>>>>>>> d9d85ca6 (Fix)
=======
              factory :admin_user do
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
              factory :author do
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 37e48018 (Featire specs)
=======
              factory :admin_user do
>>>>>>> 11792758 (Rebased)
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
              factory :author do
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
=======
              factory :author do
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
=======
              factory :author do
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
              factory :author do
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 4e81ea2 (Featire specs)
=======
              factory :author do
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
              factory :author do
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
              factory :admin_user do
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> bc6bc8d2 (Rebased)
=======
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> d52f9efe (Featire specs)
=======
=======
=======
=======
              factory :author do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
=======
              factory :author do
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> c12b71de (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
=======
              factory :author do
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> b904d7ae (Featire specs)
=======
=======
              factory :admin_user do
>>>>>>> 5b7749a (Fix)
>>>>>>> ef483b6d (Fix)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
              factory :author do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 0676508 (Featire specs)
=======
              factory :author do
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
=======
              factory :author do
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
              factory :author do
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
=======
              factory :author do
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
              factory :admin_user do
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5e31aeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 53db2224 (Featire specs)
=======
=======
=======
=======
              factory :author do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
              factory :author do
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
=======
=======
              factory :author do
>>>>>>> 08edf50 (Featire specs)
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
=======
=======
              factory :author do
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
=======
=======
              factory :author do
>>>>>>> 4552227 (Featire specs)
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 392646b5 (Featire specs)
=======
=======
=======
              factory :admin_user do
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
              factory :author do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
=======
              factory :author do
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
=======
              factory :author do
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
        3. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      3. 
            13
=======
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> c12b71de (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> ef483b6d (Fix)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> bdc24a1a (Rebased)
=======
>>>>>>> 8887ba5b (Fix)
=======
>>>>>>> 53db2224 (Featire specs)
=======
>>>>>>> 7b22ad7e (Featire specs)
=======
>>>>>>> b97bb382 (Featire specs)
=======
>>>>>>> 4a2f2ad8 (Featire specs)
=======
>>>>>>> 21873de0 (Featire specs)
=======
>>>>>>> 392646b5 (Featire specs)
=======
>>>>>>> 1049b80c (Fix)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
=======
>>>>>>> 36356d3 (Featire specs)
>>>>>>> b904d7ae (Featire specs)
          
      4. 
            15
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> 311e9fa (Rebased)
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> e055dd0 (Rebased)
=======
>>>>>>> 0c57e4e (Fix)
=======
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 973ba8c (Featire specs)
=======
>>>>>>> 8181d13 (Featire specs)
=======
>>>>>>> 72b9cab (Featire specs)
=======
>>>>>>> 15c51b7 (Featire specs)
=======
>>>>>>> 9e081dc (Fix)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      5. 
            13
=======
          
      6. 
            1
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
          
      7. 
            15
=======
          
      8. 
            1
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
          
      9. 
            1
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
<<<<<<< HEAD
          
      10. 
            15
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 448bef30 (Featire specs)
=======
          
      11. 
            1
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      12. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> 37e48018 (Featire specs)
=======
          
      13. 
            1
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
          
      14. 
            1
>>>>>>> 75fa7e1b (Rebased)
=======
          
      15. 
            15
>>>>>>> 67ab5299 (Fix)
=======
=======
>>>>>>> d8dd3b4a (Featire specs)
=======
>>>>>>> 5a2009f1 (Fix)
=======
>>>>>>> 365d41ed (Featire specs)
=======
>>>>>>> c05ee511 (Featire specs)
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
>>>>>>> 13fca83d (Rebased)
=======
>>>>>>> ae884b47 (Fix)
=======
>>>>>>> f136376a (Featire specs)
=======
>>>>>>> 1ca9c0ea (Featire specs)
=======
>>>>>>> 4bf888bf (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
=======
>>>>>>> d9d85ca6 (Fix)
=======
>>>>>>> 36356d3 (Featire specs)
>>>>>>> 393eff3b (Featire specs)
          
      16. 
            15
=======
=======
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> 311e9fa (Rebased)
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> e1ecabbe (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> ed32b84 (Featire specs)
=======
          
      17. 
            15
=======
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
          
      18. 
            13
=======
          
      19. 
            1
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
=======
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 6cdb2e1 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
          
      20. 
            15
=======
          
      21. 
            1
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
          
      22. 
            1
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
<<<<<<< HEAD
          
      23. 
            15
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
          
      24. 
            1
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      25. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
<<<<<<< HEAD
=======
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
          
      26. 
            1
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> b904d7ae (Featire specs)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
          
      27. 
            1
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> 13fca83d (Rebased)
=======
=======
=======
          
      28. 
            15
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> ae884b47 (Fix)
=======
=======
=======
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 6fba6be (Featire specs)
          
      29. 
            15
=======
          
      30. 
            1
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376a (Featire specs)
=======
=======
=======
=======
          
      31. 
            1
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0ea (Featire specs)
=======
=======
=======
=======
          
      32. 
            1
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4bf888bf (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
          
      33. 
            1
>>>>>>> 4552227 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 393eff3b (Featire specs)
=======
=======
          
      34. 
            15
>>>>>>> 5b7749a (Fix)
>>>>>>> d9d85ca6 (Fix)
=======
          
      35. 
            13
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> 37e48018 (Featire specs)
=======
          
      36. 
            1
>>>>>>> 11792758 (Rebased)
=======
          
      37. 
            15
>>>>>>> 31d15e66 (Fix)
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 8181d13 (Featire specs)
=======
=======
          
      38. 
            1
<<<<<<< HEAD
>>>>>>> 4552227 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
=======
          
      39. 
            15
>>>>>>> 5b7749a (Fix)
=======
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
=======
>>>>>>> 0676508 (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
          
      40. 
            1
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
          
      41. 
            1
>>>>>>> 4552227 (Featire specs)
>>>>>>> 6fba6be (Featire specs)
=======
          
      42. 
            15
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
          
      43. 
            15
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e18eb87 (Fix)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
=======
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 659083f (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
=======
=======
          
      44. 
            1
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      45. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
=======
=======
=======
          
      46. 
            1
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
=======
=======
          
      47. 
            1
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> e055dd0 (Rebased)
=======
=======
          
      48. 
            15
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 0c57e4e (Fix)
=======
=======
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
          
      49. 
            15
=======
          
      50. 
            1
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5e31aeb (Featire specs)
=======
=======
=======
          
      51. 
            1
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 51bc18c (Featire specs)
=======
=======
=======
          
      52. 
            1
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> 973ba8c (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> b904d7ae (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> ef483b6d (Fix)
=======
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> bdc24a1a (Rebased)
=======
>>>>>>> 53db2224 (Featire specs)
=======
>>>>>>> 7b22ad7e (Featire specs)
=======
>>>>>>> b97bb382 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 0676508 (Featire specs)
>>>>>>> 448bef30 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
          
      53. 
            1
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
<<<<<<< HEAD
          
      54. 
            15
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> fdab719f (Fix)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
          
      55. 
            1
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      56. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
          
      57. 
            1
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
          
      58. 
            1
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> bc6bc8d2 (Rebased)
=======
=======
=======
          
      59. 
            15
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> 8288136d (Fix)
=======
=======
=======
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
          
      60. 
            15
=======
          
      61. 
            1
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> d52f9efe (Featire specs)
=======
=======
=======
=======
          
      62. 
            1
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
=======
=======
          
      63. 
            1
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
>>>>>>> c12b71de (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 365d41ed (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
>>>>>>> 13fca83d (Rebased)
=======
>>>>>>> f136376a (Featire specs)
=======
>>>>>>> 1ca9c0ea (Featire specs)
=======
>>>>>>> 4bf888bf (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 393eff3b (Featire specs)
=======
>>>>>>> d9d85ca6 (Fix)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> c12b71de (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> e055dd0 (Rebased)
=======
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 973ba8c (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> 53db2224 (Featire specs)
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f136376a (Featire specs)
=======
=======
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1ca9c0ea (Featire specs)
=======
=======
>>>>>>> 7b22ad7e (Featire specs)
=======
>>>>>>> b97bb382 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> 4bf888bf (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> efd6af09 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 5507b42 (Featire specs)
>>>>>>> d52f9efe (Featire specs)
=======
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> ae07231a (Featire specs)
=======
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> c12b71de (Featire specs)
                email { FFaker::Internet.email }
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
                email { FFaker::Internet.email }
=======
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 393eff3b (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> 37e48018 (Featire specs)
=======
                email { FFaker::Internet.email }
=======
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 36356d3 (Featire specs)
>>>>>>> b904d7ae (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
>>>>>>> 5507b42 (Featire specs)
>>>>>>> 5e31aeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 53db2224 (Featire specs)
=======
=======
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
=======
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
=======
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
=======
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 392646b5 (Featire specs)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
                email { FFaker::Internet.email }
=======
                first_name { FFaker::Name.first_name }
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
                first_name { FFaker::Name.first_name }
>>>>>>> 752f0c0 (Featire specs)
=======
                first_name { FFaker::Name.first_name }
>>>>>>> 4e81ea2 (Featire specs)
=======
                first_name { FFaker::Name.first_name }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
                first_name { FFaker::Name.first_name }
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 34509eee (Featire specs)
=======
                email { FFaker::Internet.email }
>>>>>>> 75fa7e1b (Rebased)
=======
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 53db2224 (Featire specs)
=======
>>>>>>> 7b22ad7e (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 365d41ed (Featire specs)
=======
>>>>>>> c05ee511 (Featire specs)
=======
>>>>>>> f136376a (Featire specs)
=======
>>>>>>> 1ca9c0ea (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
                first_name { FFaker::Name.first_name }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
                first_name { FFaker::Name.first_name }
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 973ba8c (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
=======
                first_name { FFaker::Name.first_name }
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
=======
                first_name { FFaker::Name.first_name }
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
                first_name { FFaker::Name.first_name }
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 4e81ea2 (Featire specs)
=======
                first_name { FFaker::Name.first_name }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
                first_name { FFaker::Name.first_name }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
                email { FFaker::Internet.email }
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> 13fca83d (Rebased)
=======
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376a (Featire specs)
=======
=======
=======
=======
                first_name { FFaker::Name.first_name }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0ea (Featire specs)
=======
=======
=======
                first_name { FFaker::Name.first_name }
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888bf (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
=======
                first_name { FFaker::Name.first_name }
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
>>>>>>> b904d7ae (Featire specs)
=======
=======
                first_name { FFaker::Name.first_name }
>>>>>>> 4552227 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 393eff3b (Featire specs)
=======
=======
                email { FFaker::Internet.email }
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
>>>>>>> d9d85ca6 (Fix)
=======
                email { FFaker::Internet.email }
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
                first_name { FFaker::Name.first_name }
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 37e48018 (Featire specs)
=======
                email { FFaker::Internet.email }
>>>>>>> 11792758 (Rebased)
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
                first_name { FFaker::Name.first_name }
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
=======
                first_name { FFaker::Name.first_name }
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
=======
                first_name { FFaker::Name.first_name }
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
                first_name { FFaker::Name.first_name }
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 4e81ea2 (Featire specs)
=======
                first_name { FFaker::Name.first_name }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
                first_name { FFaker::Name.first_name }
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
                email { FFaker::Internet.email }
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> bc6bc8d2 (Rebased)
=======
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> d52f9efe (Featire specs)
=======
=======
=======
=======
                first_name { FFaker::Name.first_name }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
=======
                first_name { FFaker::Name.first_name }
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> c12b71de (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
=======
                first_name { FFaker::Name.first_name }
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> b904d7ae (Featire specs)
=======
=======
                email { FFaker::Internet.email }
>>>>>>> 5b7749a (Fix)
>>>>>>> ef483b6d (Fix)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
                first_name { FFaker::Name.first_name }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 0676508 (Featire specs)
=======
                first_name { FFaker::Name.first_name }
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
=======
                first_name { FFaker::Name.first_name }
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
                first_name { FFaker::Name.first_name }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
=======
                first_name { FFaker::Name.first_name }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
                email { FFaker::Internet.email }
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5e31aeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 53db2224 (Featire specs)
=======
=======
=======
=======
                first_name { FFaker::Name.first_name }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
                first_name { FFaker::Name.first_name }
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
=======
=======
                first_name { FFaker::Name.first_name }
>>>>>>> 08edf50 (Featire specs)
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
=======
=======
                first_name { FFaker::Name.first_name }
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
=======
=======
                first_name { FFaker::Name.first_name }
>>>>>>> 4552227 (Featire specs)
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 392646b5 (Featire specs)
=======
=======
=======
                email { FFaker::Internet.email }
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
                first_name { FFaker::Name.first_name }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
=======
                first_name { FFaker::Name.first_name }
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
=======
                first_name { FFaker::Name.first_name }
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
        64. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      64. 
            13
=======
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
          
      65. 
            15
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
          
      66. 
            13
=======
          
      67. 
            1
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      68. 
            1
>>>>>>> 752f0c0 (Featire specs)
=======
          
      69. 
            1
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      70. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> 37e48018 (Featire specs)
=======
          
      71. 
            1
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
          
      72. 
            1
>>>>>>> 75fa7e1b (Rebased)
=======
          
      73. 
            15
>>>>>>> 67ab5299 (Fix)
=======
=======
>>>>>>> d8dd3b4a (Featire specs)
=======
>>>>>>> 5a2009f1 (Fix)
=======
>>>>>>> 365d41ed (Featire specs)
=======
>>>>>>> c05ee511 (Featire specs)
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
>>>>>>> 13fca83d (Rebased)
=======
>>>>>>> ae884b47 (Fix)
=======
>>>>>>> f136376a (Featire specs)
=======
>>>>>>> 1ca9c0ea (Featire specs)
=======
>>>>>>> 4bf888bf (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 393eff3b (Featire specs)
=======
>>>>>>> d9d85ca6 (Fix)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> c12b71de (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> b904d7ae (Featire specs)
=======
>>>>>>> ef483b6d (Fix)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> bdc24a1a (Rebased)
=======
>>>>>>> 8887ba5b (Fix)
=======
>>>>>>> 53db2224 (Featire specs)
=======
>>>>>>> 7b22ad7e (Featire specs)
=======
>>>>>>> b97bb382 (Featire specs)
=======
>>>>>>> 4a2f2ad8 (Featire specs)
=======
>>>>>>> 21873de0 (Featire specs)
=======
>>>>>>> 392646b5 (Featire specs)
=======
>>>>>>> 1049b80c (Fix)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
          
      74. 
            15
=======
=======
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> 311e9fa (Rebased)
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> bf05825 (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 416166f (Featire specs)
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> e055dd0 (Rebased)
=======
>>>>>>> 0c57e4e (Fix)
=======
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 973ba8c (Featire specs)
=======
>>>>>>> 8181d13 (Featire specs)
=======
>>>>>>> 72b9cab (Featire specs)
=======
>>>>>>> 15c51b7 (Featire specs)
=======
>>>>>>> 9e081dc (Fix)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      75. 
            15
=======
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      76. 
            13
=======
          
      77. 
            1
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
=======
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 6cdb2e1 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> b904d7ae (Featire specs)
          
      78. 
            15
=======
          
      79. 
            1
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
          
      80. 
            1
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
<<<<<<< HEAD
          
      81. 
            15
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
          
      82. 
            1
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      83. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> e1ecabbe (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
<<<<<<< HEAD
=======
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
          
      84. 
            1
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> b904d7ae (Featire specs)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
          
      85. 
            1
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> 13fca83d (Rebased)
=======
=======
=======
          
      86. 
            15
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> ae884b47 (Fix)
=======
=======
=======
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 6fba6be (Featire specs)
          
      87. 
            15
=======
          
      88. 
            1
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376a (Featire specs)
=======
=======
=======
=======
          
      89. 
            1
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0ea (Featire specs)
=======
=======
=======
=======
          
      90. 
            1
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4bf888bf (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
          
      91. 
            1
>>>>>>> 4552227 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 393eff3b (Featire specs)
=======
=======
          
      92. 
            15
>>>>>>> 5b7749a (Fix)
>>>>>>> d9d85ca6 (Fix)
=======
          
      93. 
            13
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> 37e48018 (Featire specs)
=======
          
      94. 
            1
>>>>>>> 11792758 (Rebased)
=======
          
      95. 
            15
>>>>>>> 31d15e66 (Fix)
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 8181d13 (Featire specs)
=======
=======
          
      96. 
            1
<<<<<<< HEAD
>>>>>>> 4552227 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
=======
          
      97. 
            15
>>>>>>> 5b7749a (Fix)
=======
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
=======
>>>>>>> 0676508 (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
          
      98. 
            1
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
          
      99. 
            1
>>>>>>> 4552227 (Featire specs)
>>>>>>> 6fba6be (Featire specs)
=======
          
      100. 
            15
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
          
      101. 
            15
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e18eb87 (Fix)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
=======
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 659083f (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
=======
=======
          
      102. 
            1
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      103. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
=======
=======
=======
          
      104. 
            1
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
=======
=======
          
      105. 
            1
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> e055dd0 (Rebased)
=======
=======
          
      106. 
            15
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 0c57e4e (Fix)
=======
=======
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
          
      107. 
            15
=======
          
      108. 
            1
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5e31aeb (Featire specs)
=======
=======
=======
          
      109. 
            1
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 51bc18c (Featire specs)
=======
=======
=======
          
      110. 
            1
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> 973ba8c (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> b904d7ae (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> ef483b6d (Fix)
=======
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> bdc24a1a (Rebased)
=======
>>>>>>> 53db2224 (Featire specs)
=======
>>>>>>> 7b22ad7e (Featire specs)
=======
>>>>>>> b97bb382 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 0676508 (Featire specs)
>>>>>>> 448bef30 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
          
      111. 
            1
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
<<<<<<< HEAD
          
      112. 
            15
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> fdab719f (Fix)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
          
      113. 
            1
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      114. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
          
      115. 
            1
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
          
      116. 
            1
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> bc6bc8d2 (Rebased)
=======
=======
=======
          
      117. 
            15
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> 8288136d (Fix)
=======
=======
=======
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
          
      118. 
            15
=======
          
      119. 
            1
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> d52f9efe (Featire specs)
=======
=======
=======
=======
          
      120. 
            1
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
=======
=======
          
      121. 
            1
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
>>>>>>> c12b71de (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 365d41ed (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
>>>>>>> 13fca83d (Rebased)
=======
>>>>>>> f136376a (Featire specs)
=======
>>>>>>> 1ca9c0ea (Featire specs)
=======
>>>>>>> 4bf888bf (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 393eff3b (Featire specs)
=======
>>>>>>> d9d85ca6 (Fix)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> c12b71de (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> e055dd0 (Rebased)
=======
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 973ba8c (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> 53db2224 (Featire specs)
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f136376a (Featire specs)
=======
=======
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1ca9c0ea (Featire specs)
=======
=======
>>>>>>> 7b22ad7e (Featire specs)
=======
>>>>>>> b97bb382 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> 4bf888bf (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> efd6af09 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 5507b42 (Featire specs)
>>>>>>> d52f9efe (Featire specs)
=======
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> ae07231a (Featire specs)
=======
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> c12b71de (Featire specs)
                password { 'adminPassword' }
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
                password { 'adminPassword' }
=======
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 393eff3b (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> 37e48018 (Featire specs)
=======
                password { 'adminPassword' }
=======
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 36356d3 (Featire specs)
>>>>>>> b904d7ae (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
>>>>>>> 5507b42 (Featire specs)
>>>>>>> 5e31aeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 53db2224 (Featire specs)
=======
=======
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
=======
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
=======
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
=======
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 392646b5 (Featire specs)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
                password { 'adminPassword' }
=======
                last_name { FFaker::Name.last_name }
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
                last_name { FFaker::Name.last_name }
>>>>>>> 752f0c0 (Featire specs)
=======
                last_name { FFaker::Name.last_name }
>>>>>>> 4e81ea2 (Featire specs)
=======
                last_name { FFaker::Name.last_name }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
                last_name { FFaker::Name.last_name }
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 34509eee (Featire specs)
=======
                password { 'adminPassword' }
>>>>>>> 75fa7e1b (Rebased)
=======
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 53db2224 (Featire specs)
=======
>>>>>>> 7b22ad7e (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 365d41ed (Featire specs)
=======
>>>>>>> c05ee511 (Featire specs)
=======
>>>>>>> f136376a (Featire specs)
=======
>>>>>>> 1ca9c0ea (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
                last_name { FFaker::Name.last_name }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
                last_name { FFaker::Name.last_name }
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 973ba8c (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
=======
                last_name { FFaker::Name.last_name }
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
=======
                last_name { FFaker::Name.last_name }
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
                last_name { FFaker::Name.last_name }
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 4e81ea2 (Featire specs)
=======
                last_name { FFaker::Name.last_name }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
                last_name { FFaker::Name.last_name }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
                password { 'adminPassword' }
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> 13fca83d (Rebased)
=======
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376a (Featire specs)
=======
=======
=======
=======
                last_name { FFaker::Name.last_name }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0ea (Featire specs)
=======
=======
=======
                last_name { FFaker::Name.last_name }
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888bf (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
=======
                last_name { FFaker::Name.last_name }
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
>>>>>>> b904d7ae (Featire specs)
=======
=======
                last_name { FFaker::Name.last_name }
>>>>>>> 4552227 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 393eff3b (Featire specs)
=======
=======
                password { 'adminPassword' }
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
>>>>>>> d9d85ca6 (Fix)
=======
                password { 'adminPassword' }
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
                last_name { FFaker::Name.last_name }
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 37e48018 (Featire specs)
=======
                password { 'adminPassword' }
>>>>>>> 11792758 (Rebased)
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
                last_name { FFaker::Name.last_name }
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
=======
                last_name { FFaker::Name.last_name }
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
=======
                last_name { FFaker::Name.last_name }
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
                last_name { FFaker::Name.last_name }
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 4e81ea2 (Featire specs)
=======
                last_name { FFaker::Name.last_name }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
                last_name { FFaker::Name.last_name }
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
                password { 'adminPassword' }
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> bc6bc8d2 (Rebased)
=======
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> d52f9efe (Featire specs)
=======
=======
=======
=======
                last_name { FFaker::Name.last_name }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
=======
                last_name { FFaker::Name.last_name }
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> c12b71de (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
=======
                last_name { FFaker::Name.last_name }
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> b904d7ae (Featire specs)
=======
=======
                password { 'adminPassword' }
>>>>>>> 5b7749a (Fix)
>>>>>>> ef483b6d (Fix)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
                last_name { FFaker::Name.last_name }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 0676508 (Featire specs)
=======
                last_name { FFaker::Name.last_name }
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
=======
                last_name { FFaker::Name.last_name }
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
                last_name { FFaker::Name.last_name }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
=======
                last_name { FFaker::Name.last_name }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
                password { 'adminPassword' }
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5e31aeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 53db2224 (Featire specs)
=======
=======
=======
=======
                last_name { FFaker::Name.last_name }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
                last_name { FFaker::Name.last_name }
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
=======
=======
                last_name { FFaker::Name.last_name }
>>>>>>> 08edf50 (Featire specs)
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
=======
=======
                last_name { FFaker::Name.last_name }
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
=======
=======
                last_name { FFaker::Name.last_name }
>>>>>>> 4552227 (Featire specs)
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 392646b5 (Featire specs)
=======
=======
=======
                password { 'adminPassword' }
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
                last_name { FFaker::Name.last_name }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
=======
                last_name { FFaker::Name.last_name }
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
=======
                last_name { FFaker::Name.last_name }
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
        122. 
        
        
      
        
        
          
      122. 
            
            

            

              end
          
        123. 
        
        
      
        
        
          
      123. 
            
            

            

            end
          
        124. 
        
        
      
    
      
  
      

      

      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
>>>>>>> 34509eee (Featire specs)
=======
>>>>>>> 75fa7e1b (Rebased)
=======
=======
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 365d41ed (Featire specs)
=======
>>>>>>> c05ee511 (Featire specs)
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
>>>>>>> 13fca83d (Rebased)
=======
>>>>>>> f136376a (Featire specs)
=======
>>>>>>> 1ca9c0ea (Featire specs)
=======
>>>>>>> 4bf888bf (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 393eff3b (Featire specs)
=======
>>>>>>> d9d85ca6 (Fix)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> c12b71de (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> b904d7ae (Featire specs)
=======
>>>>>>> ef483b6d (Fix)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> bdc24a1a (Rebased)
=======
>>>>>>> 53db2224 (Featire specs)
=======
>>>>>>> 7b22ad7e (Featire specs)
=======
>>>>>>> b97bb382 (Featire specs)
=======
>>>>>>> 4a2f2ad8 (Featire specs)
=======
>>>>>>> 21873de0 (Featire specs)
=======
>>>>>>> 392646b5 (Featire specs)
=======
>>>>>>> 1049b80c (Fix)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> f8e5c9db (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> 13fca83d (Rebased)
=======
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376a (Featire specs)
=======
=======
=======
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0ea (Featire specs)
=======
=======
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888bf (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 393eff3b (Featire specs)
=======
=======
>>>>>>> 5b7749a (Fix)
>>>>>>> d9d85ca6 (Fix)
=======
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 11792758 (Rebased)
=======
=======
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> bc6bc8d2 (Rebased)
=======
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> d52f9efe (Featire specs)
=======
=======
=======
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> c12b71de (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b904d7ae (Featire specs)
=======
=======
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
>>>>>>> ef483b6d (Fix)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> e055dd0 (Rebased)
=======
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 973ba8c (Featire specs)
=======
>>>>>>> 8181d13 (Featire specs)
=======
>>>>>>> 72b9cab (Featire specs)
=======
>>>>>>> 15c51b7 (Featire specs)
=======
>>>>>>> 9e081dc (Fix)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5e31aeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 53db2224 (Featire specs)
=======
=======
=======
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
=======
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
=======
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
=======
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 392646b5 (Featire specs)
=======
=======
=======
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
        
      
  
      
    
      spec/factories/authors.rb
      
    
      
      
  80.0%


      lines covered
    
      

    

    
      
      10 relevant lines.
      8 lines covered and
      2 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            FactoryBot.define do
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

              factory :author do
          
        3. 
        
        
      
        
        
          
      3. 
            5
            

            

                first_name { FFaker::Name.first_name }
          
        4. 
        
        
      
        
        
          
      4. 
            5
            

            

                last_name { FFaker::Name.last_name }
          
        5. 
        
        
      
        
        
          
      5. 
            
            

            

            
          
        6. 
        
        
      
        
        
          
      6. 
            1
            

            

                transient do
          
        7. 
        
        
      
        
        
          
      7. 
            1
            

            

                  books_count { 1 }
          
        8. 
        
        
      
        
        
          
      8. 
            
            

            

                end
          
        9. 
        
        
      
        
        
          
      9. 
            
            

            

            
          
        10. 
        
        
      
        
        
          
      10. 
            1
            

            

                after :create do |author, books_count|
          
        11. 
        
        
      
        
        
          
      11. 
            10
            

            

                  author.books do
          
        12. 
        
        
      
        
        
          
      12. 
            
            

            

                    Array.new(books_count) do
          
        13. 
        
        
      
        
        
          
      13. 
            
            

            

                      association(:author, books: [instance])
          
        14. 
        
        
      
        
        
          
      14. 
            
            

            

                    end
          
        15. 
        
        
      
        
        
          
      15. 
            
            

            

                  end
          
        16. 
        
        
      
        
        
          
      16. 
            
            

            

                end
          
        17. 
        
        
      
        
        
          
      17. 
            
            

            

              end
          
        18. 
        
        
      
        
        
          
      18. 
            
            

            

            end
          
        19. 
        
        
      
    
      
  
      

      

      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 34509eee (Featire specs)
=======
>>>>>>> 75fa7e1b (Rebased)
=======
=======
>>>>>>> 13fca83d (Rebased)
=======
>>>>>>> f136376a (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> d9d85ca6 (Fix)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> ef483b6d (Fix)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> bdc24a1a (Rebased)
=======
>>>>>>> 53db2224 (Featire specs)
=======
>>>>>>> 1049b80c (Fix)
=======
>>>>>>> f3d746cb (Featire specs)
=======
=======
>>>>>>> 311e9fa (Rebased)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> e055dd0 (Rebased)
=======
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> 9e081dc (Fix)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> 13fca83d (Rebased)
=======
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376a (Featire specs)
=======
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0ea (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888bf (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
>>>>>>> b904d7ae (Featire specs)
=======
=======
>>>>>>> 4552227 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 393eff3b (Featire specs)
=======
=======
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
>>>>>>> d9d85ca6 (Fix)
=======
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 11792758 (Rebased)
=======
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> d52f9efe (Featire specs)
=======
=======
>>>>>>> 311e9fa (Rebased)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> bc6bc8d2 (Rebased)
=======
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> d52f9efe (Featire specs)
=======
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> c12b71de (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> b904d7ae (Featire specs)
=======
=======
>>>>>>> 5b7749a (Fix)
>>>>>>> ef483b6d (Fix)
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5e31aeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 53db2224 (Featire specs)
=======
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
=======
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
=======
=======
>>>>>>> 4552227 (Featire specs)
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 392646b5 (Featire specs)
=======
=======
=======
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
        
      
  
      
    
      spec/factories/authors_books.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      4 relevant lines.
      4 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            FactoryBot.define do
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

              factory :authors_book do
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

                author
          
        4. 
        
        
      
        
        
          
      4. 
            1
            

            

                book
          
        5. 
        
        
      
        
        
          
      5. 
            
            

            

              end
          
        6. 
        
        
      
        
        
          
      6. 
            
            

            

            end
          
        7. 
        
        
      
    
      
  
      

      

      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84809242 (Featire specs)
=======
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 365d41ed (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
>>>>>>> 13fca83d (Rebased)
=======
>>>>>>> f136376a (Featire specs)
=======
>>>>>>> 1ca9c0ea (Featire specs)
=======
>>>>>>> 4bf888bf (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 393eff3b (Featire specs)
=======
>>>>>>> d9d85ca6 (Fix)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> c12b71de (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> b904d7ae (Featire specs)
=======
>>>>>>> ef483b6d (Fix)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> bdc24a1a (Rebased)
=======
>>>>>>> 53db2224 (Featire specs)
=======
>>>>>>> 7b22ad7e (Featire specs)
=======
>>>>>>> b97bb382 (Featire specs)
=======
>>>>>>> 4a2f2ad8 (Featire specs)
=======
>>>>>>> 21873de0 (Featire specs)
=======
>>>>>>> 392646b5 (Featire specs)
=======
>>>>>>> 1049b80c (Fix)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> e055dd0 (Rebased)
=======
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 973ba8c (Featire specs)
=======
>>>>>>> 8181d13 (Featire specs)
=======
>>>>>>> 72b9cab (Featire specs)
=======
>>>>>>> 15c51b7 (Featire specs)
=======
>>>>>>> 9e081dc (Fix)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> 53db2224 (Featire specs)
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f136376a (Featire specs)
=======
=======
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1ca9c0ea (Featire specs)
=======
=======
>>>>>>> 7b22ad7e (Featire specs)
=======
>>>>>>> b97bb382 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888bf (Featire specs)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> efd6af09 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 5507b42 (Featire specs)
>>>>>>> d52f9efe (Featire specs)
=======
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> ae07231a (Featire specs)
=======
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> c12b71de (Featire specs)
=======
=======
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 392646b5 (Featire specs)
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
        
      
  
      
    
      spec/factories/billings.rb
      
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 393eff3b (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 36356d3 (Featire specs)
>>>>>>> b904d7ae (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
>>>>>>> 5507b42 (Featire specs)
>>>>>>> 5e31aeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 53db2224 (Featire specs)
=======
=======
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> 973ba8c (Featire specs)
>>>>>>> b97bb382 (Featire specs)
        
      
  
      
    
      spec/factories/billings.rb
      
=======
        
      
  
      
    
      spec/factories/books.rb
      
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 53db2224 (Featire specs)
=======
>>>>>>> 7b22ad7e (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
        
      
  
      
    
      spec/factories/books.rb
      
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
        
      
  
      
    
      spec/factories/books.rb
      
>>>>>>> 4e81ea2 (Featire specs)
=======
        
      
  
      
    
      spec/factories/books.rb
      
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> 37e48018 (Featire specs)
=======
        
      
  
      
    
      spec/factories/books.rb
      
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
        
      
  
      
    
      spec/factories/billings.rb
      
>>>>>>> 75fa7e1b (Rebased)
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 365d41ed (Featire specs)
=======
>>>>>>> c05ee511 (Featire specs)
=======
>>>>>>> f136376a (Featire specs)
=======
>>>>>>> 1ca9c0ea (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
        
      
  
      
    
      spec/factories/books.rb
      
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> c12b71de (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 7b22ad7e (Featire specs)
=======
>>>>>>> b97bb382 (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> bf05825 (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 973ba8c (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
        
      
  
      
    
      spec/factories/books.rb
      
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
        
      
  
      
    
      spec/factories/books.rb
      
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
        
      
  
      
    
      spec/factories/books.rb
      
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
        
      
  
      
    
      spec/factories/billings.rb
      
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> 13fca83d (Rebased)
=======
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376a (Featire specs)
=======
=======
=======
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0ea (Featire specs)
=======
=======
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888bf (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
        
      
  
      
    
      spec/factories/books.rb
      
>>>>>>> 4552227 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 393eff3b (Featire specs)
=======
=======
>>>>>>> ef483b6d (Fix)
=======
        
      
  
      
    
      spec/factories/billings.rb
      
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d9d85ca6 (Fix)
=======
        
      
  
      
    
      spec/factories/billings.rb
      
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> 37e48018 (Featire specs)
=======
        
      
  
      
    
      spec/factories/billings.rb
      
>>>>>>> 11792758 (Rebased)
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> bf05825 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
        
      
  
      
    
      spec/factories/books.rb
      
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
        
      
  
      
    
      spec/factories/books.rb
      
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
        
      
  
      
    
      spec/factories/books.rb
      
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
        
      
  
      
    
      spec/factories/billings.rb
      
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> bc6bc8d2 (Rebased)
=======
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> d52f9efe (Featire specs)
=======
=======
=======
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> c12b71de (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
        
      
  
      
    
      spec/factories/books.rb
      
>>>>>>> 4552227 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
>>>>>>> b904d7ae (Featire specs)
=======
>>>>>>> ef483b6d (Fix)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 96394f1 (Featire specs)
=======
        
      
  
      
    
      spec/factories/books.rb
      
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
        
      
  
      
    
      spec/factories/books.rb
      
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
        
      
  
      
    
      spec/factories/books.rb
      
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
        
      
  
      
    
      spec/factories/billings.rb
      
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5e31aeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 53db2224 (Featire specs)
=======
=======
=======
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
=======
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
=======
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
=======
=======
        
      
  
      
    
      spec/factories/books.rb
      
>>>>>>> 4552227 (Featire specs)
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 392646b5 (Featire specs)
=======
=======
=======
        
      
  
      
    
      spec/factories/billings.rb
      
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
    
      
      
  100.0%


      lines covered
    
      

    

    
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84809242 (Featire specs)
=======
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 365d41ed (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
>>>>>>> 13fca83d (Rebased)
=======
>>>>>>> f136376a (Featire specs)
=======
>>>>>>> 1ca9c0ea (Featire specs)
=======
>>>>>>> 4bf888bf (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 393eff3b (Featire specs)
=======
>>>>>>> d9d85ca6 (Fix)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> c12b71de (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> b904d7ae (Featire specs)
=======
>>>>>>> ef483b6d (Fix)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> bdc24a1a (Rebased)
=======
>>>>>>> 53db2224 (Featire specs)
=======
>>>>>>> 7b22ad7e (Featire specs)
=======
>>>>>>> b97bb382 (Featire specs)
=======
>>>>>>> 4a2f2ad8 (Featire specs)
=======
>>>>>>> 21873de0 (Featire specs)
=======
>>>>>>> 392646b5 (Featire specs)
=======
>>>>>>> 1049b80c (Fix)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> e055dd0 (Rebased)
=======
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 973ba8c (Featire specs)
=======
>>>>>>> 8181d13 (Featire specs)
=======
>>>>>>> 72b9cab (Featire specs)
=======
>>>>>>> 15c51b7 (Featire specs)
=======
>>>>>>> 9e081dc (Fix)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> 53db2224 (Featire specs)
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f136376a (Featire specs)
=======
=======
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1ca9c0ea (Featire specs)
=======
=======
>>>>>>> 7b22ad7e (Featire specs)
=======
>>>>>>> b97bb382 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888bf (Featire specs)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> efd6af09 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 5507b42 (Featire specs)
>>>>>>> d52f9efe (Featire specs)
=======
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> ae07231a (Featire specs)
=======
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> c12b71de (Featire specs)
=======
=======
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 392646b5 (Featire specs)
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
      8 relevant lines.
      8 lines covered and
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 393eff3b (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 36356d3 (Featire specs)
>>>>>>> b904d7ae (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
>>>>>>> 5507b42 (Featire specs)
>>>>>>> 5e31aeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 53db2224 (Featire specs)
=======
=======
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> 973ba8c (Featire specs)
>>>>>>> b97bb382 (Featire specs)
      8 relevant lines.
      8 lines covered and
=======
      9 relevant lines.
      9 lines covered and
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
      9 relevant lines.
      9 lines covered and
>>>>>>> 752f0c0 (Featire specs)
=======
      9 relevant lines.
      9 lines covered and
>>>>>>> 4e81ea2 (Featire specs)
=======
      9 relevant lines.
      9 lines covered and
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> 37e48018 (Featire specs)
=======
      9 relevant lines.
      9 lines covered and
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
      8 relevant lines.
      8 lines covered and
>>>>>>> 75fa7e1b (Rebased)
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 365d41ed (Featire specs)
=======
>>>>>>> c05ee511 (Featire specs)
=======
>>>>>>> f136376a (Featire specs)
=======
>>>>>>> 1ca9c0ea (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 53db2224 (Featire specs)
=======
>>>>>>> 7b22ad7e (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
      9 relevant lines.
      9 lines covered and
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> bf05825 (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 973ba8c (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
      9 relevant lines.
      9 lines covered and
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
      9 relevant lines.
      9 lines covered and
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
      9 relevant lines.
      9 lines covered and
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
      8 relevant lines.
      8 lines covered and
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> 13fca83d (Rebased)
=======
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376a (Featire specs)
=======
=======
=======
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0ea (Featire specs)
=======
=======
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888bf (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
      9 relevant lines.
      9 lines covered and
>>>>>>> 4552227 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 393eff3b (Featire specs)
=======
=======
>>>>>>> ef483b6d (Fix)
=======
      8 relevant lines.
      8 lines covered and
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d9d85ca6 (Fix)
=======
      8 relevant lines.
      8 lines covered and
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> 37e48018 (Featire specs)
=======
      8 relevant lines.
      8 lines covered and
>>>>>>> 11792758 (Rebased)
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
      9 relevant lines.
      9 lines covered and
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> bf05825 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
      9 relevant lines.
      9 lines covered and
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
      9 relevant lines.
      9 lines covered and
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
      9 relevant lines.
      9 lines covered and
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
      8 relevant lines.
      8 lines covered and
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> bc6bc8d2 (Rebased)
=======
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> d52f9efe (Featire specs)
=======
=======
=======
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> c12b71de (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
      9 relevant lines.
      9 lines covered and
>>>>>>> 4552227 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
>>>>>>> b904d7ae (Featire specs)
=======
>>>>>>> ef483b6d (Fix)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 96394f1 (Featire specs)
=======
      9 relevant lines.
      9 lines covered and
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
      9 relevant lines.
      9 lines covered and
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
      9 relevant lines.
      9 lines covered and
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
      8 relevant lines.
      8 lines covered and
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5e31aeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 53db2224 (Featire specs)
=======
=======
=======
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
=======
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
=======
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
=======
=======
      9 relevant lines.
      9 lines covered and
>>>>>>> 4552227 (Featire specs)
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 392646b5 (Featire specs)
=======
=======
=======
      8 relevant lines.
      8 lines covered and
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            FactoryBot.define do
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
>>>>>>> 34509eee (Featire specs)
=======
>>>>>>> 75fa7e1b (Rebased)
=======
=======
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 365d41ed (Featire specs)
=======
>>>>>>> c05ee511 (Featire specs)
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
>>>>>>> 13fca83d (Rebased)
=======
>>>>>>> f136376a (Featire specs)
=======
>>>>>>> 1ca9c0ea (Featire specs)
=======
>>>>>>> 4bf888bf (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 393eff3b (Featire specs)
=======
>>>>>>> d9d85ca6 (Fix)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> c12b71de (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> b904d7ae (Featire specs)
=======
>>>>>>> ef483b6d (Fix)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> bdc24a1a (Rebased)
=======
>>>>>>> 53db2224 (Featire specs)
=======
>>>>>>> 7b22ad7e (Featire specs)
=======
>>>>>>> b97bb382 (Featire specs)
=======
>>>>>>> 4a2f2ad8 (Featire specs)
=======
>>>>>>> 21873de0 (Featire specs)
=======
>>>>>>> 392646b5 (Featire specs)
=======
>>>>>>> 1049b80c (Fix)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> f8e5c9db (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> 13fca83d (Rebased)
=======
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376a (Featire specs)
=======
=======
=======
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0ea (Featire specs)
=======
=======
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888bf (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 393eff3b (Featire specs)
=======
=======
>>>>>>> 5b7749a (Fix)
>>>>>>> d9d85ca6 (Fix)
              factory :billing do
=======
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 11792758 (Rebased)
=======
=======
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> bc6bc8d2 (Rebased)
=======
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> d52f9efe (Featire specs)
=======
=======
=======
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> c12b71de (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b904d7ae (Featire specs)
=======
=======
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
>>>>>>> ef483b6d (Fix)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> e055dd0 (Rebased)
=======
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 973ba8c (Featire specs)
=======
>>>>>>> 8181d13 (Featire specs)
=======
>>>>>>> 72b9cab (Featire specs)
=======
>>>>>>> 15c51b7 (Featire specs)
=======
>>>>>>> 9e081dc (Fix)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5e31aeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 53db2224 (Featire specs)
=======
=======
=======
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
=======
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
=======
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
=======
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 392646b5 (Featire specs)
=======
=======
=======
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
              factory :billing do
          
        3. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 7a08014b (Featire specs)
=======
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> d34a0770 (Manifest_cache true)
=======
>>>>>>> 824ea7c9 (Manifest_cache true)
=======
>>>>>>> bd30d038 (Manifest_cache true)
=======
>>>>>>> d4235040 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 4367ccb1 (Manifest_cache true)
=======
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4fac471d (Manifest_cache true)
=======
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
=======
>>>>>>> ef483b6d (Fix)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> e6fc67c7 (Featire specs)
=======
>>>>>>> cc390719 (Manifest_cache true)
=======
>>>>>>> bdc24a1a (Rebased)
=======
>>>>>>> 1b8f36d8 (Manifest_cache true)
=======
>>>>>>> 8a3779d4 (Manifest_cache true)
=======
>>>>>>> 56531f25 (Manifest_cache true)
=======
>>>>>>> 86229876 (Manifest_cache true)
=======
>>>>>>> 16ebb0ff (Manifest_cache true)
=======
>>>>>>> 0f24a043 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1d0f5cbf (Manifest_cache true)
=======
>>>>>>> b8c2784f (Fix book_spec decrease quantity and price)
=======
>>>>>>> a56ba36d (Manifest_cache true)
=======
>>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1049b80c (Fix)
=======
>>>>>>> 73f364d8 (Featire specs)
=======
>>>>>>> d365be68 (Manifest_cache true)
=======
>>>>>>> 0e864a5 (Manifest_cache true)
=======
>>>>>>> e055dd0 (Rebased)
=======
>>>>>>> 3be4d14 (Manifest_cache true)
=======
>>>>>>> a71befd (Manifest_cache true)
=======
>>>>>>> 551c6ab (Manifest_cache true)
=======
>>>>>>> fd310ed (Manifest_cache true)
=======
>>>>>>> 42e9c2e (Manifest_cache true)
=======
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
=======
>>>>>>> c0159bf (Manifest_cache true)
=======
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> ca274ec (Manifest_cache true)
=======
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9e081dc (Fix)
=======
>>>>>>> fb61c5a (Featire specs)
=======
>>>>>>> 1cce66c (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
>>>>>>> 0e864a5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> cc390719 (Manifest_cache true)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
          
      3. 
            1
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      4. 
            1
=======
          
      5. 
            3
>>>>>>> 02a399d (Manifest_cache true)
=======
=======
=======
>>>>>>> 715fac2 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
          
      6. 
            3
=======
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
          
      7. 
            82
=======
          
      8. 
            3
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
=======
          
      9. 
            80
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 7a08014b (Featire specs)
=======
          
      10. 
            3
>>>>>>> bd8bda4 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      11. 
            3
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> c59d1a99 (Manifest_cache true)
=======
=======
          
      12. 
            3
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
      13. 
            82
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
=======
          
      14. 
            3
>>>>>>> fd6db03 (Manifest_cache true)
=======
          
      15. 
            82
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
          
      16. 
            1
>>>>>>> 11792758 (Rebased)
=======
=======
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
=======
>>>>>>> f92a45b (Featire specs)
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
>>>>>>> 73f364d8 (Featire specs)
=======
>>>>>>> f92a45b (Featire specs)
=======
>>>>>>> 0e864a5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> cc390719 (Manifest_cache true)
=======
=======
=======
>>>>>>> 715fac2 (Featire specs)
>>>>>>> fb61c5a (Featire specs)
>>>>>>> 73f364d8 (Featire specs)
          
      17. 
            80
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      18. 
            3
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
      19. 
            80
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
=======
>>>>>>> e6fc67c7 (Featire specs)
=======
>>>>>>> cc390719 (Manifest_cache true)
=======
          
      20. 
            3
<<<<<<< HEAD
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
=======
>>>>>>> fd6db03 (Manifest_cache true)
=======
          
      21. 
            82
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
          
      22. 
            1
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bc6bc8d2 (Rebased)
=======
=======
>>>>>>> bdc24a1a (Rebased)
=======
>>>>>>> 1b8f36d8 (Manifest_cache true)
=======
=======
>>>>>>> 307f31f (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d782a28 (Manifest_cache true)
=======
>>>>>>> 35d17b9 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 64dceec (Manifest_cache true)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3be4d14 (Manifest_cache true)
=======
>>>>>>> a71befd (Manifest_cache true)
=======
=======
>>>>>>> d782a28 (Manifest_cache true)
>>>>>>> 551c6ab (Manifest_cache true)
=======
>>>>>>> fd310ed (Manifest_cache true)
=======
=======
>>>>>>> add330c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 42e9c2e (Manifest_cache true)
=======
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 15bff2e (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> c0159bf (Manifest_cache true)
=======
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 6c71f00 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> ca274ec (Manifest_cache true)
=======
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0b43b18 (Manifest_cache true)
>>>>>>> 1cce66c (Manifest_cache true)
          
      23. 
            1
=======
          
      24. 
            3
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d34a0770 (Manifest_cache true)
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> e9f3851 (Manifest_cache true)
=======
=======
>>>>>>> a71befd (Manifest_cache true)
          
      25. 
            82
=======
          
      26. 
            3
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 824ea7c9 (Manifest_cache true)
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      27. 
            3
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> bd30d038 (Manifest_cache true)
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      28. 
            3
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 35d17b9 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d4235040 (Manifest_cache true)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      29. 
            3
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      30. 
            82
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
          
      31. 
            3
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4367ccb1 (Manifest_cache true)
=======
=======
=======
          
      32. 
            82
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
      33. 
            3
>>>>>>> 998f08d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 64dceec (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4fac471d (Manifest_cache true)
=======
=======
=======
          
      34. 
            82
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
=======
=======
          
      35. 
            1
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
>>>>>>> ef483b6d (Fix)
=======
=======
          
      36. 
            1
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
=======
          
      37. 
            3
<<<<<<< HEAD
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0e864a5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> cc390719 (Manifest_cache true)
=======
=======
=======
>>>>>>> fd6db03 (Manifest_cache true)
=======
          
      38. 
            82
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
>>>>>>> e9f3851 (Manifest_cache true)
>>>>>>> 3be4d14 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1b8f36d8 (Manifest_cache true)
=======
=======
>>>>>>> 307f31f (Manifest_cache true)
>>>>>>> a71befd (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8a3779d4 (Manifest_cache true)
=======
=======
>>>>>>> 307f31f (Manifest_cache true)
=======
=======
          
      39. 
            3
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 551c6ab (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 56531f25 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 0b43b18 (Manifest_cache true)
=======
          
      40. 
            3
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 35d17b9 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> fd310ed (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 86229876 (Manifest_cache true)
=======
=======
=======
=======
          
      41. 
            3
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> add330c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 42e9c2e (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 16ebb0ff (Manifest_cache true)
=======
=======
=======
=======
          
      42. 
            82
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0f24a043 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
      43. 
            3
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 15bff2e (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> c0159bf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1d0f5cbf (Manifest_cache true)
=======
=======
=======
=======
          
      44. 
            82
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> b8c2784f (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
      45. 
            3
>>>>>>> 998f08d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 6c71f00 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> ca274ec (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a56ba36d (Manifest_cache true)
=======
=======
=======
=======
          
      46. 
            82
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
      47. 
            1
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
=======
>>>>>>> 715fac2 (Featire specs)
<<<<<<< HEAD
>>>>>>> fb61c5a (Featire specs)
<<<<<<< HEAD
>>>>>>> 73f364d8 (Featire specs)
=======
=======
=======
>>>>>>> 0b43b18 (Manifest_cache true)
>>>>>>> 1cce66c (Manifest_cache true)
>>>>>>> d365be68 (Manifest_cache true)
            

            

                user
          
        48. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 7a08014b (Featire specs)
=======
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> d34a0770 (Manifest_cache true)
=======
>>>>>>> 824ea7c9 (Manifest_cache true)
=======
>>>>>>> bd30d038 (Manifest_cache true)
=======
>>>>>>> d4235040 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 4367ccb1 (Manifest_cache true)
=======
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4fac471d (Manifest_cache true)
=======
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
=======
>>>>>>> ef483b6d (Fix)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> e6fc67c7 (Featire specs)
=======
>>>>>>> cc390719 (Manifest_cache true)
=======
>>>>>>> bdc24a1a (Rebased)
=======
>>>>>>> 1b8f36d8 (Manifest_cache true)
=======
>>>>>>> 8a3779d4 (Manifest_cache true)
=======
>>>>>>> 56531f25 (Manifest_cache true)
=======
>>>>>>> 86229876 (Manifest_cache true)
=======
>>>>>>> 16ebb0ff (Manifest_cache true)
=======
>>>>>>> 0f24a043 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1d0f5cbf (Manifest_cache true)
=======
>>>>>>> b8c2784f (Fix book_spec decrease quantity and price)
=======
>>>>>>> a56ba36d (Manifest_cache true)
=======
>>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1049b80c (Fix)
=======
>>>>>>> 73f364d8 (Featire specs)
=======
>>>>>>> d365be68 (Manifest_cache true)
=======
>>>>>>> 0e864a5 (Manifest_cache true)
=======
>>>>>>> e055dd0 (Rebased)
=======
>>>>>>> 3be4d14 (Manifest_cache true)
=======
>>>>>>> a71befd (Manifest_cache true)
=======
>>>>>>> 551c6ab (Manifest_cache true)
=======
>>>>>>> fd310ed (Manifest_cache true)
=======
>>>>>>> 42e9c2e (Manifest_cache true)
=======
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
=======
>>>>>>> c0159bf (Manifest_cache true)
=======
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> ca274ec (Manifest_cache true)
=======
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9e081dc (Fix)
=======
>>>>>>> fb61c5a (Featire specs)
=======
>>>>>>> 1cce66c (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
>>>>>>> 0e864a5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> cc390719 (Manifest_cache true)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
          
      48. 
            1
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      49. 
            1
=======
          
      50. 
            3
>>>>>>> 02a399d (Manifest_cache true)
=======
=======
=======
>>>>>>> 715fac2 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
          
      51. 
            3
=======
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
          
      52. 
            92
=======
          
      53. 
            3
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
=======
          
      54. 
            90
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 7a08014b (Featire specs)
=======
          
      55. 
            3
>>>>>>> bd8bda4 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      56. 
            3
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> c59d1a99 (Manifest_cache true)
=======
=======
          
      57. 
            3
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
      58. 
            92
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
=======
          
      59. 
            3
>>>>>>> fd6db03 (Manifest_cache true)
=======
          
      60. 
            92
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
          
      61. 
            1
>>>>>>> 11792758 (Rebased)
=======
=======
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
=======
>>>>>>> f92a45b (Featire specs)
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
>>>>>>> 73f364d8 (Featire specs)
=======
>>>>>>> f92a45b (Featire specs)
=======
>>>>>>> 0e864a5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> cc390719 (Manifest_cache true)
=======
=======
=======
>>>>>>> 715fac2 (Featire specs)
>>>>>>> fb61c5a (Featire specs)
>>>>>>> 73f364d8 (Featire specs)
          
      62. 
            90
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      63. 
            3
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
      64. 
            90
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
=======
>>>>>>> e6fc67c7 (Featire specs)
=======
>>>>>>> cc390719 (Manifest_cache true)
=======
          
      65. 
            3
<<<<<<< HEAD
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
=======
>>>>>>> fd6db03 (Manifest_cache true)
=======
          
      66. 
            92
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
          
      67. 
            1
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bc6bc8d2 (Rebased)
=======
=======
>>>>>>> bdc24a1a (Rebased)
=======
>>>>>>> 1b8f36d8 (Manifest_cache true)
=======
=======
>>>>>>> 307f31f (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d782a28 (Manifest_cache true)
=======
>>>>>>> 35d17b9 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 64dceec (Manifest_cache true)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3be4d14 (Manifest_cache true)
=======
>>>>>>> a71befd (Manifest_cache true)
=======
=======
>>>>>>> d782a28 (Manifest_cache true)
>>>>>>> 551c6ab (Manifest_cache true)
=======
>>>>>>> fd310ed (Manifest_cache true)
=======
=======
>>>>>>> add330c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 42e9c2e (Manifest_cache true)
=======
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 15bff2e (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> c0159bf (Manifest_cache true)
=======
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 6c71f00 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> ca274ec (Manifest_cache true)
=======
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0b43b18 (Manifest_cache true)
>>>>>>> 1cce66c (Manifest_cache true)
          
      68. 
            1
=======
          
      69. 
            3
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d34a0770 (Manifest_cache true)
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> e9f3851 (Manifest_cache true)
=======
=======
>>>>>>> a71befd (Manifest_cache true)
          
      70. 
            92
=======
          
      71. 
            3
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 824ea7c9 (Manifest_cache true)
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      72. 
            3
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> bd30d038 (Manifest_cache true)
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      73. 
            3
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 35d17b9 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d4235040 (Manifest_cache true)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      74. 
            3
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      75. 
            92
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
          
      76. 
            3
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4367ccb1 (Manifest_cache true)
=======
=======
=======
          
      77. 
            92
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
      78. 
            3
>>>>>>> 998f08d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 64dceec (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4fac471d (Manifest_cache true)
=======
=======
=======
          
      79. 
            92
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
=======
=======
          
      80. 
            1
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
>>>>>>> ef483b6d (Fix)
=======
=======
          
      81. 
            1
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
=======
          
      82. 
            3
<<<<<<< HEAD
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0e864a5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> cc390719 (Manifest_cache true)
=======
=======
=======
>>>>>>> fd6db03 (Manifest_cache true)
=======
          
      83. 
            92
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
>>>>>>> e9f3851 (Manifest_cache true)
>>>>>>> 3be4d14 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1b8f36d8 (Manifest_cache true)
=======
=======
>>>>>>> 307f31f (Manifest_cache true)
>>>>>>> a71befd (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8a3779d4 (Manifest_cache true)
=======
=======
>>>>>>> 307f31f (Manifest_cache true)
=======
=======
          
      84. 
            3
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 551c6ab (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 56531f25 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 0b43b18 (Manifest_cache true)
=======
          
      85. 
            3
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 35d17b9 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> fd310ed (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 86229876 (Manifest_cache true)
=======
=======
=======
=======
          
      86. 
            3
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> add330c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 42e9c2e (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 16ebb0ff (Manifest_cache true)
=======
=======
=======
=======
          
      87. 
            92
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0f24a043 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
      88. 
            3
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 15bff2e (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> c0159bf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1d0f5cbf (Manifest_cache true)
=======
=======
=======
=======
          
      89. 
            92
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> b8c2784f (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
      90. 
            3
>>>>>>> 998f08d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 6c71f00 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> ca274ec (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a56ba36d (Manifest_cache true)
=======
=======
=======
=======
          
      91. 
            92
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
      92. 
            1
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
=======
>>>>>>> 715fac2 (Featire specs)
<<<<<<< HEAD
>>>>>>> fb61c5a (Featire specs)
<<<<<<< HEAD
>>>>>>> 73f364d8 (Featire specs)
=======
=======
=======
>>>>>>> 0b43b18 (Manifest_cache true)
>>>>>>> 1cce66c (Manifest_cache true)
>>>>>>> d365be68 (Manifest_cache true)
            

            

                address { FFaker::AddressUA.street_address }
          
        93. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 7a08014b (Featire specs)
=======
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> d34a0770 (Manifest_cache true)
=======
>>>>>>> 824ea7c9 (Manifest_cache true)
=======
>>>>>>> bd30d038 (Manifest_cache true)
=======
>>>>>>> d4235040 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 4367ccb1 (Manifest_cache true)
=======
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4fac471d (Manifest_cache true)
=======
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
=======
>>>>>>> ef483b6d (Fix)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> e6fc67c7 (Featire specs)
=======
>>>>>>> cc390719 (Manifest_cache true)
=======
>>>>>>> bdc24a1a (Rebased)
=======
>>>>>>> 1b8f36d8 (Manifest_cache true)
=======
>>>>>>> 8a3779d4 (Manifest_cache true)
=======
>>>>>>> 56531f25 (Manifest_cache true)
=======
>>>>>>> 86229876 (Manifest_cache true)
=======
>>>>>>> 16ebb0ff (Manifest_cache true)
=======
>>>>>>> 0f24a043 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1d0f5cbf (Manifest_cache true)
=======
>>>>>>> b8c2784f (Fix book_spec decrease quantity and price)
=======
>>>>>>> a56ba36d (Manifest_cache true)
=======
>>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1049b80c (Fix)
=======
>>>>>>> 73f364d8 (Featire specs)
=======
>>>>>>> d365be68 (Manifest_cache true)
=======
>>>>>>> 0e864a5 (Manifest_cache true)
=======
>>>>>>> e055dd0 (Rebased)
=======
>>>>>>> 3be4d14 (Manifest_cache true)
=======
>>>>>>> a71befd (Manifest_cache true)
=======
>>>>>>> 551c6ab (Manifest_cache true)
=======
>>>>>>> fd310ed (Manifest_cache true)
=======
>>>>>>> 42e9c2e (Manifest_cache true)
=======
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
=======
>>>>>>> c0159bf (Manifest_cache true)
=======
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> ca274ec (Manifest_cache true)
=======
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9e081dc (Fix)
=======
>>>>>>> fb61c5a (Featire specs)
=======
>>>>>>> 1cce66c (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
>>>>>>> 0e864a5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> cc390719 (Manifest_cache true)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
          
      93. 
            1
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      94. 
            1
=======
          
      95. 
            3
>>>>>>> 02a399d (Manifest_cache true)
=======
=======
=======
>>>>>>> 715fac2 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
          
      96. 
            3
=======
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
          
      97. 
            82
=======
          
      98. 
            3
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
=======
          
      99. 
            80
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 7a08014b (Featire specs)
=======
          
      100. 
            3
>>>>>>> bd8bda4 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      101. 
            3
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> c59d1a99 (Manifest_cache true)
=======
=======
          
      102. 
            3
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
      103. 
            82
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
=======
          
      104. 
            3
>>>>>>> fd6db03 (Manifest_cache true)
=======
          
      105. 
            82
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
          
      106. 
            1
>>>>>>> 11792758 (Rebased)
=======
=======
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
=======
>>>>>>> f92a45b (Featire specs)
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
>>>>>>> 73f364d8 (Featire specs)
=======
>>>>>>> f92a45b (Featire specs)
=======
>>>>>>> 0e864a5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> cc390719 (Manifest_cache true)
=======
=======
=======
>>>>>>> 715fac2 (Featire specs)
>>>>>>> fb61c5a (Featire specs)
>>>>>>> 73f364d8 (Featire specs)
          
      107. 
            80
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      108. 
            3
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
      109. 
            80
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
=======
>>>>>>> e6fc67c7 (Featire specs)
=======
>>>>>>> cc390719 (Manifest_cache true)
=======
          
      110. 
            3
<<<<<<< HEAD
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
=======
>>>>>>> fd6db03 (Manifest_cache true)
=======
          
      111. 
            82
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
          
      112. 
            1
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bc6bc8d2 (Rebased)
=======
=======
>>>>>>> bdc24a1a (Rebased)
=======
>>>>>>> 1b8f36d8 (Manifest_cache true)
=======
=======
>>>>>>> 307f31f (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d782a28 (Manifest_cache true)
=======
>>>>>>> 35d17b9 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 64dceec (Manifest_cache true)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3be4d14 (Manifest_cache true)
=======
>>>>>>> a71befd (Manifest_cache true)
=======
=======
>>>>>>> d782a28 (Manifest_cache true)
>>>>>>> 551c6ab (Manifest_cache true)
=======
>>>>>>> fd310ed (Manifest_cache true)
=======
=======
>>>>>>> add330c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 42e9c2e (Manifest_cache true)
=======
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 15bff2e (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> c0159bf (Manifest_cache true)
=======
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 6c71f00 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> ca274ec (Manifest_cache true)
=======
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0b43b18 (Manifest_cache true)
>>>>>>> 1cce66c (Manifest_cache true)
          
      113. 
            1
=======
          
      114. 
            3
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d34a0770 (Manifest_cache true)
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> e9f3851 (Manifest_cache true)
=======
=======
>>>>>>> a71befd (Manifest_cache true)
          
      115. 
            82
=======
          
      116. 
            3
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 824ea7c9 (Manifest_cache true)
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      117. 
            3
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> bd30d038 (Manifest_cache true)
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      118. 
            3
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 35d17b9 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d4235040 (Manifest_cache true)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      119. 
            3
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      120. 
            82
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
          
      121. 
            3
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4367ccb1 (Manifest_cache true)
=======
=======
=======
          
      122. 
            82
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
      123. 
            3
>>>>>>> 998f08d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 64dceec (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4fac471d (Manifest_cache true)
=======
=======
=======
          
      124. 
            82
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
=======
=======
          
      125. 
            1
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
>>>>>>> ef483b6d (Fix)
=======
=======
          
      126. 
            1
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
=======
          
      127. 
            3
<<<<<<< HEAD
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0e864a5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> cc390719 (Manifest_cache true)
=======
=======
=======
>>>>>>> fd6db03 (Manifest_cache true)
=======
          
      128. 
            82
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
>>>>>>> e9f3851 (Manifest_cache true)
>>>>>>> 3be4d14 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1b8f36d8 (Manifest_cache true)
=======
=======
>>>>>>> 307f31f (Manifest_cache true)
>>>>>>> a71befd (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8a3779d4 (Manifest_cache true)
=======
=======
>>>>>>> 307f31f (Manifest_cache true)
=======
=======
          
      129. 
            3
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 551c6ab (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 56531f25 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 0b43b18 (Manifest_cache true)
=======
          
      130. 
            3
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 35d17b9 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> fd310ed (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 86229876 (Manifest_cache true)
=======
=======
=======
=======
          
      131. 
            3
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> add330c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 42e9c2e (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 16ebb0ff (Manifest_cache true)
=======
=======
=======
=======
          
      132. 
            82
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0f24a043 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
      133. 
            3
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 15bff2e (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> c0159bf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1d0f5cbf (Manifest_cache true)
=======
=======
=======
=======
          
      134. 
            82
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> b8c2784f (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
      135. 
            3
>>>>>>> 998f08d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 6c71f00 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> ca274ec (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a56ba36d (Manifest_cache true)
=======
=======
=======
=======
          
      136. 
            82
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
      137. 
            1
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
=======
>>>>>>> 715fac2 (Featire specs)
<<<<<<< HEAD
>>>>>>> fb61c5a (Featire specs)
<<<<<<< HEAD
>>>>>>> 73f364d8 (Featire specs)
=======
=======
=======
>>>>>>> 0b43b18 (Manifest_cache true)
>>>>>>> 1cce66c (Manifest_cache true)
>>>>>>> d365be68 (Manifest_cache true)
            

            

                city { FFaker::AddressUA.city }
          
        138. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 7a08014b (Featire specs)
=======
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> d34a0770 (Manifest_cache true)
=======
>>>>>>> 824ea7c9 (Manifest_cache true)
=======
>>>>>>> bd30d038 (Manifest_cache true)
=======
>>>>>>> d4235040 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 4367ccb1 (Manifest_cache true)
=======
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4fac471d (Manifest_cache true)
=======
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
=======
>>>>>>> ef483b6d (Fix)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> e6fc67c7 (Featire specs)
=======
>>>>>>> cc390719 (Manifest_cache true)
=======
>>>>>>> bdc24a1a (Rebased)
=======
>>>>>>> 1b8f36d8 (Manifest_cache true)
=======
>>>>>>> 8a3779d4 (Manifest_cache true)
=======
>>>>>>> 56531f25 (Manifest_cache true)
=======
>>>>>>> 86229876 (Manifest_cache true)
=======
>>>>>>> 16ebb0ff (Manifest_cache true)
=======
>>>>>>> 0f24a043 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1d0f5cbf (Manifest_cache true)
=======
>>>>>>> b8c2784f (Fix book_spec decrease quantity and price)
=======
>>>>>>> a56ba36d (Manifest_cache true)
=======
>>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1049b80c (Fix)
=======
>>>>>>> 73f364d8 (Featire specs)
=======
>>>>>>> d365be68 (Manifest_cache true)
=======
>>>>>>> 0e864a5 (Manifest_cache true)
=======
>>>>>>> e055dd0 (Rebased)
=======
>>>>>>> 3be4d14 (Manifest_cache true)
=======
>>>>>>> a71befd (Manifest_cache true)
=======
>>>>>>> 551c6ab (Manifest_cache true)
=======
>>>>>>> fd310ed (Manifest_cache true)
=======
>>>>>>> 42e9c2e (Manifest_cache true)
=======
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
=======
>>>>>>> c0159bf (Manifest_cache true)
=======
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> ca274ec (Manifest_cache true)
=======
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9e081dc (Fix)
=======
>>>>>>> fb61c5a (Featire specs)
=======
>>>>>>> 1cce66c (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
>>>>>>> 0e864a5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> cc390719 (Manifest_cache true)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
          
      138. 
            1
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      139. 
            1
=======
          
      140. 
            3
>>>>>>> 02a399d (Manifest_cache true)
=======
=======
=======
>>>>>>> 715fac2 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
          
      141. 
            3
=======
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
          
      142. 
            92
=======
          
      143. 
            3
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
=======
          
      144. 
            90
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 7a08014b (Featire specs)
=======
          
      145. 
            3
>>>>>>> bd8bda4 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      146. 
            3
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> c59d1a99 (Manifest_cache true)
=======
=======
          
      147. 
            3
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
      148. 
            92
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
=======
          
      149. 
            3
>>>>>>> fd6db03 (Manifest_cache true)
=======
          
      150. 
            92
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
          
      151. 
            1
>>>>>>> 11792758 (Rebased)
=======
=======
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
=======
>>>>>>> f92a45b (Featire specs)
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
>>>>>>> 73f364d8 (Featire specs)
=======
>>>>>>> f92a45b (Featire specs)
=======
>>>>>>> 0e864a5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> cc390719 (Manifest_cache true)
=======
=======
=======
>>>>>>> 715fac2 (Featire specs)
>>>>>>> fb61c5a (Featire specs)
>>>>>>> 73f364d8 (Featire specs)
          
      152. 
            90
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      153. 
            3
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
      154. 
            90
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
=======
>>>>>>> e6fc67c7 (Featire specs)
=======
>>>>>>> cc390719 (Manifest_cache true)
=======
          
      155. 
            3
<<<<<<< HEAD
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
=======
>>>>>>> fd6db03 (Manifest_cache true)
=======
          
      156. 
            92
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
          
      157. 
            1
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bc6bc8d2 (Rebased)
=======
=======
>>>>>>> bdc24a1a (Rebased)
=======
>>>>>>> 1b8f36d8 (Manifest_cache true)
=======
=======
>>>>>>> 307f31f (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d782a28 (Manifest_cache true)
=======
>>>>>>> 35d17b9 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 64dceec (Manifest_cache true)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3be4d14 (Manifest_cache true)
=======
>>>>>>> a71befd (Manifest_cache true)
=======
=======
>>>>>>> d782a28 (Manifest_cache true)
>>>>>>> 551c6ab (Manifest_cache true)
=======
>>>>>>> fd310ed (Manifest_cache true)
=======
=======
>>>>>>> add330c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 42e9c2e (Manifest_cache true)
=======
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 15bff2e (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> c0159bf (Manifest_cache true)
=======
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 6c71f00 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> ca274ec (Manifest_cache true)
=======
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0b43b18 (Manifest_cache true)
>>>>>>> 1cce66c (Manifest_cache true)
          
      158. 
            1
=======
          
      159. 
            3
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d34a0770 (Manifest_cache true)
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> e9f3851 (Manifest_cache true)
=======
=======
>>>>>>> a71befd (Manifest_cache true)
          
      160. 
            92
=======
          
      161. 
            3
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 824ea7c9 (Manifest_cache true)
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      162. 
            3
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> bd30d038 (Manifest_cache true)
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      163. 
            3
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 35d17b9 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d4235040 (Manifest_cache true)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      164. 
            3
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      165. 
            92
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
          
      166. 
            3
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4367ccb1 (Manifest_cache true)
=======
=======
=======
          
      167. 
            92
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
      168. 
            3
>>>>>>> 998f08d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 64dceec (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4fac471d (Manifest_cache true)
=======
=======
=======
          
      169. 
            92
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
=======
=======
          
      170. 
            1
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
>>>>>>> ef483b6d (Fix)
=======
=======
          
      171. 
            1
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
=======
          
      172. 
            3
<<<<<<< HEAD
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0e864a5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> cc390719 (Manifest_cache true)
=======
=======
=======
>>>>>>> fd6db03 (Manifest_cache true)
=======
          
      173. 
            92
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
>>>>>>> e9f3851 (Manifest_cache true)
>>>>>>> 3be4d14 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1b8f36d8 (Manifest_cache true)
=======
=======
>>>>>>> 307f31f (Manifest_cache true)
>>>>>>> a71befd (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8a3779d4 (Manifest_cache true)
=======
=======
>>>>>>> 307f31f (Manifest_cache true)
=======
=======
          
      174. 
            3
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 551c6ab (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 56531f25 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 0b43b18 (Manifest_cache true)
=======
          
      175. 
            3
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 35d17b9 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> fd310ed (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 86229876 (Manifest_cache true)
=======
=======
=======
=======
          
      176. 
            3
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> add330c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 42e9c2e (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 16ebb0ff (Manifest_cache true)
=======
=======
=======
=======
          
      177. 
            92
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0f24a043 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
      178. 
            3
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 15bff2e (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> c0159bf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1d0f5cbf (Manifest_cache true)
=======
=======
=======
=======
          
      179. 
            92
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> b8c2784f (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
      180. 
            3
>>>>>>> 998f08d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 6c71f00 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> ca274ec (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a56ba36d (Manifest_cache true)
=======
=======
=======
=======
          
      181. 
            92
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
      182. 
            1
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
=======
>>>>>>> 715fac2 (Featire specs)
<<<<<<< HEAD
>>>>>>> fb61c5a (Featire specs)
<<<<<<< HEAD
>>>>>>> 73f364d8 (Featire specs)
=======
=======
=======
>>>>>>> 0b43b18 (Manifest_cache true)
>>>>>>> 1cce66c (Manifest_cache true)
>>>>>>> d365be68 (Manifest_cache true)
            

            

                zip { FFaker::AddressUA.zip_code }
          
        183. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 7a08014b (Featire specs)
=======
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> d34a0770 (Manifest_cache true)
=======
>>>>>>> 824ea7c9 (Manifest_cache true)
=======
>>>>>>> bd30d038 (Manifest_cache true)
=======
>>>>>>> d4235040 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 4367ccb1 (Manifest_cache true)
=======
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4fac471d (Manifest_cache true)
=======
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
=======
>>>>>>> ef483b6d (Fix)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> e6fc67c7 (Featire specs)
=======
>>>>>>> cc390719 (Manifest_cache true)
=======
>>>>>>> bdc24a1a (Rebased)
=======
>>>>>>> 1b8f36d8 (Manifest_cache true)
=======
>>>>>>> 8a3779d4 (Manifest_cache true)
=======
>>>>>>> 56531f25 (Manifest_cache true)
=======
>>>>>>> 86229876 (Manifest_cache true)
=======
>>>>>>> 16ebb0ff (Manifest_cache true)
=======
>>>>>>> 0f24a043 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1d0f5cbf (Manifest_cache true)
=======
>>>>>>> b8c2784f (Fix book_spec decrease quantity and price)
=======
>>>>>>> a56ba36d (Manifest_cache true)
=======
>>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1049b80c (Fix)
=======
>>>>>>> 73f364d8 (Featire specs)
=======
>>>>>>> d365be68 (Manifest_cache true)
=======
>>>>>>> 0e864a5 (Manifest_cache true)
=======
>>>>>>> e055dd0 (Rebased)
=======
>>>>>>> 3be4d14 (Manifest_cache true)
=======
>>>>>>> a71befd (Manifest_cache true)
=======
>>>>>>> 551c6ab (Manifest_cache true)
=======
>>>>>>> fd310ed (Manifest_cache true)
=======
>>>>>>> 42e9c2e (Manifest_cache true)
=======
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
=======
>>>>>>> c0159bf (Manifest_cache true)
=======
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> ca274ec (Manifest_cache true)
=======
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9e081dc (Fix)
=======
>>>>>>> fb61c5a (Featire specs)
=======
>>>>>>> 1cce66c (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
>>>>>>> 0e864a5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> cc390719 (Manifest_cache true)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
          
      183. 
            1
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      184. 
            1
=======
          
      185. 
            3
>>>>>>> 02a399d (Manifest_cache true)
=======
=======
=======
>>>>>>> 715fac2 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
          
      186. 
            3
=======
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
          
      187. 
            92
=======
          
      188. 
            3
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
=======
          
      189. 
            90
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 7a08014b (Featire specs)
=======
          
      190. 
            3
>>>>>>> bd8bda4 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      191. 
            3
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> c59d1a99 (Manifest_cache true)
=======
=======
          
      192. 
            3
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
      193. 
            92
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
=======
          
      194. 
            3
>>>>>>> fd6db03 (Manifest_cache true)
=======
          
      195. 
            92
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
          
      196. 
            1
>>>>>>> 11792758 (Rebased)
=======
=======
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
=======
>>>>>>> f92a45b (Featire specs)
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
>>>>>>> 73f364d8 (Featire specs)
=======
>>>>>>> f92a45b (Featire specs)
=======
>>>>>>> 0e864a5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> cc390719 (Manifest_cache true)
=======
=======
=======
>>>>>>> 715fac2 (Featire specs)
>>>>>>> fb61c5a (Featire specs)
>>>>>>> 73f364d8 (Featire specs)
          
      197. 
            90
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      198. 
            3
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
      199. 
            90
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
=======
>>>>>>> e6fc67c7 (Featire specs)
=======
>>>>>>> cc390719 (Manifest_cache true)
=======
          
      200. 
            3
<<<<<<< HEAD
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
=======
>>>>>>> fd6db03 (Manifest_cache true)
=======
          
      201. 
            92
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
          
      202. 
            1
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bc6bc8d2 (Rebased)
=======
=======
>>>>>>> bdc24a1a (Rebased)
=======
>>>>>>> 1b8f36d8 (Manifest_cache true)
=======
=======
>>>>>>> 307f31f (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d782a28 (Manifest_cache true)
=======
>>>>>>> 35d17b9 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 64dceec (Manifest_cache true)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3be4d14 (Manifest_cache true)
=======
>>>>>>> a71befd (Manifest_cache true)
=======
=======
>>>>>>> d782a28 (Manifest_cache true)
>>>>>>> 551c6ab (Manifest_cache true)
=======
>>>>>>> fd310ed (Manifest_cache true)
=======
=======
>>>>>>> add330c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 42e9c2e (Manifest_cache true)
=======
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 15bff2e (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> c0159bf (Manifest_cache true)
=======
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 6c71f00 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> ca274ec (Manifest_cache true)
=======
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0b43b18 (Manifest_cache true)
>>>>>>> 1cce66c (Manifest_cache true)
          
      203. 
            1
=======
          
      204. 
            3
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d34a0770 (Manifest_cache true)
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> e9f3851 (Manifest_cache true)
=======
=======
>>>>>>> a71befd (Manifest_cache true)
          
      205. 
            92
=======
          
      206. 
            3
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 824ea7c9 (Manifest_cache true)
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      207. 
            3
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> bd30d038 (Manifest_cache true)
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      208. 
            3
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 35d17b9 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d4235040 (Manifest_cache true)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      209. 
            3
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      210. 
            92
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
          
      211. 
            3
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4367ccb1 (Manifest_cache true)
=======
=======
=======
          
      212. 
            92
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
      213. 
            3
>>>>>>> 998f08d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 64dceec (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4fac471d (Manifest_cache true)
=======
=======
=======
          
      214. 
            92
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
=======
=======
          
      215. 
            1
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
>>>>>>> ef483b6d (Fix)
=======
=======
          
      216. 
            1
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
=======
          
      217. 
            3
<<<<<<< HEAD
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0e864a5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> cc390719 (Manifest_cache true)
=======
=======
=======
>>>>>>> fd6db03 (Manifest_cache true)
=======
          
      218. 
            92
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
>>>>>>> e9f3851 (Manifest_cache true)
>>>>>>> 3be4d14 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1b8f36d8 (Manifest_cache true)
=======
=======
>>>>>>> 307f31f (Manifest_cache true)
>>>>>>> a71befd (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8a3779d4 (Manifest_cache true)
=======
=======
>>>>>>> 307f31f (Manifest_cache true)
=======
=======
          
      219. 
            3
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 551c6ab (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 56531f25 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 0b43b18 (Manifest_cache true)
=======
          
      220. 
            3
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 35d17b9 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> fd310ed (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 86229876 (Manifest_cache true)
=======
=======
=======
=======
          
      221. 
            3
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> add330c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 42e9c2e (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 16ebb0ff (Manifest_cache true)
=======
=======
=======
=======
          
      222. 
            92
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0f24a043 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
      223. 
            3
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 15bff2e (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> c0159bf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1d0f5cbf (Manifest_cache true)
=======
=======
=======
=======
          
      224. 
            92
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> b8c2784f (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
      225. 
            3
>>>>>>> 998f08d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 6c71f00 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> ca274ec (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a56ba36d (Manifest_cache true)
=======
=======
=======
=======
          
      226. 
            92
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
      227. 
            1
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
=======
>>>>>>> 715fac2 (Featire specs)
<<<<<<< HEAD
>>>>>>> fb61c5a (Featire specs)
<<<<<<< HEAD
>>>>>>> 73f364d8 (Featire specs)
=======
=======
=======
>>>>>>> 0b43b18 (Manifest_cache true)
>>>>>>> 1cce66c (Manifest_cache true)
>>>>>>> d365be68 (Manifest_cache true)
            

            

                country { FFaker::AddressUA.country }
          
        228. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 7a08014b (Featire specs)
=======
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> d34a0770 (Manifest_cache true)
=======
>>>>>>> 824ea7c9 (Manifest_cache true)
=======
>>>>>>> bd30d038 (Manifest_cache true)
=======
>>>>>>> d4235040 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 4367ccb1 (Manifest_cache true)
=======
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4fac471d (Manifest_cache true)
=======
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
=======
>>>>>>> ef483b6d (Fix)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> e6fc67c7 (Featire specs)
=======
>>>>>>> cc390719 (Manifest_cache true)
=======
>>>>>>> bdc24a1a (Rebased)
=======
>>>>>>> 1b8f36d8 (Manifest_cache true)
=======
>>>>>>> 8a3779d4 (Manifest_cache true)
=======
>>>>>>> 56531f25 (Manifest_cache true)
=======
>>>>>>> 86229876 (Manifest_cache true)
=======
>>>>>>> 16ebb0ff (Manifest_cache true)
=======
>>>>>>> 0f24a043 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1d0f5cbf (Manifest_cache true)
=======
>>>>>>> b8c2784f (Fix book_spec decrease quantity and price)
=======
>>>>>>> a56ba36d (Manifest_cache true)
=======
>>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1049b80c (Fix)
=======
>>>>>>> 73f364d8 (Featire specs)
=======
>>>>>>> d365be68 (Manifest_cache true)
=======
>>>>>>> 0e864a5 (Manifest_cache true)
=======
>>>>>>> e055dd0 (Rebased)
=======
>>>>>>> 3be4d14 (Manifest_cache true)
=======
>>>>>>> a71befd (Manifest_cache true)
=======
>>>>>>> 551c6ab (Manifest_cache true)
=======
>>>>>>> fd310ed (Manifest_cache true)
=======
>>>>>>> 42e9c2e (Manifest_cache true)
=======
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
=======
>>>>>>> c0159bf (Manifest_cache true)
=======
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> ca274ec (Manifest_cache true)
=======
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9e081dc (Fix)
=======
>>>>>>> fb61c5a (Featire specs)
=======
>>>>>>> 1cce66c (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
>>>>>>> 0e864a5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> cc390719 (Manifest_cache true)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
          
      228. 
            1
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      229. 
            1
=======
          
      230. 
            3
>>>>>>> 02a399d (Manifest_cache true)
=======
=======
=======
>>>>>>> 715fac2 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
          
      231. 
            3
=======
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
          
      232. 
            92
=======
          
      233. 
            3
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
=======
          
      234. 
            90
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 7a08014b (Featire specs)
=======
          
      235. 
            3
>>>>>>> bd8bda4 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      236. 
            3
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> c59d1a99 (Manifest_cache true)
=======
=======
          
      237. 
            3
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
      238. 
            92
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
=======
          
      239. 
            3
>>>>>>> fd6db03 (Manifest_cache true)
=======
          
      240. 
            92
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
          
      241. 
            1
>>>>>>> 11792758 (Rebased)
=======
=======
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
=======
>>>>>>> f92a45b (Featire specs)
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
>>>>>>> 73f364d8 (Featire specs)
=======
>>>>>>> f92a45b (Featire specs)
=======
>>>>>>> 0e864a5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> cc390719 (Manifest_cache true)
=======
=======
=======
>>>>>>> 715fac2 (Featire specs)
>>>>>>> fb61c5a (Featire specs)
>>>>>>> 73f364d8 (Featire specs)
          
      242. 
            90
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      243. 
            3
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
      244. 
            90
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
=======
>>>>>>> e6fc67c7 (Featire specs)
=======
>>>>>>> cc390719 (Manifest_cache true)
=======
          
      245. 
            3
<<<<<<< HEAD
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
=======
>>>>>>> fd6db03 (Manifest_cache true)
=======
          
      246. 
            92
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
          
      247. 
            1
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bc6bc8d2 (Rebased)
=======
=======
>>>>>>> bdc24a1a (Rebased)
=======
>>>>>>> 1b8f36d8 (Manifest_cache true)
=======
=======
>>>>>>> 307f31f (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d782a28 (Manifest_cache true)
=======
>>>>>>> 35d17b9 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 64dceec (Manifest_cache true)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3be4d14 (Manifest_cache true)
=======
>>>>>>> a71befd (Manifest_cache true)
=======
=======
>>>>>>> d782a28 (Manifest_cache true)
>>>>>>> 551c6ab (Manifest_cache true)
=======
>>>>>>> fd310ed (Manifest_cache true)
=======
=======
>>>>>>> add330c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 42e9c2e (Manifest_cache true)
=======
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 15bff2e (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> c0159bf (Manifest_cache true)
=======
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 6c71f00 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> ca274ec (Manifest_cache true)
=======
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0b43b18 (Manifest_cache true)
>>>>>>> 1cce66c (Manifest_cache true)
          
      248. 
            1
=======
          
      249. 
            3
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d34a0770 (Manifest_cache true)
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> e9f3851 (Manifest_cache true)
=======
=======
>>>>>>> a71befd (Manifest_cache true)
          
      250. 
            92
=======
          
      251. 
            3
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 824ea7c9 (Manifest_cache true)
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      252. 
            3
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> bd30d038 (Manifest_cache true)
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      253. 
            3
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 35d17b9 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d4235040 (Manifest_cache true)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      254. 
            3
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      255. 
            92
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
          
      256. 
            3
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4367ccb1 (Manifest_cache true)
=======
=======
=======
          
      257. 
            92
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
      258. 
            3
>>>>>>> 998f08d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 64dceec (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4fac471d (Manifest_cache true)
=======
=======
=======
          
      259. 
            92
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
=======
=======
          
      260. 
            1
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
>>>>>>> ef483b6d (Fix)
=======
=======
          
      261. 
            1
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
=======
          
      262. 
            3
<<<<<<< HEAD
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0e864a5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> cc390719 (Manifest_cache true)
=======
=======
=======
>>>>>>> fd6db03 (Manifest_cache true)
=======
          
      263. 
            92
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
>>>>>>> e9f3851 (Manifest_cache true)
>>>>>>> 3be4d14 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1b8f36d8 (Manifest_cache true)
=======
=======
>>>>>>> 307f31f (Manifest_cache true)
>>>>>>> a71befd (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8a3779d4 (Manifest_cache true)
=======
=======
>>>>>>> 307f31f (Manifest_cache true)
=======
=======
          
      264. 
            3
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 551c6ab (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 56531f25 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 0b43b18 (Manifest_cache true)
=======
          
      265. 
            3
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 35d17b9 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> fd310ed (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 86229876 (Manifest_cache true)
=======
=======
=======
=======
          
      266. 
            3
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> add330c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 42e9c2e (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 16ebb0ff (Manifest_cache true)
=======
=======
=======
=======
          
      267. 
            92
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0f24a043 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
      268. 
            3
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 15bff2e (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> c0159bf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1d0f5cbf (Manifest_cache true)
=======
=======
=======
=======
          
      269. 
            92
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> b8c2784f (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
      270. 
            3
>>>>>>> 998f08d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 6c71f00 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> ca274ec (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a56ba36d (Manifest_cache true)
=======
=======
=======
=======
          
      271. 
            92
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
      272. 
            1
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
=======
>>>>>>> 715fac2 (Featire specs)
<<<<<<< HEAD
>>>>>>> fb61c5a (Featire specs)
<<<<<<< HEAD
>>>>>>> 73f364d8 (Featire specs)
=======
=======
=======
>>>>>>> 0b43b18 (Manifest_cache true)
>>>>>>> 1cce66c (Manifest_cache true)
>>>>>>> d365be68 (Manifest_cache true)
            

            

                phone { FFaker::PhoneNumberUA.home_phone_number }
          
        273. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 7a08014b (Featire specs)
=======
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> d34a0770 (Manifest_cache true)
=======
>>>>>>> 824ea7c9 (Manifest_cache true)
=======
>>>>>>> bd30d038 (Manifest_cache true)
=======
>>>>>>> d4235040 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 4367ccb1 (Manifest_cache true)
=======
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4fac471d (Manifest_cache true)
=======
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
=======
>>>>>>> ef483b6d (Fix)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> e6fc67c7 (Featire specs)
=======
>>>>>>> cc390719 (Manifest_cache true)
=======
>>>>>>> bdc24a1a (Rebased)
=======
>>>>>>> 1b8f36d8 (Manifest_cache true)
=======
>>>>>>> 8a3779d4 (Manifest_cache true)
=======
>>>>>>> 56531f25 (Manifest_cache true)
=======
>>>>>>> 86229876 (Manifest_cache true)
=======
>>>>>>> 16ebb0ff (Manifest_cache true)
=======
>>>>>>> 0f24a043 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1d0f5cbf (Manifest_cache true)
=======
>>>>>>> b8c2784f (Fix book_spec decrease quantity and price)
=======
>>>>>>> a56ba36d (Manifest_cache true)
=======
>>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1049b80c (Fix)
=======
>>>>>>> 73f364d8 (Featire specs)
=======
>>>>>>> d365be68 (Manifest_cache true)
=======
>>>>>>> 0e864a5 (Manifest_cache true)
=======
>>>>>>> e055dd0 (Rebased)
=======
>>>>>>> 3be4d14 (Manifest_cache true)
=======
>>>>>>> a71befd (Manifest_cache true)
=======
>>>>>>> 551c6ab (Manifest_cache true)
=======
>>>>>>> fd310ed (Manifest_cache true)
=======
>>>>>>> 42e9c2e (Manifest_cache true)
=======
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
=======
>>>>>>> c0159bf (Manifest_cache true)
=======
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> ca274ec (Manifest_cache true)
=======
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9e081dc (Fix)
=======
>>>>>>> fb61c5a (Featire specs)
=======
>>>>>>> 1cce66c (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1d0f5cbf (Manifest_cache true)
=======
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
>>>>>>> 0e864a5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> cc390719 (Manifest_cache true)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 15bff2e (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> c0159bf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1d0f5cbf (Manifest_cache true)
=======
=======
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> b8c2784f (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 6c71f00 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> ca274ec (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a56ba36d (Manifest_cache true)
=======
=======
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
>>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price)
          
      273. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      274. 
=======
          
      275. 
            3
=======
=======
=======
>>>>>>> 715fac2 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
          
      276. 
            3
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
=======
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 64dceec (Manifest_cache true)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      277. 
=======
          
      278. 
            3
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> f92a45b (Featire specs)
>>>>>>> e6fc67c7 (Featire specs)
          
      279. 
            92
=======
          
      280. 
            3
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f92a45b (Featire specs)
=======
<<<<<<< HEAD
=======
=======
          
      281. 
            90
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 7a08014b (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> f92a45b (Featire specs)
          
      282. 
            3
>>>>>>> bd8bda4 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      283. 
            3
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
=======
=======
          
      284. 
            3
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
      285. 
            92
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
=======
          
      286. 
            3
>>>>>>> fd6db03 (Manifest_cache true)
=======
          
      287. 
            92
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> f92a45b (Featire specs)
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
>>>>>>> 73f364d8 (Featire specs)
=======
>>>>>>> f92a45b (Featire specs)
=======
>>>>>>> 0e864a5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> cc390719 (Manifest_cache true)
=======
=======
=======
>>>>>>> 715fac2 (Featire specs)
>>>>>>> fb61c5a (Featire specs)
>>>>>>> 73f364d8 (Featire specs)
          
      288. 
            90
>>>>>>> 4e81ea2 (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f92a45b (Featire specs)
          
      289. 
            3
>>>>>>> aa7b40c (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f92a45b (Featire specs)
          
      290. 
            90
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
=======
>>>>>>> e6fc67c7 (Featire specs)
=======
>>>>>>> cc390719 (Manifest_cache true)
=======
=======
>>>>>>> fb61c5a (Featire specs)
>>>>>>> 73f364d8 (Featire specs)
=======
          
      291. 
            3
<<<<<<< HEAD
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
=======
>>>>>>> fd6db03 (Manifest_cache true)
=======
          
      292. 
            92
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 307f31f (Manifest_cache true)
=======
>>>>>>> d782a28 (Manifest_cache true)
=======
>>>>>>> 35d17b9 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 3be4d14 (Manifest_cache true)
=======
=======
>>>>>>> 307f31f (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a71befd (Manifest_cache true)
=======
=======
>>>>>>> d782a28 (Manifest_cache true)
>>>>>>> 551c6ab (Manifest_cache true)
=======
>>>>>>> fd310ed (Manifest_cache true)
=======
=======
>>>>>>> add330c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 42e9c2e (Manifest_cache true)
=======
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0b43b18 (Manifest_cache true)
>>>>>>> 1cce66c (Manifest_cache true)
          
      293. 
=======
          
      294. 
            3
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d34a0770 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> e9f3851 (Manifest_cache true)
=======
=======
>>>>>>> a71befd (Manifest_cache true)
          
      295. 
            92
=======
          
      296. 
            3
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 824ea7c9 (Manifest_cache true)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      297. 
            3
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> bd30d038 (Manifest_cache true)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      298. 
            3
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 35d17b9 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d4235040 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      299. 
            3
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      300. 
            92
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
          
      301. 
            3
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4367ccb1 (Manifest_cache true)
=======
=======
=======
          
      302. 
            92
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
      303. 
            3
>>>>>>> 998f08d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 64dceec (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4fac471d (Manifest_cache true)
=======
=======
=======
          
      304. 
            92
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
=======
          
      305. 
            3
<<<<<<< HEAD
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0e864a5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> cc390719 (Manifest_cache true)
=======
=======
=======
>>>>>>> fd6db03 (Manifest_cache true)
=======
          
      306. 
            92
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> e9f3851 (Manifest_cache true)
>>>>>>> 3be4d14 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1b8f36d8 (Manifest_cache true)
=======
=======
>>>>>>> 307f31f (Manifest_cache true)
>>>>>>> a71befd (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8a3779d4 (Manifest_cache true)
=======
=======
>>>>>>> 307f31f (Manifest_cache true)
=======
=======
          
      307. 
            3
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 551c6ab (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 56531f25 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 0b43b18 (Manifest_cache true)
=======
          
      308. 
            3
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 35d17b9 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> fd310ed (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 86229876 (Manifest_cache true)
=======
=======
=======
=======
          
      309. 
            3
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> add330c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 42e9c2e (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 16ebb0ff (Manifest_cache true)
=======
=======
=======
=======
          
      310. 
            92
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0f24a043 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
      311. 
            3
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 15bff2e (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> c0159bf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1d0f5cbf (Manifest_cache true)
=======
=======
=======
=======
          
      312. 
            92
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> b8c2784f (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
      313. 
            3
>>>>>>> 998f08d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 6c71f00 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> ca274ec (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a56ba36d (Manifest_cache true)
=======
=======
=======
=======
          
      314. 
            92
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 715fac2 (Featire specs)
<<<<<<< HEAD
>>>>>>> fb61c5a (Featire specs)
<<<<<<< HEAD
>>>>>>> 73f364d8 (Featire specs)
=======
=======
=======
>>>>>>> 0b43b18 (Manifest_cache true)
>>>>>>> 1cce66c (Manifest_cache true)
>>>>>>> d365be68 (Manifest_cache true)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> d34a0770 (Manifest_cache true)
=======
>>>>>>> 824ea7c9 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1b8f36d8 (Manifest_cache true)
=======
>>>>>>> 8a3779d4 (Manifest_cache true)
=======
>>>>>>> 0f24a043 (Fix book_spec decrease quantity and price)
=======
>>>>>>> b8c2784f (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 73f364d8 (Featire specs)
=======
>>>>>>> f92a45b (Featire specs)
>>>>>>> e6fc67c7 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3be4d14 (Manifest_cache true)
=======
>>>>>>> a71befd (Manifest_cache true)
=======
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 715fac2 (Featire specs)
>>>>>>> fb61c5a (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
=======
>>>>>>> e6fc67c7 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> fb61c5a (Featire specs)
>>>>>>> 73f364d8 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 307f31f (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 824ea7c9 (Manifest_cache true)
=======
=======
>>>>>>> 8a3779d4 (Manifest_cache true)
=======
>>>>>>> 0f24a043 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> a71befd (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8a3779d4 (Manifest_cache true)
=======
=======
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0f24a043 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> b8c2784f (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 715fac2 (Featire specs)
>>>>>>> fb61c5a (Featire specs)
>>>>>>> 73f364d8 (Featire specs)
                quantity { FFaker::Number.rand(0..10) }
=======
<<<<<<< HEAD
                quantity { FFaker::Number.rand(2..10) }
=======
                quantity { FFaker::Number.rand(0..10) }
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a71befd (Manifest_cache true)
=======
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
=======
>>>>>>> fb61c5a (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
                quantity { FFaker::Number.rand(2..10) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                quantity { FFaker::Number.rand(2..10) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
=======
=======
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> f92a45b (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 715fac2 (Featire specs)
=======
                quantity { FFaker::Number.rand(0..10) }
>>>>>>> 752f0c0 (Featire specs)
=======
                quantity { FFaker::Number.rand(0..10) }
>>>>>>> 4e81ea2 (Featire specs)
=======
                quantity { FFaker::Number.rand(0..10) }
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
=======
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
>>>>>>> 73f364d8 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
>>>>>>> fb61c5a (Featire specs)
=======
                quantity { FFaker::Number.rand(2..10) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                quantity { FFaker::Number.rand(2..10) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
                quantity { FFaker::Number.rand(0..10) }
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d34a0770 (Manifest_cache true)
=======
=======
>>>>>>> 1b8f36d8 (Manifest_cache true)
=======
>>>>>>> 8a3779d4 (Manifest_cache true)
=======
>>>>>>> 307f31f (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 824ea7c9 (Manifest_cache true)
=======
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
=======
                quantity { FFaker::Number.rand(2..10) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
=======
=======
                quantity { FFaker::Number.rand(2..10) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
=======
=======
                quantity { FFaker::Number.rand(2..10) }
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3be4d14 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1b8f36d8 (Manifest_cache true)
=======
=======
=======
>>>>>>> 307f31f (Manifest_cache true)
>>>>>>> a71befd (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8a3779d4 (Manifest_cache true)
=======
=======
=======
                quantity { FFaker::Number.rand(2..10) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0f24a043 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> b8c2784f (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
                quantity { FFaker::Number.rand(2..10) }
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 715fac2 (Featire specs)
>>>>>>> fb61c5a (Featire specs)
>>>>>>> 73f364d8 (Featire specs)
          
        315. 
        
        
      
        
        
          
      315. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> c59d1a99 (Manifest_cache true)
=======
          
      316. 
>>>>>>> 11792758 (Rebased)
=======
=======
>>>>>>> d34a0770 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
>>>>>>> 3be4d14 (Manifest_cache true)
>>>>>>> 1b8f36d8 (Manifest_cache true)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
=======
          
      317. 
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bc6bc8d2 (Rebased)
=======
=======
>>>>>>> bdc24a1a (Rebased)
=======
>>>>>>> 1b8f36d8 (Manifest_cache true)
=======
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d34a0770 (Manifest_cache true)
=======
=======
<<<<<<< HEAD
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
          
      318. 
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
>>>>>>> ef483b6d (Fix)
=======
=======
          
      319. 
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> df37394 (Featire specs)
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
=======
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> e9f3851 (Manifest_cache true)
>>>>>>> 3be4d14 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1b8f36d8 (Manifest_cache true)
=======
=======
          
      320. 
>>>>>>> 1d59aaa (Fix)
>>>>>>> 9e081dc (Fix)
>>>>>>> 1049b80c (Fix)
            
            

            

              end
          
        321. 
        
        
      
        
        
          
      321. 
            
            

            

            end
          
        322. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/factories/books.rb
      
    
      
      
  80.95%


      lines covered
    
      

    

    
      
      21 relevant lines.
      17 lines covered and
      4 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            FactoryBot.define do
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 11792758 (Rebased)
=======
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> ef483b6d (Fix)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> bdc24a1a (Rebased)
=======
>>>>>>> 53db2224 (Featire specs)
=======
>>>>>>> 1049b80c (Fix)
=======
>>>>>>> f3d746cb (Featire specs)
=======
=======
>>>>>>> 311e9fa (Rebased)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> e055dd0 (Rebased)
=======
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> 9e081dc (Fix)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> bc6bc8d2 (Rebased)
=======
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> d52f9efe (Featire specs)
=======
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> c12b71de (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
>>>>>>> 4552227 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b904d7ae (Featire specs)
=======
=======
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
>>>>>>> ef483b6d (Fix)
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5e31aeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 53db2224 (Featire specs)
=======
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
=======
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
=======
=======
>>>>>>> 4552227 (Featire specs)
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 392646b5 (Featire specs)
=======
=======
=======
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
              factory :book do
>>>>>>> c7a726c5 (Rebased)
          
        3. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> bdc24a1a (Rebased)
=======
>>>>>>> 8887ba5b (Fix)
=======
>>>>>>> 53db2224 (Featire specs)
=======
>>>>>>> 7b22ad7e (Featire specs)
=======
>>>>>>> b97bb382 (Featire specs)
=======
>>>>>>> 4a2f2ad8 (Featire specs)
=======
>>>>>>> 21873de0 (Featire specs)
=======
>>>>>>> 392646b5 (Featire specs)
=======
>>>>>>> 1049b80c (Fix)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
          
      3. 
            95
=======
>>>>>>> 84003439 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> 659083f (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> e055dd0 (Rebased)
=======
>>>>>>> 0c57e4e (Fix)
=======
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 973ba8c (Featire specs)
=======
>>>>>>> 8181d13 (Featire specs)
=======
>>>>>>> 72b9cab (Featire specs)
=======
>>>>>>> 15c51b7 (Featire specs)
=======
>>>>>>> 9e081dc (Fix)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
>>>>>>> 13fca83d (Rebased)
=======
>>>>>>> 0341d6de (Manifest_cache true)
=======
>>>>>>> 21793167 (Manifest_cache true)
=======
>>>>>>> d245196f (Manifest_cache true)
=======
>>>>>>> 304cd28a (Manifest_cache true)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> 74240509 (Fix book_spec decrease quantity and price)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> e59c273d (Manifest_cache true)
=======
>>>>>>> a1a479e2 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7afa007b (Manifest_cache true)
=======
>>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d9d85ca6 (Fix)
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 5b7749a (Fix)
=======
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 251144b4 (Manifest_cache true)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
          
      4. 
            1
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      5. 
            1
=======
          
      6. 
            3
>>>>>>> 02a399d (Manifest_cache true)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
          
      7. 
            3
=======
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
          
      8. 
            82
=======
          
      9. 
            3
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
=======
          
      10. 
            80
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 4f4ea3f9 (Featire specs)
=======
          
      11. 
            3
>>>>>>> bd8bda4 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
          
      12. 
            3
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 490b01d6 (Manifest_cache true)
=======
=======
          
      13. 
            3
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
      14. 
            82
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      15. 
            3
>>>>>>> fd6db03 (Manifest_cache true)
=======
          
      16. 
            82
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
          
      17. 
            1
>>>>>>> 75fa7e1b (Rebased)
=======
=======
>>>>>>> 251144b4 (Manifest_cache true)
          
      18. 
            80
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      19. 
            3
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
      20. 
            80
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
          
      21. 
            3
<<<<<<< HEAD
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 251144b4 (Manifest_cache true)
=======
=======
>>>>>>> fd6db03 (Manifest_cache true)
=======
          
      22. 
            82
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
          
      23. 
            1
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 13fca83d (Rebased)
=======
=======
=======
>>>>>>> 307f31f (Manifest_cache true)
=======
>>>>>>> d782a28 (Manifest_cache true)
=======
>>>>>>> 35d17b9 (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 64dceec (Manifest_cache true)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      24. 
            1
=======
          
      25. 
            3
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0341d6de (Manifest_cache true)
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      26. 
            82
=======
          
      27. 
            3
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 21793167 (Manifest_cache true)
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      28. 
            3
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d245196f (Manifest_cache true)
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      29. 
            3
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 35d17b9 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 304cd28a (Manifest_cache true)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      30. 
            3
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      31. 
            82
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 74240509 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
          
      32. 
            3
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e59c273d (Manifest_cache true)
=======
=======
=======
          
      33. 
            82
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a1a479e2 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
      34. 
            3
>>>>>>> 998f08d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 64dceec (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 7afa007b (Manifest_cache true)
=======
=======
=======
          
      35. 
            82
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price)
=======
=======
          
      36. 
            1
>>>>>>> 5b7749a (Fix)
>>>>>>> d9d85ca6 (Fix)
=======
          
      37. 
            95
>>>>>>> c7a726c5 (Rebased)
=======
          
      38. 
            95
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
          
      39. 
            3
=======
<<<<<<< HEAD
          
      40. 
            82
=======
          
      41. 
            3
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
=======
          
      42. 
            80
>>>>>>> 752f0c0 (Featire specs)
=======
          
      43. 
            3
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
      44. 
            80
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      45. 
            3
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
      46. 
            80
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
>>>>>>> 9bfbd88 (Featire specs)
<<<<<<< HEAD
>>>>>>> ebcdce06 (Featire specs)
=======
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
=======
=======
          
      47. 
            3
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
      48. 
            82
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bb5c652 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
=======
          
      49. 
            95
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9a49b7b (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 0676508 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
          
      50. 
            95
=======
          
      51. 
            80
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
>>>>>>> 3cf8dd4 (Featire specs)
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 70fcacc (Featire specs)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
=======
=======
          
      52. 
            80
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ae409ca (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> e18eb87 (Fix)
=======
=======
          
      53. 
            80
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 379a979 (Featire specs)
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
=======
=======
          
      54. 
            80
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> adc21e0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 610b6138 (Featire specs)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> e18eb87 (Fix)
=======
=======
          
      55. 
            80
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4d90e3d (Featire specs)
<<<<<<< HEAD
>>>>>>> 37e48018 (Featire specs)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> ed32b84 (Featire specs)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 49e8a6c (Rebased)
>>>>>>> 311e9fa (Rebased)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> 49e8a6c (Rebased)
>>>>>>> e055dd0 (Rebased)
=======
          
      56. 
            1
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> aa3618b (Rebased)
<<<<<<< HEAD
>>>>>>> 11792758 (Rebased)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 311e9fa (Rebased)
=======
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> e055dd0 (Rebased)
=======
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 0c57e4e (Fix)
=======
          
      57. 
            97
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 160fb15 (Fix)
<<<<<<< HEAD
>>>>>>> 31d15e66 (Fix)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 0c57e4e (Fix)
=======
>>>>>>> 5e31aeb (Featire specs)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> fdab719f (Fix)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> bc6bc8d2 (Rebased)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> 8288136d (Fix)
=======
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
=======
=======
=======
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 973ba8c (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> 8181d13 (Featire specs)
=======
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> 72b9cab (Featire specs)
=======
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> 15c51b7 (Featire specs)
          
      58. 
            97
=======
          
      59. 
            80
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> d52f9efe (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      60. 
            80
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      61. 
            80
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> c12b71de (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      62. 
            80
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> e54deeb (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
<<<<<<< HEAD
>>>>>>> e54deeb (Featire specs)
=======
=======
          
      63. 
            80
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
=======
          
      64. 
            80
>>>>>>> 4552227 (Featire specs)
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b904d7ae (Featire specs)
=======
=======
=======
          
      65. 
            105
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
>>>>>>> ef483b6d (Fix)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> b28889f (Fix)
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
>>>>>>> 49e8a6c (Rebased)
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 0c57e4e (Fix)
<<<<<<< HEAD
>>>>>>> 8887ba5b (Fix)
=======
=======
=======
>>>>>>> 51bc18c (Featire specs)
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5e31aeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 53db2224 (Featire specs)
=======
=======
=======
=======
=======
          
      66. 
            80
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
=======
=======
          
      67. 
            80
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
=======
=======
=======
          
      68. 
            80
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
=======
=======
=======
          
      69. 
            80
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
=======
=======
=======
          
      70. 
            80
>>>>>>> 4552227 (Featire specs)
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 392646b5 (Featire specs)
=======
=======
=======
=======
          
      71. 
            105
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            

            

                user
          
        72. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> bdc24a1a (Rebased)
=======
>>>>>>> 8887ba5b (Fix)
=======
>>>>>>> 53db2224 (Featire specs)
=======
>>>>>>> 7b22ad7e (Featire specs)
=======
>>>>>>> b97bb382 (Featire specs)
=======
>>>>>>> 4a2f2ad8 (Featire specs)
=======
>>>>>>> 21873de0 (Featire specs)
=======
>>>>>>> 392646b5 (Featire specs)
=======
>>>>>>> 1049b80c (Fix)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
          
      72. 
            109
=======
>>>>>>> 84003439 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> 659083f (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> e055dd0 (Rebased)
=======
>>>>>>> 0c57e4e (Fix)
=======
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 973ba8c (Featire specs)
=======
>>>>>>> 8181d13 (Featire specs)
=======
>>>>>>> 72b9cab (Featire specs)
=======
>>>>>>> 15c51b7 (Featire specs)
=======
>>>>>>> 9e081dc (Fix)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
>>>>>>> 13fca83d (Rebased)
=======
>>>>>>> 0341d6de (Manifest_cache true)
=======
>>>>>>> 21793167 (Manifest_cache true)
=======
>>>>>>> d245196f (Manifest_cache true)
=======
>>>>>>> 304cd28a (Manifest_cache true)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> 74240509 (Fix book_spec decrease quantity and price)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> e59c273d (Manifest_cache true)
=======
>>>>>>> a1a479e2 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7afa007b (Manifest_cache true)
=======
>>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d9d85ca6 (Fix)
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 5b7749a (Fix)
=======
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 251144b4 (Manifest_cache true)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
          
      73. 
            1
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      74. 
            1
=======
          
      75. 
            3
>>>>>>> 02a399d (Manifest_cache true)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
          
      76. 
            3
=======
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
          
      77. 
            92
=======
          
      78. 
            3
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
=======
          
      79. 
            90
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 4f4ea3f9 (Featire specs)
=======
          
      80. 
            3
>>>>>>> bd8bda4 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
          
      81. 
            3
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 490b01d6 (Manifest_cache true)
=======
=======
          
      82. 
            3
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
      83. 
            92
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      84. 
            3
>>>>>>> fd6db03 (Manifest_cache true)
=======
          
      85. 
            92
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
          
      86. 
            1
>>>>>>> 75fa7e1b (Rebased)
=======
=======
>>>>>>> 251144b4 (Manifest_cache true)
          
      87. 
            90
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      88. 
            3
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
      89. 
            90
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
          
      90. 
            3
<<<<<<< HEAD
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 251144b4 (Manifest_cache true)
=======
=======
>>>>>>> fd6db03 (Manifest_cache true)
=======
          
      91. 
            92
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
          
      92. 
            1
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 13fca83d (Rebased)
=======
=======
=======
>>>>>>> 307f31f (Manifest_cache true)
=======
>>>>>>> d782a28 (Manifest_cache true)
=======
>>>>>>> 35d17b9 (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 64dceec (Manifest_cache true)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      93. 
            1
=======
          
      94. 
            3
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0341d6de (Manifest_cache true)
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      95. 
            92
=======
          
      96. 
            3
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 21793167 (Manifest_cache true)
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      97. 
            3
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d245196f (Manifest_cache true)
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      98. 
            3
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 35d17b9 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 304cd28a (Manifest_cache true)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      99. 
            3
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      100. 
            92
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 74240509 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
          
      101. 
            3
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e59c273d (Manifest_cache true)
=======
=======
=======
          
      102. 
            92
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a1a479e2 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
      103. 
            3
>>>>>>> 998f08d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 64dceec (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 7afa007b (Manifest_cache true)
=======
=======
=======
          
      104. 
            92
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price)
=======
=======
          
      105. 
            1
>>>>>>> 5b7749a (Fix)
>>>>>>> d9d85ca6 (Fix)
=======
          
      106. 
            109
>>>>>>> c7a726c5 (Rebased)
=======
          
      107. 
            109
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
          
      108. 
            3
=======
<<<<<<< HEAD
          
      109. 
            92
=======
          
      110. 
            3
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
=======
          
      111. 
            90
>>>>>>> 752f0c0 (Featire specs)
=======
          
      112. 
            3
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
      113. 
            90
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      114. 
            3
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
      115. 
            90
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
>>>>>>> 9bfbd88 (Featire specs)
<<<<<<< HEAD
>>>>>>> ebcdce06 (Featire specs)
=======
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
=======
=======
          
      116. 
            3
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
      117. 
            92
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bb5c652 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
=======
          
      118. 
            109
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9a49b7b (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 0676508 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
          
      119. 
            109
=======
          
      120. 
            90
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
>>>>>>> 3cf8dd4 (Featire specs)
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 70fcacc (Featire specs)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
=======
=======
          
      121. 
            90
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ae409ca (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> e18eb87 (Fix)
=======
=======
          
      122. 
            90
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 379a979 (Featire specs)
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
=======
=======
          
      123. 
            90
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> adc21e0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 610b6138 (Featire specs)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> e18eb87 (Fix)
=======
=======
          
      124. 
            90
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4d90e3d (Featire specs)
<<<<<<< HEAD
>>>>>>> 37e48018 (Featire specs)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> ed32b84 (Featire specs)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 49e8a6c (Rebased)
>>>>>>> 311e9fa (Rebased)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> 49e8a6c (Rebased)
>>>>>>> e055dd0 (Rebased)
=======
          
      125. 
            1
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> aa3618b (Rebased)
<<<<<<< HEAD
>>>>>>> 11792758 (Rebased)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 311e9fa (Rebased)
=======
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> e055dd0 (Rebased)
=======
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 0c57e4e (Fix)
=======
          
      126. 
            111
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 160fb15 (Fix)
<<<<<<< HEAD
>>>>>>> 31d15e66 (Fix)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 0c57e4e (Fix)
=======
>>>>>>> 5e31aeb (Featire specs)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> fdab719f (Fix)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> bc6bc8d2 (Rebased)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> 8288136d (Fix)
=======
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
=======
=======
=======
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 973ba8c (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> 8181d13 (Featire specs)
=======
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> 72b9cab (Featire specs)
=======
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> 15c51b7 (Featire specs)
          
      127. 
            111
=======
          
      128. 
            90
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> d52f9efe (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      129. 
            90
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      130. 
            90
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> c12b71de (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      131. 
            90
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> e54deeb (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
<<<<<<< HEAD
>>>>>>> e54deeb (Featire specs)
=======
=======
          
      132. 
            90
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
=======
          
      133. 
            90
>>>>>>> 4552227 (Featire specs)
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b904d7ae (Featire specs)
=======
=======
=======
          
      134. 
            119
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
>>>>>>> ef483b6d (Fix)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> b28889f (Fix)
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
>>>>>>> 49e8a6c (Rebased)
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 0c57e4e (Fix)
<<<<<<< HEAD
>>>>>>> 8887ba5b (Fix)
=======
=======
=======
>>>>>>> 51bc18c (Featire specs)
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5e31aeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 53db2224 (Featire specs)
=======
=======
=======
=======
=======
          
      135. 
            90
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
=======
=======
          
      136. 
            90
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
=======
=======
=======
          
      137. 
            90
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
=======
=======
=======
          
      138. 
            90
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
=======
=======
=======
          
      139. 
            90
>>>>>>> 4552227 (Featire specs)
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 392646b5 (Featire specs)
=======
=======
=======
=======
          
      140. 
            119
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            

            

                address { FFaker::AddressUA.street_address }
          
        141. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> bdc24a1a (Rebased)
=======
>>>>>>> 8887ba5b (Fix)
=======
>>>>>>> 53db2224 (Featire specs)
=======
>>>>>>> 7b22ad7e (Featire specs)
=======
>>>>>>> b97bb382 (Featire specs)
=======
>>>>>>> 4a2f2ad8 (Featire specs)
=======
>>>>>>> 21873de0 (Featire specs)
=======
>>>>>>> 392646b5 (Featire specs)
=======
>>>>>>> 1049b80c (Fix)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
          
      141. 
            92
=======
>>>>>>> 84003439 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> 659083f (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> e055dd0 (Rebased)
=======
>>>>>>> 0c57e4e (Fix)
=======
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 973ba8c (Featire specs)
=======
>>>>>>> 8181d13 (Featire specs)
=======
>>>>>>> 72b9cab (Featire specs)
=======
>>>>>>> 15c51b7 (Featire specs)
=======
>>>>>>> 9e081dc (Fix)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
>>>>>>> 13fca83d (Rebased)
=======
>>>>>>> 0341d6de (Manifest_cache true)
=======
>>>>>>> 21793167 (Manifest_cache true)
=======
>>>>>>> d245196f (Manifest_cache true)
=======
>>>>>>> 304cd28a (Manifest_cache true)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> 74240509 (Fix book_spec decrease quantity and price)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> e59c273d (Manifest_cache true)
=======
>>>>>>> a1a479e2 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7afa007b (Manifest_cache true)
=======
>>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d9d85ca6 (Fix)
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 5b7749a (Fix)
=======
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 251144b4 (Manifest_cache true)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
          
      142. 
            1
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      143. 
            1
=======
          
      144. 
            3
>>>>>>> 02a399d (Manifest_cache true)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
          
      145. 
            3
=======
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
          
      146. 
            82
=======
          
      147. 
            3
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
=======
          
      148. 
            80
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 4f4ea3f9 (Featire specs)
=======
          
      149. 
            3
>>>>>>> bd8bda4 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
          
      150. 
            3
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 490b01d6 (Manifest_cache true)
=======
=======
          
      151. 
            3
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
      152. 
            82
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      153. 
            3
>>>>>>> fd6db03 (Manifest_cache true)
=======
          
      154. 
            82
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
          
      155. 
            1
>>>>>>> 75fa7e1b (Rebased)
=======
=======
>>>>>>> 251144b4 (Manifest_cache true)
          
      156. 
            80
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      157. 
            3
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
      158. 
            80
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
          
      159. 
            3
<<<<<<< HEAD
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 251144b4 (Manifest_cache true)
=======
=======
>>>>>>> fd6db03 (Manifest_cache true)
=======
          
      160. 
            82
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
          
      161. 
            1
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 13fca83d (Rebased)
=======
=======
=======
>>>>>>> 307f31f (Manifest_cache true)
=======
>>>>>>> d782a28 (Manifest_cache true)
=======
>>>>>>> 35d17b9 (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 64dceec (Manifest_cache true)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      162. 
            1
=======
          
      163. 
            3
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0341d6de (Manifest_cache true)
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      164. 
            82
=======
          
      165. 
            3
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 21793167 (Manifest_cache true)
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      166. 
            3
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d245196f (Manifest_cache true)
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      167. 
            3
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 35d17b9 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 304cd28a (Manifest_cache true)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      168. 
            3
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      169. 
            82
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 74240509 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
          
      170. 
            3
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e59c273d (Manifest_cache true)
=======
=======
=======
          
      171. 
            82
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a1a479e2 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
      172. 
            3
>>>>>>> 998f08d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 64dceec (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 7afa007b (Manifest_cache true)
=======
=======
=======
          
      173. 
            82
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price)
=======
=======
          
      174. 
            1
>>>>>>> 5b7749a (Fix)
>>>>>>> d9d85ca6 (Fix)
=======
          
      175. 
            92
>>>>>>> c7a726c5 (Rebased)
=======
          
      176. 
            92
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
          
      177. 
            3
=======
<<<<<<< HEAD
          
      178. 
            82
=======
          
      179. 
            3
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
=======
          
      180. 
            80
>>>>>>> 752f0c0 (Featire specs)
=======
          
      181. 
            3
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
      182. 
            80
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      183. 
            3
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
      184. 
            80
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
>>>>>>> 9bfbd88 (Featire specs)
<<<<<<< HEAD
>>>>>>> ebcdce06 (Featire specs)
=======
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
=======
=======
          
      185. 
            3
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
      186. 
            82
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bb5c652 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
=======
          
      187. 
            92
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9a49b7b (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 0676508 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
          
      188. 
            92
=======
          
      189. 
            80
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
>>>>>>> 3cf8dd4 (Featire specs)
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 70fcacc (Featire specs)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
=======
=======
          
      190. 
            80
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ae409ca (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> e18eb87 (Fix)
=======
=======
          
      191. 
            80
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 379a979 (Featire specs)
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
=======
=======
          
      192. 
            80
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> adc21e0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 610b6138 (Featire specs)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> e18eb87 (Fix)
=======
=======
          
      193. 
            80
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4d90e3d (Featire specs)
<<<<<<< HEAD
>>>>>>> 37e48018 (Featire specs)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> ed32b84 (Featire specs)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 49e8a6c (Rebased)
>>>>>>> 311e9fa (Rebased)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> 49e8a6c (Rebased)
>>>>>>> e055dd0 (Rebased)
=======
          
      194. 
            1
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> aa3618b (Rebased)
<<<<<<< HEAD
>>>>>>> 11792758 (Rebased)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 311e9fa (Rebased)
=======
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> e055dd0 (Rebased)
=======
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 0c57e4e (Fix)
=======
          
      195. 
            94
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 160fb15 (Fix)
<<<<<<< HEAD
>>>>>>> 31d15e66 (Fix)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 0c57e4e (Fix)
=======
>>>>>>> 5e31aeb (Featire specs)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> fdab719f (Fix)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> bc6bc8d2 (Rebased)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> 8288136d (Fix)
=======
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
=======
=======
=======
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 973ba8c (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> 8181d13 (Featire specs)
=======
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> 72b9cab (Featire specs)
=======
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> 15c51b7 (Featire specs)
          
      196. 
            94
=======
          
      197. 
            80
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> d52f9efe (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      198. 
            80
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      199. 
            80
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> c12b71de (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      200. 
            80
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> e54deeb (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
<<<<<<< HEAD
>>>>>>> e54deeb (Featire specs)
=======
=======
          
      201. 
            80
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
=======
          
      202. 
            80
>>>>>>> 4552227 (Featire specs)
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b904d7ae (Featire specs)
=======
=======
=======
          
      203. 
            98
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
>>>>>>> ef483b6d (Fix)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> b28889f (Fix)
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
>>>>>>> 49e8a6c (Rebased)
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 0c57e4e (Fix)
<<<<<<< HEAD
>>>>>>> 8887ba5b (Fix)
=======
=======
=======
>>>>>>> 51bc18c (Featire specs)
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5e31aeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 53db2224 (Featire specs)
=======
=======
=======
=======
=======
          
      204. 
            80
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
=======
=======
          
      205. 
            80
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
=======
=======
=======
          
      206. 
            80
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
=======
=======
=======
          
      207. 
            80
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
=======
=======
=======
          
      208. 
            80
>>>>>>> 4552227 (Featire specs)
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 392646b5 (Featire specs)
=======
=======
=======
=======
          
      209. 
            98
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                city { FFaker::AddressUA.city }
=======
                price_cents { FFaker::Number.rand(10_000) }
>>>>>>> c7a726c5 (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> c12b71de (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> b904d7ae (Featire specs)
=======
>>>>>>> ef483b6d (Fix)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> bdc24a1a (Rebased)
=======
>>>>>>> 53db2224 (Featire specs)
=======
>>>>>>> 7b22ad7e (Featire specs)
=======
>>>>>>> b97bb382 (Featire specs)
=======
>>>>>>> 4a2f2ad8 (Featire specs)
=======
>>>>>>> 21873de0 (Featire specs)
=======
>>>>>>> 392646b5 (Featire specs)
=======
>>>>>>> 1049b80c (Fix)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> e055dd0 (Rebased)
=======
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 973ba8c (Featire specs)
=======
>>>>>>> 8181d13 (Featire specs)
=======
>>>>>>> 72b9cab (Featire specs)
=======
>>>>>>> 15c51b7 (Featire specs)
=======
>>>>>>> 9e081dc (Fix)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> 53db2224 (Featire specs)
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> d52f9efe (Featire specs)
=======
=======
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
>>>>>>> 7b22ad7e (Featire specs)
=======
>>>>>>> b97bb382 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c12b71de (Featire specs)
=======
=======
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 392646b5 (Featire specs)
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
                price_cents { FFaker::Number.rand(10_000) }
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b904d7ae (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
>>>>>>> 5507b42 (Featire specs)
>>>>>>> 5e31aeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 53db2224 (Featire specs)
=======
=======
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> 973ba8c (Featire specs)
>>>>>>> b97bb382 (Featire specs)
                price_cents { FFaker::Number.rand(10_000) }
=======
                price { FFaker::Number.rand(100) }
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
                price { FFaker::Number.rand(100) }
>>>>>>> 752f0c0 (Featire specs)
=======
                price { FFaker::Number.rand(100) }
>>>>>>> 4e81ea2 (Featire specs)
=======
                price { FFaker::Number.rand(100) }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 610b6138 (Featire specs)
=======
=======
                price { FFaker::Number.rand(100) }
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 37e48018 (Featire specs)
=======
                price_cents { FFaker::Number.rand(10_000) }
>>>>>>> 11792758 (Rebased)
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 53db2224 (Featire specs)
=======
>>>>>>> 7b22ad7e (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
>>>>>>> 824bb2b (Featire specs)
=======
=======
                price { FFaker::Number.rand(100) }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
                price { FFaker::Number.rand(100) }
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 973ba8c (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
=======
                price { FFaker::Number.rand(100) }
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
=======
                price { FFaker::Number.rand(100) }
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
                price { FFaker::Number.rand(100) }
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 4e81ea2 (Featire specs)
=======
                price { FFaker::Number.rand(100) }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
                price { FFaker::Number.rand(100) }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
                price_cents { FFaker::Number.rand(10_000) }
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> bc6bc8d2 (Rebased)
=======
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> d52f9efe (Featire specs)
=======
=======
=======
=======
                price { FFaker::Number.rand(100) }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
=======
                price { FFaker::Number.rand(100) }
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> c12b71de (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
=======
                price { FFaker::Number.rand(100) }
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
                price { FFaker::Number.rand(100) }
>>>>>>> 4552227 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b904d7ae (Featire specs)
=======
=======
                price_cents { FFaker::Number.rand(10_000) }
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
>>>>>>> ef483b6d (Fix)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
                price { FFaker::Number.rand(100) }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 0676508 (Featire specs)
=======
                price { FFaker::Number.rand(100) }
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
=======
                price { FFaker::Number.rand(100) }
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
                price { FFaker::Number.rand(100) }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
=======
                price { FFaker::Number.rand(100) }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
                price_cents { FFaker::Number.rand(10_000) }
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5e31aeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 53db2224 (Featire specs)
=======
=======
=======
=======
                price { FFaker::Number.rand(100) }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
                price { FFaker::Number.rand(100) }
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
=======
=======
                price { FFaker::Number.rand(100) }
>>>>>>> 08edf50 (Featire specs)
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
=======
=======
                price { FFaker::Number.rand(100) }
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
=======
=======
                price { FFaker::Number.rand(100) }
>>>>>>> 4552227 (Featire specs)
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 392646b5 (Featire specs)
=======
=======
=======
                price_cents { FFaker::Number.rand(10_000) }
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
                price { FFaker::Number.rand(100) }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
=======
                price { FFaker::Number.rand(100) }
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
=======
                price { FFaker::Number.rand(100) }
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
        210. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> bdc24a1a (Rebased)
=======
>>>>>>> 8887ba5b (Fix)
=======
>>>>>>> 53db2224 (Featire specs)
=======
>>>>>>> 7b22ad7e (Featire specs)
=======
>>>>>>> b97bb382 (Featire specs)
=======
>>>>>>> 4a2f2ad8 (Featire specs)
=======
>>>>>>> 21873de0 (Featire specs)
=======
>>>>>>> 392646b5 (Featire specs)
=======
>>>>>>> 1049b80c (Fix)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
          
      210. 
            109
=======
>>>>>>> 84003439 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> 659083f (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> e055dd0 (Rebased)
=======
>>>>>>> 0c57e4e (Fix)
=======
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 973ba8c (Featire specs)
=======
>>>>>>> 8181d13 (Featire specs)
=======
>>>>>>> 72b9cab (Featire specs)
=======
>>>>>>> 15c51b7 (Featire specs)
=======
>>>>>>> 9e081dc (Fix)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
>>>>>>> 13fca83d (Rebased)
=======
>>>>>>> 0341d6de (Manifest_cache true)
=======
>>>>>>> 21793167 (Manifest_cache true)
=======
>>>>>>> d245196f (Manifest_cache true)
=======
>>>>>>> 304cd28a (Manifest_cache true)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> 74240509 (Fix book_spec decrease quantity and price)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> e59c273d (Manifest_cache true)
=======
>>>>>>> a1a479e2 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7afa007b (Manifest_cache true)
=======
>>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d9d85ca6 (Fix)
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 5b7749a (Fix)
=======
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 251144b4 (Manifest_cache true)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
          
      211. 
            1
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      212. 
            1
=======
          
      213. 
            3
>>>>>>> 02a399d (Manifest_cache true)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
          
      214. 
            3
=======
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
          
      215. 
            92
=======
          
      216. 
            3
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
=======
          
      217. 
            90
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 4f4ea3f9 (Featire specs)
=======
          
      218. 
            3
>>>>>>> bd8bda4 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
          
      219. 
            3
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 490b01d6 (Manifest_cache true)
=======
=======
          
      220. 
            3
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
      221. 
            92
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      222. 
            3
>>>>>>> fd6db03 (Manifest_cache true)
=======
          
      223. 
            92
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
          
      224. 
            1
>>>>>>> 75fa7e1b (Rebased)
=======
=======
>>>>>>> 251144b4 (Manifest_cache true)
          
      225. 
            90
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      226. 
            3
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
      227. 
            90
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
          
      228. 
            3
<<<<<<< HEAD
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 251144b4 (Manifest_cache true)
=======
=======
>>>>>>> fd6db03 (Manifest_cache true)
=======
          
      229. 
            92
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
          
      230. 
            1
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 13fca83d (Rebased)
=======
=======
=======
>>>>>>> 307f31f (Manifest_cache true)
=======
>>>>>>> d782a28 (Manifest_cache true)
=======
>>>>>>> 35d17b9 (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 64dceec (Manifest_cache true)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      231. 
            1
=======
          
      232. 
            3
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0341d6de (Manifest_cache true)
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      233. 
            92
=======
          
      234. 
            3
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 21793167 (Manifest_cache true)
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      235. 
            3
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d245196f (Manifest_cache true)
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      236. 
            3
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 35d17b9 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 304cd28a (Manifest_cache true)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      237. 
            3
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      238. 
            92
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 74240509 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
          
      239. 
            3
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e59c273d (Manifest_cache true)
=======
=======
=======
          
      240. 
            92
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a1a479e2 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
      241. 
            3
>>>>>>> 998f08d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 64dceec (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 7afa007b (Manifest_cache true)
=======
=======
=======
          
      242. 
            92
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price)
=======
=======
          
      243. 
            1
>>>>>>> 5b7749a (Fix)
>>>>>>> d9d85ca6 (Fix)
=======
          
      244. 
            109
>>>>>>> c7a726c5 (Rebased)
=======
          
      245. 
            109
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
          
      246. 
            3
=======
<<<<<<< HEAD
          
      247. 
            92
=======
          
      248. 
            3
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
=======
          
      249. 
            90
>>>>>>> 752f0c0 (Featire specs)
=======
          
      250. 
            3
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
      251. 
            90
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      252. 
            3
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
      253. 
            90
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
>>>>>>> 9bfbd88 (Featire specs)
<<<<<<< HEAD
>>>>>>> ebcdce06 (Featire specs)
=======
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
=======
=======
          
      254. 
            3
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
      255. 
            92
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bb5c652 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
=======
          
      256. 
            109
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9a49b7b (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 0676508 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
          
      257. 
            109
=======
          
      258. 
            90
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
>>>>>>> 3cf8dd4 (Featire specs)
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 70fcacc (Featire specs)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
=======
=======
          
      259. 
            90
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ae409ca (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> e18eb87 (Fix)
=======
=======
          
      260. 
            90
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 379a979 (Featire specs)
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
=======
=======
          
      261. 
            90
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> adc21e0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 610b6138 (Featire specs)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> e18eb87 (Fix)
=======
=======
          
      262. 
            90
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4d90e3d (Featire specs)
<<<<<<< HEAD
>>>>>>> 37e48018 (Featire specs)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> ed32b84 (Featire specs)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 49e8a6c (Rebased)
>>>>>>> 311e9fa (Rebased)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> 49e8a6c (Rebased)
>>>>>>> e055dd0 (Rebased)
=======
          
      263. 
            1
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> aa3618b (Rebased)
<<<<<<< HEAD
>>>>>>> 11792758 (Rebased)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 311e9fa (Rebased)
=======
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> e055dd0 (Rebased)
=======
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 0c57e4e (Fix)
=======
          
      264. 
            111
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 160fb15 (Fix)
<<<<<<< HEAD
>>>>>>> 31d15e66 (Fix)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 0c57e4e (Fix)
=======
>>>>>>> 5e31aeb (Featire specs)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> fdab719f (Fix)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> bc6bc8d2 (Rebased)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> 8288136d (Fix)
=======
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
=======
=======
=======
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 973ba8c (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> 8181d13 (Featire specs)
=======
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> 72b9cab (Featire specs)
=======
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> 15c51b7 (Featire specs)
          
      265. 
            111
=======
          
      266. 
            90
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> d52f9efe (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      267. 
            90
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      268. 
            90
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> c12b71de (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      269. 
            90
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> e54deeb (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
<<<<<<< HEAD
>>>>>>> e54deeb (Featire specs)
=======
=======
          
      270. 
            90
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
=======
          
      271. 
            90
>>>>>>> 4552227 (Featire specs)
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b904d7ae (Featire specs)
=======
=======
=======
          
      272. 
            119
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
>>>>>>> ef483b6d (Fix)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> b28889f (Fix)
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
>>>>>>> 49e8a6c (Rebased)
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 0c57e4e (Fix)
<<<<<<< HEAD
>>>>>>> 8887ba5b (Fix)
=======
=======
=======
>>>>>>> 51bc18c (Featire specs)
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5e31aeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 53db2224 (Featire specs)
=======
=======
=======
=======
=======
          
      273. 
            90
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
=======
=======
          
      274. 
            90
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
=======
=======
=======
          
      275. 
            90
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
=======
=======
=======
          
      276. 
            90
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
=======
=======
=======
          
      277. 
            90
>>>>>>> 4552227 (Featire specs)
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 392646b5 (Featire specs)
=======
=======
=======
=======
          
      278. 
            119
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            

            

                zip { FFaker::AddressUA.zip_code }
          
        279. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> bdc24a1a (Rebased)
=======
>>>>>>> 8887ba5b (Fix)
=======
>>>>>>> 53db2224 (Featire specs)
=======
>>>>>>> 7b22ad7e (Featire specs)
=======
>>>>>>> b97bb382 (Featire specs)
=======
>>>>>>> 4a2f2ad8 (Featire specs)
=======
>>>>>>> 21873de0 (Featire specs)
=======
>>>>>>> 392646b5 (Featire specs)
=======
>>>>>>> 1049b80c (Fix)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
          
      279. 
            109
=======
>>>>>>> 84003439 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> 659083f (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> e055dd0 (Rebased)
=======
>>>>>>> 0c57e4e (Fix)
=======
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 973ba8c (Featire specs)
=======
>>>>>>> 8181d13 (Featire specs)
=======
>>>>>>> 72b9cab (Featire specs)
=======
>>>>>>> 15c51b7 (Featire specs)
=======
>>>>>>> 9e081dc (Fix)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
>>>>>>> 13fca83d (Rebased)
=======
>>>>>>> 0341d6de (Manifest_cache true)
=======
>>>>>>> 21793167 (Manifest_cache true)
=======
>>>>>>> d245196f (Manifest_cache true)
=======
>>>>>>> 304cd28a (Manifest_cache true)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> 74240509 (Fix book_spec decrease quantity and price)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> e59c273d (Manifest_cache true)
=======
>>>>>>> a1a479e2 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7afa007b (Manifest_cache true)
=======
>>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d9d85ca6 (Fix)
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 5b7749a (Fix)
=======
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 251144b4 (Manifest_cache true)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
          
      280. 
            1
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      281. 
            1
=======
          
      282. 
            3
>>>>>>> 02a399d (Manifest_cache true)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
          
      283. 
            3
=======
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
          
      284. 
            92
=======
          
      285. 
            3
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
=======
          
      286. 
            90
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 4f4ea3f9 (Featire specs)
=======
          
      287. 
            3
>>>>>>> bd8bda4 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
          
      288. 
            3
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 490b01d6 (Manifest_cache true)
=======
=======
          
      289. 
            3
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
      290. 
            92
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      291. 
            3
>>>>>>> fd6db03 (Manifest_cache true)
=======
          
      292. 
            92
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
          
      293. 
            1
>>>>>>> 75fa7e1b (Rebased)
=======
=======
>>>>>>> 251144b4 (Manifest_cache true)
          
      294. 
            90
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      295. 
            3
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
      296. 
            90
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
          
      297. 
            3
<<<<<<< HEAD
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 251144b4 (Manifest_cache true)
=======
=======
>>>>>>> fd6db03 (Manifest_cache true)
=======
          
      298. 
            92
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
          
      299. 
            1
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 13fca83d (Rebased)
=======
=======
=======
>>>>>>> 307f31f (Manifest_cache true)
=======
>>>>>>> d782a28 (Manifest_cache true)
=======
>>>>>>> 35d17b9 (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 64dceec (Manifest_cache true)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      300. 
            1
=======
          
      301. 
            3
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0341d6de (Manifest_cache true)
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      302. 
            92
=======
          
      303. 
            3
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 21793167 (Manifest_cache true)
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      304. 
            3
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d245196f (Manifest_cache true)
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      305. 
            3
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 35d17b9 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 304cd28a (Manifest_cache true)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      306. 
            3
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      307. 
            92
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 74240509 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
          
      308. 
            3
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e59c273d (Manifest_cache true)
=======
=======
=======
          
      309. 
            92
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a1a479e2 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
      310. 
            3
>>>>>>> 998f08d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 64dceec (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 7afa007b (Manifest_cache true)
=======
=======
=======
          
      311. 
            92
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price)
=======
=======
          
      312. 
            1
>>>>>>> 5b7749a (Fix)
>>>>>>> d9d85ca6 (Fix)
=======
          
      313. 
            109
>>>>>>> c7a726c5 (Rebased)
=======
          
      314. 
            109
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
          
      315. 
            3
=======
<<<<<<< HEAD
          
      316. 
            92
=======
          
      317. 
            3
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
=======
          
      318. 
            90
>>>>>>> 752f0c0 (Featire specs)
=======
          
      319. 
            3
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
      320. 
            90
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      321. 
            3
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
      322. 
            90
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
>>>>>>> 9bfbd88 (Featire specs)
<<<<<<< HEAD
>>>>>>> ebcdce06 (Featire specs)
=======
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
=======
=======
          
      323. 
            3
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
      324. 
            92
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bb5c652 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
=======
          
      325. 
            109
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9a49b7b (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 0676508 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
          
      326. 
            109
=======
          
      327. 
            90
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
>>>>>>> 3cf8dd4 (Featire specs)
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 70fcacc (Featire specs)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
=======
=======
          
      328. 
            90
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ae409ca (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> e18eb87 (Fix)
=======
=======
          
      329. 
            90
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 379a979 (Featire specs)
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
=======
=======
          
      330. 
            90
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> adc21e0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 610b6138 (Featire specs)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> e18eb87 (Fix)
=======
=======
          
      331. 
            90
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4d90e3d (Featire specs)
<<<<<<< HEAD
>>>>>>> 37e48018 (Featire specs)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> ed32b84 (Featire specs)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 49e8a6c (Rebased)
>>>>>>> 311e9fa (Rebased)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> 49e8a6c (Rebased)
>>>>>>> e055dd0 (Rebased)
=======
          
      332. 
            1
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> aa3618b (Rebased)
<<<<<<< HEAD
>>>>>>> 11792758 (Rebased)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 311e9fa (Rebased)
=======
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> e055dd0 (Rebased)
=======
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 0c57e4e (Fix)
=======
          
      333. 
            111
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 160fb15 (Fix)
<<<<<<< HEAD
>>>>>>> 31d15e66 (Fix)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 0c57e4e (Fix)
=======
>>>>>>> 5e31aeb (Featire specs)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> fdab719f (Fix)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> bc6bc8d2 (Rebased)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> 8288136d (Fix)
=======
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
=======
=======
=======
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 973ba8c (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> 8181d13 (Featire specs)
=======
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> 72b9cab (Featire specs)
=======
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> 15c51b7 (Featire specs)
          
      334. 
            111
=======
          
      335. 
            90
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> d52f9efe (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      336. 
            90
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      337. 
            90
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> c12b71de (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      338. 
            90
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> e54deeb (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
<<<<<<< HEAD
>>>>>>> e54deeb (Featire specs)
=======
=======
          
      339. 
            90
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
=======
          
      340. 
            90
>>>>>>> 4552227 (Featire specs)
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b904d7ae (Featire specs)
=======
=======
=======
          
      341. 
            119
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
>>>>>>> ef483b6d (Fix)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> b28889f (Fix)
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
>>>>>>> 49e8a6c (Rebased)
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 0c57e4e (Fix)
<<<<<<< HEAD
>>>>>>> 8887ba5b (Fix)
=======
=======
=======
>>>>>>> 51bc18c (Featire specs)
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5e31aeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 53db2224 (Featire specs)
=======
=======
=======
=======
=======
          
      342. 
            90
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
=======
=======
          
      343. 
            90
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
=======
=======
=======
          
      344. 
            90
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
=======
=======
=======
          
      345. 
            90
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
=======
=======
=======
          
      346. 
            90
>>>>>>> 4552227 (Featire specs)
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 392646b5 (Featire specs)
=======
=======
=======
=======
          
      347. 
            119
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            

            

                country { FFaker::AddressUA.country }
          
        348. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> bdc24a1a (Rebased)
=======
>>>>>>> 8887ba5b (Fix)
=======
>>>>>>> 53db2224 (Featire specs)
=======
>>>>>>> 7b22ad7e (Featire specs)
=======
>>>>>>> b97bb382 (Featire specs)
=======
>>>>>>> 4a2f2ad8 (Featire specs)
=======
>>>>>>> 21873de0 (Featire specs)
=======
>>>>>>> 392646b5 (Featire specs)
=======
>>>>>>> 1049b80c (Fix)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
          
      348. 
            109
=======
>>>>>>> 84003439 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> 659083f (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> e055dd0 (Rebased)
=======
>>>>>>> 0c57e4e (Fix)
=======
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 973ba8c (Featire specs)
=======
>>>>>>> 8181d13 (Featire specs)
=======
>>>>>>> 72b9cab (Featire specs)
=======
>>>>>>> 15c51b7 (Featire specs)
=======
>>>>>>> 9e081dc (Fix)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
>>>>>>> 13fca83d (Rebased)
=======
>>>>>>> 0341d6de (Manifest_cache true)
=======
>>>>>>> 21793167 (Manifest_cache true)
=======
>>>>>>> d245196f (Manifest_cache true)
=======
>>>>>>> 304cd28a (Manifest_cache true)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> 74240509 (Fix book_spec decrease quantity and price)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> e59c273d (Manifest_cache true)
=======
>>>>>>> a1a479e2 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7afa007b (Manifest_cache true)
=======
>>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d9d85ca6 (Fix)
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 5b7749a (Fix)
=======
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 251144b4 (Manifest_cache true)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
          
      349. 
            1
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      350. 
            1
=======
          
      351. 
            3
>>>>>>> 02a399d (Manifest_cache true)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
          
      352. 
            3
=======
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
          
      353. 
            92
=======
          
      354. 
            3
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
=======
          
      355. 
            90
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 4f4ea3f9 (Featire specs)
=======
          
      356. 
            3
>>>>>>> bd8bda4 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
          
      357. 
            3
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 490b01d6 (Manifest_cache true)
=======
=======
          
      358. 
            3
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
      359. 
            92
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      360. 
            3
>>>>>>> fd6db03 (Manifest_cache true)
=======
          
      361. 
            92
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
          
      362. 
            1
>>>>>>> 75fa7e1b (Rebased)
=======
=======
>>>>>>> 251144b4 (Manifest_cache true)
          
      363. 
            90
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      364. 
            3
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
      365. 
            90
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
          
      366. 
            3
<<<<<<< HEAD
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 251144b4 (Manifest_cache true)
=======
=======
>>>>>>> fd6db03 (Manifest_cache true)
=======
          
      367. 
            92
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
          
      368. 
            1
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 13fca83d (Rebased)
=======
=======
=======
>>>>>>> 307f31f (Manifest_cache true)
=======
>>>>>>> d782a28 (Manifest_cache true)
=======
>>>>>>> 35d17b9 (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 64dceec (Manifest_cache true)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      369. 
            1
=======
          
      370. 
            3
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0341d6de (Manifest_cache true)
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      371. 
            92
=======
          
      372. 
            3
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 21793167 (Manifest_cache true)
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      373. 
            3
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d245196f (Manifest_cache true)
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      374. 
            3
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 35d17b9 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 304cd28a (Manifest_cache true)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      375. 
            3
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      376. 
            92
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 74240509 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
          
      377. 
            3
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e59c273d (Manifest_cache true)
=======
=======
=======
          
      378. 
            92
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a1a479e2 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
      379. 
            3
>>>>>>> 998f08d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 64dceec (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 7afa007b (Manifest_cache true)
=======
=======
=======
          
      380. 
            92
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price)
=======
=======
          
      381. 
            1
>>>>>>> 5b7749a (Fix)
>>>>>>> d9d85ca6 (Fix)
=======
          
      382. 
            109
>>>>>>> c7a726c5 (Rebased)
=======
          
      383. 
            109
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
          
      384. 
            3
=======
<<<<<<< HEAD
          
      385. 
            92
=======
          
      386. 
            3
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
=======
          
      387. 
            90
>>>>>>> 752f0c0 (Featire specs)
=======
          
      388. 
            3
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
      389. 
            90
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      390. 
            3
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
      391. 
            90
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
>>>>>>> 9bfbd88 (Featire specs)
<<<<<<< HEAD
>>>>>>> ebcdce06 (Featire specs)
=======
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
=======
=======
          
      392. 
            3
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
      393. 
            92
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bb5c652 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
=======
          
      394. 
            109
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9a49b7b (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 0676508 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
          
      395. 
            109
=======
          
      396. 
            90
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
>>>>>>> 3cf8dd4 (Featire specs)
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 70fcacc (Featire specs)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
=======
=======
          
      397. 
            90
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ae409ca (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> e18eb87 (Fix)
=======
=======
          
      398. 
            90
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 379a979 (Featire specs)
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
=======
=======
          
      399. 
            90
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> adc21e0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 610b6138 (Featire specs)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> e18eb87 (Fix)
=======
=======
          
      400. 
            90
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4d90e3d (Featire specs)
<<<<<<< HEAD
>>>>>>> 37e48018 (Featire specs)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> ed32b84 (Featire specs)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 49e8a6c (Rebased)
>>>>>>> 311e9fa (Rebased)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> 49e8a6c (Rebased)
>>>>>>> e055dd0 (Rebased)
=======
          
      401. 
            1
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> aa3618b (Rebased)
<<<<<<< HEAD
>>>>>>> 11792758 (Rebased)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 311e9fa (Rebased)
=======
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> e055dd0 (Rebased)
=======
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 0c57e4e (Fix)
=======
          
      402. 
            111
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 160fb15 (Fix)
<<<<<<< HEAD
>>>>>>> 31d15e66 (Fix)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 0c57e4e (Fix)
=======
>>>>>>> 5e31aeb (Featire specs)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> fdab719f (Fix)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> bc6bc8d2 (Rebased)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> 8288136d (Fix)
=======
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
=======
=======
=======
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 973ba8c (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> 8181d13 (Featire specs)
=======
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> 72b9cab (Featire specs)
=======
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> 15c51b7 (Featire specs)
          
      403. 
            111
=======
          
      404. 
            90
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> d52f9efe (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      405. 
            90
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      406. 
            90
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> c12b71de (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      407. 
            90
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> e54deeb (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
<<<<<<< HEAD
>>>>>>> e54deeb (Featire specs)
=======
=======
          
      408. 
            90
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
=======
          
      409. 
            90
>>>>>>> 4552227 (Featire specs)
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b904d7ae (Featire specs)
=======
=======
=======
          
      410. 
            119
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
>>>>>>> ef483b6d (Fix)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> b28889f (Fix)
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
>>>>>>> 49e8a6c (Rebased)
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 0c57e4e (Fix)
<<<<<<< HEAD
>>>>>>> 8887ba5b (Fix)
=======
=======
=======
>>>>>>> 51bc18c (Featire specs)
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5e31aeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 53db2224 (Featire specs)
=======
=======
=======
=======
=======
          
      411. 
            90
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
=======
=======
          
      412. 
            90
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
=======
=======
=======
          
      413. 
            90
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
=======
=======
=======
          
      414. 
            90
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
=======
=======
=======
          
      415. 
            90
>>>>>>> 4552227 (Featire specs)
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 392646b5 (Featire specs)
=======
=======
=======
=======
          
      416. 
            119
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            

            

                phone { FFaker::PhoneNumberUA.home_phone_number }
          
        417. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
>>>>>>> 13fca83d (Rebased)
=======
>>>>>>> 0341d6de (Manifest_cache true)
=======
>>>>>>> 21793167 (Manifest_cache true)
=======
>>>>>>> d245196f (Manifest_cache true)
=======
>>>>>>> 304cd28a (Manifest_cache true)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> 74240509 (Fix book_spec decrease quantity and price)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> e59c273d (Manifest_cache true)
=======
>>>>>>> a1a479e2 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7afa007b (Manifest_cache true)
=======
>>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d9d85ca6 (Fix)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 251144b4 (Manifest_cache true)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
          
      417. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      418. 
=======
          
      419. 
            3
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
          
      420. 
            3
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 64dceec (Manifest_cache true)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      421. 
=======
          
      422. 
            3
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
          
      423. 
            92
=======
          
      424. 
            3
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
=======
          
      425. 
            90
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 4f4ea3f9 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
          
      426. 
            3
>>>>>>> bd8bda4 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      427. 
            3
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
=======
=======
          
      428. 
            3
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
      429. 
            92
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      430. 
            3
>>>>>>> fd6db03 (Manifest_cache true)
=======
          
      431. 
            92
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 251144b4 (Manifest_cache true)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
          
      432. 
            90
>>>>>>> 4e81ea2 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
          
      433. 
            3
>>>>>>> aa7b40c (Manifest_cache true)
=======
<<<<<<< HEAD
          
      434. 
            90
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
          
      435. 
            3
<<<<<<< HEAD
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 251144b4 (Manifest_cache true)
=======
=======
>>>>>>> fd6db03 (Manifest_cache true)
=======
          
      436. 
            92
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 307f31f (Manifest_cache true)
=======
>>>>>>> d782a28 (Manifest_cache true)
=======
>>>>>>> 35d17b9 (Manifest_cache true)
          
      437. 
=======
          
      438. 
            3
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0341d6de (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
          
      439. 
            92
=======
          
      440. 
            3
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 21793167 (Manifest_cache true)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      441. 
            3
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d245196f (Manifest_cache true)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      442. 
            3
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 35d17b9 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 304cd28a (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      443. 
            3
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      444. 
            92
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 74240509 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
          
      445. 
            3
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e59c273d (Manifest_cache true)
=======
=======
=======
          
      446. 
            92
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a1a479e2 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
      447. 
            3
>>>>>>> 998f08d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 64dceec (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 7afa007b (Manifest_cache true)
=======
=======
=======
          
      448. 
            92
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
>>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price)
=======
          
      449. 
            109
>>>>>>> c7a726c5 (Rebased)
=======
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> bdc24a1a (Rebased)
=======
>>>>>>> 8887ba5b (Fix)
=======
>>>>>>> 53db2224 (Featire specs)
=======
>>>>>>> 7b22ad7e (Featire specs)
=======
>>>>>>> b97bb382 (Featire specs)
=======
>>>>>>> 4a2f2ad8 (Featire specs)
=======
>>>>>>> 21873de0 (Featire specs)
=======
>>>>>>> 392646b5 (Featire specs)
=======
>>>>>>> 1049b80c (Fix)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
          
      450. 
            109
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> c12b71de (Featire specs)
=======
>>>>>>> b904d7ae (Featire specs)
=======
>>>>>>> ef483b6d (Fix)
<<<<<<< HEAD
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> 659083f (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> e055dd0 (Rebased)
=======
>>>>>>> 0c57e4e (Fix)
=======
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 973ba8c (Featire specs)
=======
>>>>>>> 8181d13 (Featire specs)
=======
>>>>>>> 72b9cab (Featire specs)
=======
>>>>>>> 15c51b7 (Featire specs)
=======
>>>>>>> 9e081dc (Fix)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> fdab719f (Fix)
=======
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 5b7749a (Fix)
=======
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 31d15e66 (Fix)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 11792758 (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 610b6138 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
          
      451. 
            3
=======
<<<<<<< HEAD
          
      452. 
            92
=======
          
      453. 
            3
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
=======
          
      454. 
            90
>>>>>>> 752f0c0 (Featire specs)
=======
          
      455. 
            3
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
      456. 
            90
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      457. 
            3
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
      458. 
            90
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9bfbd88 (Featire specs)
<<<<<<< HEAD
>>>>>>> ebcdce06 (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
>>>>>>> 0f8241bb (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 307f31f (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 21793167 (Manifest_cache true)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 74240509 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a1a479e2 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
>>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price)
                quantity { FFaker::Number.rand(0..10) }
=======
<<<<<<< HEAD
                quantity { FFaker::Number.rand(2..10) }
=======
=======
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
                quantity { FFaker::Number.rand(2..10) }
=======
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
=======
=======
          
      459. 
            3
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
      460. 
            92
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      461. 
            109
>>>>>>> c033601 (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
=======
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
=======
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 659083f (Featire specs)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
          
      462. 
            109
=======
          
      463. 
            90
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
>>>>>>> 3cf8dd4 (Featire specs)
>>>>>>> a636fda (Featire specs)
=======
=======
          
      464. 
            90
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> e18eb87 (Fix)
=======
=======
          
      465. 
            90
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
=======
          
      466. 
            90
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> 416166f (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 3723aad (Featire specs)
=======
=======
          
      467. 
            90
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> 49e8a6c (Rebased)
>>>>>>> e055dd0 (Rebased)
=======
          
      468. 
            1
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> e055dd0 (Rebased)
=======
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 0c57e4e (Fix)
=======
          
      469. 
            111
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
=======
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 0c57e4e (Fix)
=======
>>>>>>> 5e31aeb (Featire specs)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
=======
=======
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
=======
=======
=======
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 973ba8c (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> 8181d13 (Featire specs)
=======
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> 72b9cab (Featire specs)
=======
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> 15c51b7 (Featire specs)
          
      470. 
            111
=======
          
      471. 
            90
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      472. 
            90
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      473. 
            90
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      474. 
            90
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> e54deeb (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> e54deeb (Featire specs)
=======
=======
          
      475. 
            90
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
=======
          
      476. 
            90
>>>>>>> 4552227 (Featire specs)
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      477. 
            119
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
=======
>>>>>>> b28889f (Fix)
>>>>>>> e18eb87 (Fix)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> 49e8a6c (Rebased)
>>>>>>> e055dd0 (Rebased)
=======
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 0c57e4e (Fix)
=======
=======
>>>>>>> 51bc18c (Featire specs)
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5e31aeb (Featire specs)
=======
=======
=======
=======
          
      478. 
            90
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 51bc18c (Featire specs)
=======
=======
=======
=======
          
      479. 
            90
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 973ba8c (Featire specs)
=======
=======
=======
=======
          
      480. 
            90
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
=======
=======
=======
=======
          
      481. 
            90
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
=======
=======
=======
=======
          
      482. 
            90
>>>>>>> 4552227 (Featire specs)
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
=======
=======
=======
          
      483. 
            119
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> 311e9fa (Rebased)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> bf05825 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> e055dd0 (Rebased)
=======
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 973ba8c (Featire specs)
=======
>>>>>>> 8181d13 (Featire specs)
=======
>>>>>>> 72b9cab (Featire specs)
=======
>>>>>>> 15c51b7 (Featire specs)
=======
>>>>>>> 9e081dc (Fix)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
=======
=======
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
=======
=======
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
=======
=======
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> bf05825 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 5b7749a (Fix)
=======
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> 49e8a6c (Rebased)
>>>>>>> e055dd0 (Rebased)
=======
=======
>>>>>>> 5507b42 (Featire specs)
>>>>>>> 5e31aeb (Featire specs)
=======
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> 51bc18c (Featire specs)
=======
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> 973ba8c (Featire specs)
=======
=======
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
=======
=======
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
=======
=======
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
=======
=======
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 610b6138 (Featire specs)
                quantity { FFaker::Number.rand(0..10) }
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
=======
>>>>>>> b832d45 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
=======
>>>>>>> b832d45 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
>>>>>>> 0f8241bb (Featire specs)
                quantity { FFaker::Number.rand(2..10) }
=======
>>>>>>> ebcdce06 (Featire specs)
                quantity { FFaker::Number.rand(0..10) }
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
                quantity { FFaker::Number.rand(2..10) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                quantity { FFaker::Number.rand(2..10) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> ebcdce06 (Featire specs)
=======
                quantity { FFaker::Number.rand(0..10) }
>>>>>>> 752f0c0 (Featire specs)
=======
                quantity { FFaker::Number.rand(0..10) }
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
=======
                quantity { FFaker::Number.rand(0..10) }
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
                quantity { FFaker::Number.rand(2..10) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                quantity { FFaker::Number.rand(2..10) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
                quantity { FFaker::Number.rand(0..10) }
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0341d6de (Manifest_cache true)
=======
=======
>>>>>>> 307f31f (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 21793167 (Manifest_cache true)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
>>>>>>> 9bfbd88 (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
=======
=======
                quantity { FFaker::Number.rand(2..10) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 74240509 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
<<<<<<< HEAD
>>>>>>> bb5c652 (Fix book_spec decrease quantity and price)
>>>>>>> 84003439 (Featire specs)
=======
=======
                quantity { FFaker::Number.rand(2..10) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a1a479e2 (Fix book_spec decrease quantity and price)
=======
=======
=======
<<<<<<< HEAD
=======
                quantity { FFaker::Number.rand(2..10) }
>>>>>>> c033601 (Rebased)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                quantity { FFaker::Number.rand(2..10) }
>>>>>>> c033601 (Rebased)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 37e48018 (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
                quantity { FFaker::Number.rand(2..10) }
>>>>>>> c033601 (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> c12b71de (Featire specs)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b904d7ae (Featire specs)
=======
=======
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 392646b5 (Featire specs)
=======
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
                quantity { FFaker::Number.rand(2..10) }
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
>>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price)
=======
                quantity { FFaker::Number.rand(2..10) }
>>>>>>> c7a726c5 (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9bfbd88 (Featire specs)
>>>>>>> ebcdce06 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
>>>>>>> 3cf8dd4 (Featire specs)
>>>>>>> aa4361fd (Featire specs)
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 70fcacc (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                quantity { FFaker::Number.rand(0..10) }
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ae409ca (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 379a979 (Featire specs)
=======
=======
                quantity { FFaker::Number.rand(0..10) }
>>>>>>> 4e81ea2 (Featire specs)
=======
                quantity { FFaker::Number.rand(0..10) }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> adc21e0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 610b6138 (Featire specs)
=======
=======
=======
=======
                quantity { FFaker::Number.rand(0..10) }
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d90e3d (Featire specs)
<<<<<<< HEAD
>>>>>>> 37e48018 (Featire specs)
=======
=======
=======
                quantity { FFaker::Number.rand(2..10) }
>>>>>>> bf554f4 (Rebased)
>>>>>>> aa3618b (Rebased)
<<<<<<< HEAD
>>>>>>> 11792758 (Rebased)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> 2ee03d3 (Featire specs)
>>>>>>> b832d45 (Featire specs)
=======
                quantity { FFaker::Number.rand(0..10) }
>>>>>>> 4e81ea2 (Featire specs)
=======
                quantity { FFaker::Number.rand(0..10) }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                quantity { FFaker::Number.rand(0..10) }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
                quantity { FFaker::Number.rand(2..10) }
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> bc6bc8d2 (Rebased)
=======
=======
=======
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
                quantity { FFaker::Number.rand(2..10) }
>>>>>>> bf554f4 (Rebased)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                quantity { FFaker::Number.rand(2..10) }
>>>>>>> bf554f4 (Rebased)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                quantity { FFaker::Number.rand(2..10) }
>>>>>>> c033601 (Rebased)
>>>>>>> 6da9530 (Featire specs)
=======
<<<<<<< HEAD
=======
                quantity { FFaker::Number.rand(0..10) }
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9620751 (Featire specs)
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> a9e66e9 (Featire specs)
                quantity { FFaker::Number.rand(2..10) }
=======
                quantity { FFaker::Number.rand(0..10) }
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> d52f9efe (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                quantity { FFaker::Number.rand(0..10) }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                quantity { FFaker::Number.rand(0..10) }
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> c12b71de (Featire specs)
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
=======
                quantity { FFaker::Number.rand(0..10) }
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
=======
                quantity { FFaker::Number.rand(0..10) }
>>>>>>> 4552227 (Featire specs)
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b904d7ae (Featire specs)
=======
=======
=======
                quantity { FFaker::Number.rand(2..10) }
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
>>>>>>> ef483b6d (Fix)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
>>>>>>> 659083f (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> 51bc18c (Featire specs)
>>>>>>> a636fda (Featire specs)
=======
=======
                quantity { FFaker::Number.rand(0..10) }
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
                quantity { FFaker::Number.rand(0..10) }
>>>>>>> 4e81ea2 (Featire specs)
=======
                quantity { FFaker::Number.rand(0..10) }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
=======
=======
                quantity { FFaker::Number.rand(0..10) }
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
=======
                quantity { FFaker::Number.rand(2..10) }
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
=======
=======
                quantity { FFaker::Number.rand(2..10) }
=======
                quantity { FFaker::Number.rand(0..10) }
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5e31aeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 53db2224 (Featire specs)
=======
=======
=======
=======
=======
                quantity { FFaker::Number.rand(0..10) }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
=======
=======
                quantity { FFaker::Number.rand(0..10) }
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
=======
=======
=======
                quantity { FFaker::Number.rand(0..10) }
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
=======
=======
=======
                quantity { FFaker::Number.rand(0..10) }
>>>>>>> 4552227 (Featire specs)
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 392646b5 (Featire specs)
=======
=======
=======
=======
                quantity { FFaker::Number.rand(2..10) }
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
        484. 
        
        
      
        
        
          
      484. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 490b01d6 (Manifest_cache true)
=======
          
      485. 
>>>>>>> 75fa7e1b (Rebased)
=======
=======
>>>>>>> 0341d6de (Manifest_cache true)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
          
      486. 
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 13fca83d (Rebased)
=======
=======
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0341d6de (Manifest_cache true)
=======
=======
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
          
      487. 
>>>>>>> 5b7749a (Fix)
>>>>>>> d9d85ca6 (Fix)
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 11792758 (Rebased)
=======
=======
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> c12b71de (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> b904d7ae (Featire specs)
=======
>>>>>>> ef483b6d (Fix)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> bdc24a1a (Rebased)
=======
>>>>>>> 53db2224 (Featire specs)
=======
>>>>>>> 7b22ad7e (Featire specs)
=======
>>>>>>> b97bb382 (Featire specs)
=======
>>>>>>> 4a2f2ad8 (Featire specs)
=======
>>>>>>> 21873de0 (Featire specs)
=======
>>>>>>> 392646b5 (Featire specs)
=======
>>>>>>> 1049b80c (Fix)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> bc6bc8d2 (Rebased)
=======
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> d52f9efe (Featire specs)
=======
=======
=======
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> c12b71de (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b904d7ae (Featire specs)
=======
=======
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
>>>>>>> ef483b6d (Fix)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> e055dd0 (Rebased)
=======
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 973ba8c (Featire specs)
=======
>>>>>>> 8181d13 (Featire specs)
=======
>>>>>>> 72b9cab (Featire specs)
=======
>>>>>>> 15c51b7 (Featire specs)
=======
>>>>>>> 9e081dc (Fix)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5e31aeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 53db2224 (Featire specs)
=======
=======
=======
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
=======
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
=======
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
=======
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 392646b5 (Featire specs)
=======
=======
=======
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            
          
        488. 
        
        
      
        
        
          
      488. 
            1
            

            

                transient do
          
        489. 
        
        
      
        
        
          
      489. 
            1
            

            

                  categories_count { 1 }
          
        490. 
        
        
      
        
        
          
      490. 
            
            

            

                end
          
        491. 
        
        
      
        
        
          
      491. 
            
            

            

            
          
        492. 
        
        
      
        
        
          
      492. 
            1
            

            

                transient do
          
        493. 
        
        
      
        
        
          
      493. 
            1
            

            

                  authors_count { 1 }
          
        494. 
        
        
      
        
        
          
      494. 
            
            

            

                end
          
        495. 
        
        
      
        
        
          
      495. 
            
            

            

            
          
        496. 
        
        
      
        
        
          
      496. 
            1
            

            

                after :create do |book, authors_count|
          
        497. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      497. 
            110
=======
=======
>>>>>>> e055dd0 (Rebased)
=======
>>>>>>> 0c57e4e (Fix)
=======
>>>>>>> 9e081dc (Fix)
          
      498. 
            108
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> 311e9fa (Rebased)
=======
>>>>>>> 557c1b8 (Fix)
          
      499. 
            108
=======
          
      500. 
            108
>>>>>>> e18eb87 (Fix)
=======
          
      501. 
            110
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
=======
=======
>>>>>>> e055dd0 (Rebased)
=======
          
      502. 
            
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
=======
=======
>>>>>>> 0c57e4e (Fix)
=======
          
      503. 
            110
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
=======
          
      504. 
            110
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
          
      505. 
            110
>>>>>>> e3e66f3 (Featire specs)
=======
          
      506. 
            118
>>>>>>> 5b7749a (Fix)
=======
          
      507. 
            108
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> e055dd0 (Rebased)
=======
>>>>>>> 0c57e4e (Fix)
=======
=======
          
      508. 
            118
>>>>>>> 1d59aaa (Fix)
>>>>>>> 9e081dc (Fix)
            

            

                  book.authors do
          
        509. 
        
        
      
        
        
          
      509. 
            
            

            

                    Array.new(authors_count) do
          
        510. 
        
        
      
        
        
          
      510. 
            
            

            

                      association(:book, authors: [instance])
          
        511. 
        
        
      
        
        
          
      511. 
            
            

            

                    end
          
        512. 
        
        
      
        
        
          
      512. 
            
            

            

                  end
          
        513. 
        
        
      
        
        
          
      513. 
            
            

            

                end
          
        514. 
        
        
      
        
        
          
      514. 
            
            

            

            
          
        515. 
        
        
      
        
        
          
      515. 
            1
            

            

                after :create do |book, categories_count|
          
        516. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      516. 
            110
=======
=======
>>>>>>> e055dd0 (Rebased)
=======
>>>>>>> 0c57e4e (Fix)
=======
>>>>>>> 9e081dc (Fix)
          
      517. 
            108
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> 311e9fa (Rebased)
=======
>>>>>>> 557c1b8 (Fix)
          
      518. 
            108
=======
          
      519. 
            108
>>>>>>> e18eb87 (Fix)
=======
          
      520. 
            110
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
=======
=======
>>>>>>> e055dd0 (Rebased)
=======
          
      521. 
            
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
=======
=======
>>>>>>> 0c57e4e (Fix)
=======
          
      522. 
            110
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
=======
          
      523. 
            110
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
          
      524. 
            110
>>>>>>> e3e66f3 (Featire specs)
=======
          
      525. 
            118
>>>>>>> 5b7749a (Fix)
=======
          
      526. 
            108
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> e055dd0 (Rebased)
=======
>>>>>>> 0c57e4e (Fix)
=======
=======
          
      527. 
            118
>>>>>>> 1d59aaa (Fix)
>>>>>>> 9e081dc (Fix)
            

            

                  book.categories do
          
        528. 
        
        
      
        
        
          
      528. 
            
            

            

                    Array.new(categories_count) do
          
        529. 
        
        
      
        
        
          
      529. 
            
            

            

                      association(:book, categories: [instance])
          
        530. 
        
        
      
        
        
          
      530. 
            
            

            

                    end
          
        531. 
        
        
      
        
        
          
      531. 
            
            

            

                  end
          
        532. 
        
        
      
        
        
          
      532. 
            
            

            

                end
          
        533. 
        
        
      
        
        
          
      533. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> ef483b6d (Fix)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> bdc24a1a (Rebased)
=======
>>>>>>> 53db2224 (Featire specs)
=======
>>>>>>> 1049b80c (Fix)
=======
>>>>>>> f3d746cb (Featire specs)
=======
=======
>>>>>>> 311e9fa (Rebased)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> e055dd0 (Rebased)
=======
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> 9e081dc (Fix)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> bc6bc8d2 (Rebased)
=======
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> d52f9efe (Featire specs)
=======
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> c12b71de (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
>>>>>>> 4552227 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b904d7ae (Featire specs)
=======
=======
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
>>>>>>> ef483b6d (Fix)
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
>>>>>>> a2206025 (Featire specs)
              end
          
        534. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      534. 
=======
          
      535. 
>>>>>>> c7a726c5 (Rebased)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> c12b71de (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> b904d7ae (Featire specs)
=======
>>>>>>> ef483b6d (Fix)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> d52f9efe (Featire specs)
=======
=======
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> c12b71de (Featire specs)
          
      536. 
=======
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
          
      537. 
=======
          
      538. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
=======
          
      539. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      540. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
=======
          
      541. 
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
=======
          
      542. 
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
          
      543. 
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      544. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
          
      545. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
          
      546. 
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> bc6bc8d2 (Rebased)
=======
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> d52f9efe (Featire specs)
=======
=======
=======
=======
          
      547. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
=======
          
      548. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> c12b71de (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
=======
          
      549. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
          
      550. 
>>>>>>> 4552227 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b904d7ae (Featire specs)
=======
=======
          
      551. 
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
>>>>>>> ef483b6d (Fix)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
          
      552. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 0676508 (Featire specs)
=======
          
      553. 
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
=======
          
      554. 
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      555. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
>>>>>>> a2206025 (Featire specs)
            
            

            

            end
          
        556. 
        
        
      
    
      
  
      

      

      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
        
      
  
      
    
      spec/factories/books.rb
      
    
      
      
  80.95%


      lines covered
    
      

    

    
      
      21 relevant lines.
      17 lines covered and
      4 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            FactoryBot.define do
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 34509eee (Featire specs)
=======
>>>>>>> 75fa7e1b (Rebased)
=======
=======
>>>>>>> 13fca83d (Rebased)
=======
>>>>>>> f136376a (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> d9d85ca6 (Fix)
=======
=======
>>>>>>> 311e9fa (Rebased)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> 13fca83d (Rebased)
=======
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376a (Featire specs)
=======
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0ea (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888bf (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
>>>>>>> 4552227 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 393eff3b (Featire specs)
=======
=======
>>>>>>> 5b7749a (Fix)
>>>>>>> d9d85ca6 (Fix)
              factory :book do
          
        3. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      3. 
            95
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 365d41ed (Featire specs)
=======
>>>>>>> c05ee511 (Featire specs)
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
>>>>>>> 13fca83d (Rebased)
=======
>>>>>>> ae884b47 (Fix)
=======
>>>>>>> f136376a (Featire specs)
=======
>>>>>>> 1ca9c0ea (Featire specs)
=======
>>>>>>> 4bf888bf (Featire specs)
=======
>>>>>>> 393eff3b (Featire specs)
=======
>>>>>>> d9d85ca6 (Fix)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
>>>>>>> 5a2009f1 (Fix)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 5b7749a (Fix)
=======
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 75fa7e1b (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
          
      4. 
            3
=======
<<<<<<< HEAD
          
      5. 
            82
=======
          
      6. 
            3
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
=======
          
      7. 
            80
>>>>>>> 752f0c0 (Featire specs)
=======
          
      8. 
            3
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
      9. 
            80
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      10. 
            3
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
      11. 
            80
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
>>>>>>> 9bfbd88 (Featire specs)
<<<<<<< HEAD
=======
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      12. 
            3
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
      13. 
            82
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bb5c652 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      14. 
            95
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9a49b7b (Rebased)
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
=======
=======
>>>>>>> 9440753 (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
          
      15. 
            95
=======
          
      16. 
            80
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 6cdb2e1 (Featire specs)
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 70fcacc (Featire specs)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      17. 
            80
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ae409ca (Featire specs)
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      18. 
            80
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 379a979 (Featire specs)
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      19. 
            80
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> adc21e0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      20. 
            80
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4d90e3d (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> ed32b84 (Featire specs)
=======
=======
>>>>>>> 49e8a6c (Rebased)
>>>>>>> 311e9fa (Rebased)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      21. 
            1
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> aa3618b (Rebased)
<<<<<<< HEAD
>>>>>>> 75fa7e1b (Rebased)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 311e9fa (Rebased)
=======
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      22. 
            97
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 160fb15 (Fix)
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 932dbec (Featire specs)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> 13fca83d (Rebased)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> ae884b47 (Fix)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
          
      23. 
            97
=======
          
      24. 
            80
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376a (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      25. 
            80
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0ea (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      26. 
            80
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888bf (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      27. 
            80
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> e54deeb (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
<<<<<<< HEAD
>>>>>>> e54deeb (Featire specs)
=======
=======
          
      28. 
            80
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
=======
          
      29. 
            80
>>>>>>> 4552227 (Featire specs)
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 393eff3b (Featire specs)
=======
=======
=======
          
      30. 
            105
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
>>>>>>> d9d85ca6 (Fix)
            

            

                title { FFaker::Book.title }
          
        31. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      31. 
            109
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 365d41ed (Featire specs)
=======
>>>>>>> c05ee511 (Featire specs)
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
>>>>>>> 13fca83d (Rebased)
=======
>>>>>>> ae884b47 (Fix)
=======
>>>>>>> f136376a (Featire specs)
=======
>>>>>>> 1ca9c0ea (Featire specs)
=======
>>>>>>> 4bf888bf (Featire specs)
=======
>>>>>>> 393eff3b (Featire specs)
=======
>>>>>>> d9d85ca6 (Fix)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
>>>>>>> 5a2009f1 (Fix)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 5b7749a (Fix)
=======
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 75fa7e1b (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
          
      32. 
            3
=======
<<<<<<< HEAD
          
      33. 
            92
=======
          
      34. 
            3
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
=======
          
      35. 
            90
>>>>>>> 752f0c0 (Featire specs)
=======
          
      36. 
            3
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
      37. 
            90
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      38. 
            3
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
      39. 
            90
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
>>>>>>> 9bfbd88 (Featire specs)
<<<<<<< HEAD
=======
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      40. 
            3
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
      41. 
            92
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bb5c652 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      42. 
            109
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9a49b7b (Rebased)
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
=======
=======
>>>>>>> 9440753 (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
          
      43. 
            109
=======
          
      44. 
            90
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 6cdb2e1 (Featire specs)
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 70fcacc (Featire specs)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      45. 
            90
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ae409ca (Featire specs)
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      46. 
            90
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 379a979 (Featire specs)
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      47. 
            90
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> adc21e0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      48. 
            90
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4d90e3d (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> ed32b84 (Featire specs)
=======
=======
>>>>>>> 49e8a6c (Rebased)
>>>>>>> 311e9fa (Rebased)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      49. 
            1
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> aa3618b (Rebased)
<<<<<<< HEAD
>>>>>>> 75fa7e1b (Rebased)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 311e9fa (Rebased)
=======
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      50. 
            111
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 160fb15 (Fix)
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 932dbec (Featire specs)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> 13fca83d (Rebased)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> ae884b47 (Fix)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
          
      51. 
            111
=======
          
      52. 
            90
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376a (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      53. 
            90
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0ea (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      54. 
            90
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888bf (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      55. 
            90
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> e54deeb (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
<<<<<<< HEAD
>>>>>>> e54deeb (Featire specs)
=======
=======
          
      56. 
            90
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
=======
          
      57. 
            90
>>>>>>> 4552227 (Featire specs)
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 393eff3b (Featire specs)
=======
=======
=======
          
      58. 
            119
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
>>>>>>> d9d85ca6 (Fix)
            

            

                description { FFaker::Book.description }
          
        59. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      59. 
            92
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 365d41ed (Featire specs)
=======
>>>>>>> c05ee511 (Featire specs)
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
>>>>>>> 13fca83d (Rebased)
=======
>>>>>>> ae884b47 (Fix)
=======
>>>>>>> f136376a (Featire specs)
=======
>>>>>>> 1ca9c0ea (Featire specs)
=======
>>>>>>> 4bf888bf (Featire specs)
=======
>>>>>>> 393eff3b (Featire specs)
=======
>>>>>>> d9d85ca6 (Fix)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
>>>>>>> 5a2009f1 (Fix)
=======
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> c12b71de (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> b904d7ae (Featire specs)
=======
>>>>>>> ef483b6d (Fix)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 5b7749a (Fix)
=======
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 75fa7e1b (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
          
      60. 
            3
=======
<<<<<<< HEAD
          
      61. 
            82
=======
          
      62. 
            3
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
=======
          
      63. 
            80
>>>>>>> 752f0c0 (Featire specs)
=======
          
      64. 
            3
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
      65. 
            80
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      66. 
            3
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
      67. 
            80
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
>>>>>>> 9bfbd88 (Featire specs)
<<<<<<< HEAD
=======
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      68. 
            3
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
      69. 
            82
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bb5c652 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      70. 
            92
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9a49b7b (Rebased)
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
=======
=======
>>>>>>> 9440753 (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
          
      71. 
            92
=======
          
      72. 
            80
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 6cdb2e1 (Featire specs)
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 70fcacc (Featire specs)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      73. 
            80
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ae409ca (Featire specs)
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      74. 
            80
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 379a979 (Featire specs)
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      75. 
            80
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> adc21e0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      76. 
            80
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4d90e3d (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> ed32b84 (Featire specs)
=======
=======
>>>>>>> 49e8a6c (Rebased)
>>>>>>> 311e9fa (Rebased)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      77. 
            1
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> aa3618b (Rebased)
<<<<<<< HEAD
>>>>>>> 75fa7e1b (Rebased)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 311e9fa (Rebased)
=======
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      78. 
            94
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 160fb15 (Fix)
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 932dbec (Featire specs)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> 13fca83d (Rebased)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> ae884b47 (Fix)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
          
      79. 
            94
=======
          
      80. 
            80
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376a (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      81. 
            80
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0ea (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      82. 
            80
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888bf (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      83. 
            80
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> e54deeb (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
<<<<<<< HEAD
>>>>>>> e54deeb (Featire specs)
=======
=======
          
      84. 
            80
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
=======
          
      85. 
            80
>>>>>>> 4552227 (Featire specs)
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 393eff3b (Featire specs)
=======
=======
=======
          
      86. 
            98
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
>>>>>>> d9d85ca6 (Fix)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 365d41ed (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
>>>>>>> 13fca83d (Rebased)
=======
>>>>>>> f136376a (Featire specs)
=======
>>>>>>> 1ca9c0ea (Featire specs)
=======
>>>>>>> 4bf888bf (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 393eff3b (Featire specs)
=======
>>>>>>> d9d85ca6 (Fix)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376a (Featire specs)
=======
=======
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0ea (Featire specs)
=======
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> 4bf888bf (Featire specs)
                price_cents { FFaker::Number.rand(10_000) }
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
                price_cents { FFaker::Number.rand(10_000) }
=======
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
>>>>>>> 36356d3 (Featire specs)
>>>>>>> 393eff3b (Featire specs)
                price_cents { FFaker::Number.rand(10_000) }
=======
                price { FFaker::Number.rand(100) }
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
                price { FFaker::Number.rand(100) }
>>>>>>> 752f0c0 (Featire specs)
=======
                price { FFaker::Number.rand(100) }
>>>>>>> 4e81ea2 (Featire specs)
=======
                price { FFaker::Number.rand(100) }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
                price { FFaker::Number.rand(100) }
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 34509eee (Featire specs)
=======
                price_cents { FFaker::Number.rand(10_000) }
>>>>>>> 75fa7e1b (Rebased)
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 365d41ed (Featire specs)
=======
>>>>>>> c05ee511 (Featire specs)
=======
>>>>>>> f136376a (Featire specs)
=======
>>>>>>> 1ca9c0ea (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
>>>>>>> 824bb2b (Featire specs)
=======
=======
                price { FFaker::Number.rand(100) }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
                price { FFaker::Number.rand(100) }
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
=======
                price { FFaker::Number.rand(100) }
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
=======
                price { FFaker::Number.rand(100) }
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
                price { FFaker::Number.rand(100) }
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 4e81ea2 (Featire specs)
=======
                price { FFaker::Number.rand(100) }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
                price { FFaker::Number.rand(100) }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
                price_cents { FFaker::Number.rand(10_000) }
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> 13fca83d (Rebased)
=======
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376a (Featire specs)
=======
=======
=======
=======
                price { FFaker::Number.rand(100) }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0ea (Featire specs)
=======
=======
=======
                price { FFaker::Number.rand(100) }
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888bf (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
=======
                price { FFaker::Number.rand(100) }
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
                price { FFaker::Number.rand(100) }
>>>>>>> 4552227 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 393eff3b (Featire specs)
=======
=======
                price_cents { FFaker::Number.rand(10_000) }
>>>>>>> 5b7749a (Fix)
>>>>>>> d9d85ca6 (Fix)
          
        87. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      87. 
            109
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 365d41ed (Featire specs)
=======
>>>>>>> c05ee511 (Featire specs)
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
>>>>>>> 13fca83d (Rebased)
=======
>>>>>>> ae884b47 (Fix)
=======
>>>>>>> f136376a (Featire specs)
=======
>>>>>>> 1ca9c0ea (Featire specs)
=======
>>>>>>> 4bf888bf (Featire specs)
=======
>>>>>>> 393eff3b (Featire specs)
=======
>>>>>>> d9d85ca6 (Fix)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
>>>>>>> 5a2009f1 (Fix)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 5b7749a (Fix)
=======
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 75fa7e1b (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
          
      88. 
            3
=======
<<<<<<< HEAD
          
      89. 
            92
=======
          
      90. 
            3
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
=======
          
      91. 
            90
>>>>>>> 752f0c0 (Featire specs)
=======
          
      92. 
            3
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
      93. 
            90
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      94. 
            3
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
      95. 
            90
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
>>>>>>> 9bfbd88 (Featire specs)
<<<<<<< HEAD
=======
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      96. 
            3
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
      97. 
            92
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bb5c652 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      98. 
            109
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9a49b7b (Rebased)
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
=======
=======
>>>>>>> 9440753 (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
          
      99. 
            109
=======
          
      100. 
            90
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 6cdb2e1 (Featire specs)
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 70fcacc (Featire specs)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      101. 
            90
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ae409ca (Featire specs)
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      102. 
            90
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 379a979 (Featire specs)
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      103. 
            90
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> adc21e0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      104. 
            90
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4d90e3d (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> ed32b84 (Featire specs)
=======
=======
>>>>>>> 49e8a6c (Rebased)
>>>>>>> 311e9fa (Rebased)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      105. 
            1
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> aa3618b (Rebased)
<<<<<<< HEAD
>>>>>>> 75fa7e1b (Rebased)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 311e9fa (Rebased)
=======
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      106. 
            111
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 160fb15 (Fix)
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 932dbec (Featire specs)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> 13fca83d (Rebased)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> ae884b47 (Fix)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
          
      107. 
            111
=======
          
      108. 
            90
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376a (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      109. 
            90
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0ea (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      110. 
            90
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888bf (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      111. 
            90
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> e54deeb (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
<<<<<<< HEAD
>>>>>>> e54deeb (Featire specs)
=======
=======
          
      112. 
            90
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
=======
          
      113. 
            90
>>>>>>> 4552227 (Featire specs)
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 393eff3b (Featire specs)
=======
=======
=======
          
      114. 
            119
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
>>>>>>> d9d85ca6 (Fix)
            

            

                materials { FFaker::Book.cover(:format) }
          
        115. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      115. 
            109
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 365d41ed (Featire specs)
=======
>>>>>>> c05ee511 (Featire specs)
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
>>>>>>> 13fca83d (Rebased)
=======
>>>>>>> ae884b47 (Fix)
=======
>>>>>>> f136376a (Featire specs)
=======
>>>>>>> 1ca9c0ea (Featire specs)
=======
>>>>>>> 4bf888bf (Featire specs)
=======
>>>>>>> 393eff3b (Featire specs)
=======
>>>>>>> d9d85ca6 (Fix)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
>>>>>>> 5a2009f1 (Fix)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 5b7749a (Fix)
=======
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 75fa7e1b (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
          
      116. 
            3
=======
<<<<<<< HEAD
          
      117. 
            92
=======
          
      118. 
            3
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
=======
          
      119. 
            90
>>>>>>> 752f0c0 (Featire specs)
=======
          
      120. 
            3
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
      121. 
            90
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      122. 
            3
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
      123. 
            90
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
>>>>>>> 9bfbd88 (Featire specs)
<<<<<<< HEAD
=======
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      124. 
            3
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
      125. 
            92
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bb5c652 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      126. 
            109
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9a49b7b (Rebased)
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
=======
=======
>>>>>>> 9440753 (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
          
      127. 
            109
=======
          
      128. 
            90
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 6cdb2e1 (Featire specs)
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 70fcacc (Featire specs)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      129. 
            90
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ae409ca (Featire specs)
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      130. 
            90
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 379a979 (Featire specs)
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      131. 
            90
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> adc21e0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      132. 
            90
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4d90e3d (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> ed32b84 (Featire specs)
=======
=======
>>>>>>> 49e8a6c (Rebased)
>>>>>>> 311e9fa (Rebased)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      133. 
            1
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> aa3618b (Rebased)
<<<<<<< HEAD
>>>>>>> 75fa7e1b (Rebased)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 311e9fa (Rebased)
=======
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      134. 
            111
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 160fb15 (Fix)
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 932dbec (Featire specs)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> 13fca83d (Rebased)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> ae884b47 (Fix)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
          
      135. 
            111
=======
          
      136. 
            90
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376a (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      137. 
            90
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0ea (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      138. 
            90
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888bf (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      139. 
            90
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> e54deeb (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
<<<<<<< HEAD
>>>>>>> e54deeb (Featire specs)
=======
=======
          
      140. 
            90
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
=======
          
      141. 
            90
>>>>>>> 4552227 (Featire specs)
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 393eff3b (Featire specs)
=======
=======
=======
          
      142. 
            119
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
>>>>>>> d9d85ca6 (Fix)
            

            

                year_of_publication { FFaker::Number.rand(1900..2022) }
          
        143. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      143. 
            109
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 365d41ed (Featire specs)
=======
>>>>>>> c05ee511 (Featire specs)
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
>>>>>>> 13fca83d (Rebased)
=======
>>>>>>> ae884b47 (Fix)
=======
>>>>>>> f136376a (Featire specs)
=======
>>>>>>> 1ca9c0ea (Featire specs)
=======
>>>>>>> 4bf888bf (Featire specs)
=======
>>>>>>> 393eff3b (Featire specs)
=======
>>>>>>> d9d85ca6 (Fix)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
>>>>>>> 5a2009f1 (Fix)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 5b7749a (Fix)
=======
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 75fa7e1b (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
          
      144. 
            3
=======
<<<<<<< HEAD
          
      145. 
            92
=======
          
      146. 
            3
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
=======
          
      147. 
            90
>>>>>>> 752f0c0 (Featire specs)
=======
          
      148. 
            3
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
      149. 
            90
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      150. 
            3
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
      151. 
            90
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
>>>>>>> 9bfbd88 (Featire specs)
<<<<<<< HEAD
=======
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      152. 
            3
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
      153. 
            92
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bb5c652 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      154. 
            109
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9a49b7b (Rebased)
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
=======
=======
>>>>>>> 9440753 (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
          
      155. 
            109
=======
          
      156. 
            90
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 6cdb2e1 (Featire specs)
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 70fcacc (Featire specs)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      157. 
            90
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ae409ca (Featire specs)
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      158. 
            90
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 379a979 (Featire specs)
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      159. 
            90
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> adc21e0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      160. 
            90
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4d90e3d (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> ed32b84 (Featire specs)
=======
=======
>>>>>>> 49e8a6c (Rebased)
>>>>>>> 311e9fa (Rebased)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      161. 
            1
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> aa3618b (Rebased)
<<<<<<< HEAD
>>>>>>> 75fa7e1b (Rebased)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 311e9fa (Rebased)
=======
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      162. 
            111
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 160fb15 (Fix)
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 932dbec (Featire specs)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> 13fca83d (Rebased)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> ae884b47 (Fix)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
          
      163. 
            111
=======
          
      164. 
            90
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376a (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      165. 
            90
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0ea (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      166. 
            90
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888bf (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      167. 
            90
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> e54deeb (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
<<<<<<< HEAD
>>>>>>> e54deeb (Featire specs)
=======
=======
          
      168. 
            90
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
=======
          
      169. 
            90
>>>>>>> 4552227 (Featire specs)
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 393eff3b (Featire specs)
=======
=======
=======
          
      170. 
            119
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
>>>>>>> d9d85ca6 (Fix)
            

            

                dimensions { FFaker::Book.cover(:size) }
          
        171. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      171. 
            109
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 365d41ed (Featire specs)
=======
>>>>>>> c05ee511 (Featire specs)
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
>>>>>>> 13fca83d (Rebased)
=======
>>>>>>> ae884b47 (Fix)
=======
>>>>>>> f136376a (Featire specs)
=======
>>>>>>> 1ca9c0ea (Featire specs)
=======
>>>>>>> 4bf888bf (Featire specs)
=======
>>>>>>> 393eff3b (Featire specs)
=======
>>>>>>> d9d85ca6 (Fix)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
>>>>>>> 5a2009f1 (Fix)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 5b7749a (Fix)
=======
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 75fa7e1b (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
          
      172. 
            3
=======
<<<<<<< HEAD
          
      173. 
            92
=======
          
      174. 
            3
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
=======
          
      175. 
            90
>>>>>>> 752f0c0 (Featire specs)
=======
          
      176. 
            3
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
      177. 
            90
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      178. 
            3
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
      179. 
            90
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9bfbd88 (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                quantity { FFaker::Number.rand(2..10) }
=======
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
=======
=======
          
      180. 
            3
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
      181. 
            92
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      182. 
            109
>>>>>>> c033601 (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
          
      183. 
            109
=======
          
      184. 
            90
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> a636fda (Featire specs)
=======
=======
          
      185. 
            90
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      186. 
            90
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
=======
          
      187. 
            90
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 3723aad (Featire specs)
=======
=======
          
      188. 
            90
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      189. 
            1
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      190. 
            111
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
=======
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 932dbec (Featire specs)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
=======
=======
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
          
      191. 
            111
=======
          
      192. 
            90
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      193. 
            90
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      194. 
            90
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      195. 
            90
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> e54deeb (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> e54deeb (Featire specs)
=======
=======
          
      196. 
            90
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
=======
          
      197. 
            90
>>>>>>> 4552227 (Featire specs)
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      198. 
            119
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> 311e9fa (Rebased)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> bf05825 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
=======
=======
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
=======
=======
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
=======
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 5b7749a (Fix)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 6e923b9d (Featire specs)
                quantity { FFaker::Number.rand(0..10) }
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
=======
>>>>>>> b832d45 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
=======
>>>>>>> b832d45 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
                quantity { FFaker::Number.rand(2..10) }
=======
                quantity { FFaker::Number.rand(0..10) }
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
=======
                quantity { FFaker::Number.rand(0..10) }
>>>>>>> 752f0c0 (Featire specs)
=======
                quantity { FFaker::Number.rand(0..10) }
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84809242 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
                quantity { FFaker::Number.rand(0..10) }
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
>>>>>>> 9bfbd88 (Featire specs)
<<<<<<< HEAD
=======
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                quantity { FFaker::Number.rand(2..10) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bb5c652 (Fix book_spec decrease quantity and price)
=======
=======
                quantity { FFaker::Number.rand(2..10) }
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> 9a49b7b (Rebased)
=======
=======
=======
                quantity { FFaker::Number.rand(2..10) }
>>>>>>> c033601 (Rebased)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                quantity { FFaker::Number.rand(2..10) }
>>>>>>> c033601 (Rebased)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
                quantity { FFaker::Number.rand(2..10) }
>>>>>>> c033601 (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
                quantity { FFaker::Number.rand(2..10) }
=======
                quantity { FFaker::Number.rand(0..10) }
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> 77d62af (Featire specs)
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 70fcacc (Featire specs)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                quantity { FFaker::Number.rand(0..10) }
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ae409ca (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 379a979 (Featire specs)
=======
=======
                quantity { FFaker::Number.rand(0..10) }
>>>>>>> 4e81ea2 (Featire specs)
=======
                quantity { FFaker::Number.rand(0..10) }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> adc21e0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
=======
=======
                quantity { FFaker::Number.rand(0..10) }
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d90e3d (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
=======
                quantity { FFaker::Number.rand(2..10) }
>>>>>>> bf554f4 (Rebased)
>>>>>>> aa3618b (Rebased)
<<<<<<< HEAD
>>>>>>> 75fa7e1b (Rebased)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
                quantity { FFaker::Number.rand(0..10) }
>>>>>>> 4e81ea2 (Featire specs)
=======
                quantity { FFaker::Number.rand(0..10) }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                quantity { FFaker::Number.rand(0..10) }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
=======
                quantity { FFaker::Number.rand(2..10) }
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> 13fca83d (Rebased)
=======
=======
=======
=======
=======
                quantity { FFaker::Number.rand(2..10) }
>>>>>>> bf554f4 (Rebased)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                quantity { FFaker::Number.rand(2..10) }
>>>>>>> bf554f4 (Rebased)
>>>>>>> e3e66f3 (Featire specs)
=======
                quantity { FFaker::Number.rand(2..10) }
=======
                quantity { FFaker::Number.rand(0..10) }
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376a (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                quantity { FFaker::Number.rand(0..10) }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0ea (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                quantity { FFaker::Number.rand(0..10) }
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888bf (Featire specs)
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
=======
                quantity { FFaker::Number.rand(0..10) }
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
=======
                quantity { FFaker::Number.rand(0..10) }
>>>>>>> 4552227 (Featire specs)
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 393eff3b (Featire specs)
=======
=======
=======
                quantity { FFaker::Number.rand(2..10) }
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
>>>>>>> d9d85ca6 (Fix)
          
        199. 
        
        
      
        
        
          
      199. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
>>>>>>> 34509eee (Featire specs)
=======
>>>>>>> 75fa7e1b (Rebased)
=======
=======
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 365d41ed (Featire specs)
=======
>>>>>>> c05ee511 (Featire specs)
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
>>>>>>> 13fca83d (Rebased)
=======
>>>>>>> f136376a (Featire specs)
=======
>>>>>>> 1ca9c0ea (Featire specs)
=======
>>>>>>> 4bf888bf (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 393eff3b (Featire specs)
=======
>>>>>>> d9d85ca6 (Fix)
=======
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> 13fca83d (Rebased)
=======
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376a (Featire specs)
=======
=======
=======
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0ea (Featire specs)
=======
=======
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888bf (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 393eff3b (Featire specs)
=======
=======
>>>>>>> 5b7749a (Fix)
>>>>>>> d9d85ca6 (Fix)
            
          
        200. 
        
        
      
        
        
          
      200. 
            1
            

            

                transient do
          
        201. 
        
        
      
        
        
          
      201. 
            1
            

            

                  categories_count { 1 }
          
        202. 
        
        
      
        
        
          
      202. 
            
            

            

                end
          
        203. 
        
        
      
        
        
          
      203. 
            
            

            

            
          
        204. 
        
        
      
        
        
          
      204. 
            1
            

            

                transient do
          
        205. 
        
        
      
        
        
          
      205. 
            1
            

            

                  authors_count { 1 }
          
        206. 
        
        
      
        
        
          
      206. 
            
            

            

                end
          
        207. 
        
        
      
        
        
          
      207. 
            
            

            

            
          
        208. 
        
        
      
        
        
          
      208. 
            1
            

            

                after :create do |book, authors_count|
          
        209. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      209. 
            110
=======
          
      210. 
            108
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> 311e9fa (Rebased)
=======
>>>>>>> 557c1b8 (Fix)
          
      211. 
            108
=======
          
      212. 
            110
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
=======
=======
          
      213. 
            
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
=======
=======
          
      214. 
            110
>>>>>>> 872e675 (Fix)
>>>>>>> 557c1b8 (Fix)
=======
          
      215. 
            110
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
          
      216. 
            110
>>>>>>> e3e66f3 (Featire specs)
=======
          
      217. 
            118
>>>>>>> 5b7749a (Fix)
            

            

                  book.authors do
          
        218. 
        
        
      
        
        
          
      218. 
            
            

            

                    Array.new(authors_count) do
          
        219. 
        
        
      
        
        
          
      219. 
            
            

            

                      association(:book, authors: [instance])
          
        220. 
        
        
      
        
        
          
      220. 
            
            

            

                    end
          
        221. 
        
        
      
        
        
          
      221. 
            
            

            

                  end
          
        222. 
        
        
      
        
        
          
      222. 
            
            

            

                end
          
        223. 
        
        
      
        
        
          
      223. 
            
            

            

            
          
        224. 
        
        
      
        
        
          
      224. 
            1
            

            

                after :create do |book, categories_count|
          
        225. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      225. 
            110
=======
          
      226. 
            108
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> 311e9fa (Rebased)
=======
>>>>>>> 557c1b8 (Fix)
          
      227. 
            108
=======
          
      228. 
            110
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
=======
=======
          
      229. 
            
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
=======
=======
          
      230. 
            110
>>>>>>> 872e675 (Fix)
>>>>>>> 557c1b8 (Fix)
=======
          
      231. 
            110
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
          
      232. 
            110
>>>>>>> e3e66f3 (Featire specs)
=======
          
      233. 
            118
>>>>>>> 5b7749a (Fix)
            

            

                  book.categories do
          
        234. 
        
        
      
        
        
          
      234. 
            
            

            

                    Array.new(categories_count) do
          
        235. 
        
        
      
        
        
          
      235. 
            
            

            

                      association(:book, categories: [instance])
          
        236. 
        
        
      
        
        
          
      236. 
            
            

            

                    end
          
        237. 
        
        
      
        
        
          
      237. 
            
            

            

                  end
          
        238. 
        
        
      
        
        
          
      238. 
            
            

            

                end
          
        239. 
        
        
      
        
        
          
      239. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 34509eee (Featire specs)
=======
>>>>>>> 75fa7e1b (Rebased)
=======
=======
>>>>>>> 13fca83d (Rebased)
=======
>>>>>>> f136376a (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> d9d85ca6 (Fix)
=======
=======
>>>>>>> 311e9fa (Rebased)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> 13fca83d (Rebased)
=======
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376a (Featire specs)
=======
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0ea (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888bf (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
>>>>>>> 4552227 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 393eff3b (Featire specs)
=======
=======
>>>>>>> 5b7749a (Fix)
>>>>>>> d9d85ca6 (Fix)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 37e48018 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 11792758 (Rebased)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 659083f (Featire specs)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5e31aeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 53db2224 (Featire specs)
=======
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
=======
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
=======
=======
>>>>>>> 4552227 (Featire specs)
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 392646b5 (Featire specs)
=======
=======
=======
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
              end
          
        240. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 365d41ed (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
>>>>>>> 13fca83d (Rebased)
=======
>>>>>>> f136376a (Featire specs)
=======
>>>>>>> 1ca9c0ea (Featire specs)
=======
>>>>>>> 4bf888bf (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 393eff3b (Featire specs)
=======
>>>>>>> d9d85ca6 (Fix)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> e055dd0 (Rebased)
=======
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 973ba8c (Featire specs)
=======
>>>>>>> 8181d13 (Featire specs)
=======
>>>>>>> 72b9cab (Featire specs)
=======
>>>>>>> 15c51b7 (Featire specs)
=======
>>>>>>> 9e081dc (Fix)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> 53db2224 (Featire specs)
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376a (Featire specs)
=======
=======
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1ca9c0ea (Featire specs)
=======
=======
>>>>>>> 7b22ad7e (Featire specs)
=======
>>>>>>> b97bb382 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888bf (Featire specs)
=======
=======
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 392646b5 (Featire specs)
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      240. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      241. 
=======
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
>>>>>>> 36356d3 (Featire specs)
>>>>>>> 393eff3b (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
>>>>>>> 5507b42 (Featire specs)
>>>>>>> 5e31aeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 53db2224 (Featire specs)
=======
=======
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> 973ba8c (Featire specs)
>>>>>>> b97bb382 (Featire specs)
          
      242. 
=======
          
      243. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      244. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
      245. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      246. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
          
      247. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 34509eee (Featire specs)
=======
          
      248. 
>>>>>>> 75fa7e1b (Rebased)
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 365d41ed (Featire specs)
=======
>>>>>>> c05ee511 (Featire specs)
=======
>>>>>>> f136376a (Featire specs)
=======
>>>>>>> 1ca9c0ea (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 53db2224 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
>>>>>>> 824bb2b (Featire specs)
=======
=======
          
      249. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
          
      250. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 973ba8c (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
=======
          
      251. 
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
=======
          
      252. 
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
          
      253. 
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      254. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
          
      255. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
          
      256. 
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> 13fca83d (Rebased)
=======
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376a (Featire specs)
=======
=======
=======
=======
          
      257. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0ea (Featire specs)
=======
=======
=======
          
      258. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888bf (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
=======
          
      259. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
          
      260. 
>>>>>>> 4552227 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 393eff3b (Featire specs)
=======
=======
          
      261. 
>>>>>>> 5b7749a (Fix)
>>>>>>> d9d85ca6 (Fix)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
          
      262. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 37e48018 (Featire specs)
=======
<<<<<<< HEAD
          
      263. 
>>>>>>> 11792758 (Rebased)
=======
=======
>>>>>>> 0676508 (Featire specs)
=======
          
      264. 
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 659083f (Featire specs)
=======
=======
=======
          
      265. 
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      266. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
=======
=======
=======
          
      267. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
          
      268. 
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5e31aeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 53db2224 (Featire specs)
=======
=======
=======
=======
          
      269. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
          
      270. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
=======
=======
          
      271. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
=======
=======
          
      272. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
=======
=======
          
      273. 
>>>>>>> 4552227 (Featire specs)
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 392646b5 (Featire specs)
=======
=======
=======
          
      274. 
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
          
      275. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
=======
          
      276. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
=======
          
      277. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            
            

            

            end
          
        278. 
        
        
      
    
      
  
      

      

      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84809242 (Featire specs)
=======
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 365d41ed (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
>>>>>>> 13fca83d (Rebased)
=======
>>>>>>> f136376a (Featire specs)
=======
>>>>>>> 1ca9c0ea (Featire specs)
=======
>>>>>>> 4bf888bf (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 393eff3b (Featire specs)
=======
>>>>>>> d9d85ca6 (Fix)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> e055dd0 (Rebased)
=======
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 973ba8c (Featire specs)
=======
>>>>>>> 8181d13 (Featire specs)
=======
>>>>>>> 72b9cab (Featire specs)
=======
>>>>>>> 15c51b7 (Featire specs)
=======
>>>>>>> 9e081dc (Fix)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> 53db2224 (Featire specs)
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376a (Featire specs)
=======
=======
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1ca9c0ea (Featire specs)
=======
=======
>>>>>>> 7b22ad7e (Featire specs)
=======
>>>>>>> b97bb382 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888bf (Featire specs)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 5507b42 (Featire specs)
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
=======
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> c12b71de (Featire specs)
=======
=======
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 392646b5 (Featire specs)
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
        
      
  
      
    
      spec/factories/books_categories.rb
      
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
>>>>>>> 36356d3 (Featire specs)
>>>>>>> 393eff3b (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 36356d3 (Featire specs)
>>>>>>> b904d7ae (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
>>>>>>> 5507b42 (Featire specs)
>>>>>>> 5e31aeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 53db2224 (Featire specs)
=======
=======
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> 973ba8c (Featire specs)
>>>>>>> b97bb382 (Featire specs)
        
      
  
      
    
      spec/factories/books_categories.rb
      
=======
        
      
  
      
    
      spec/factories/books_category.rb
      
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 53db2224 (Featire specs)
=======
>>>>>>> 7b22ad7e (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
        
      
  
      
    
      spec/factories/books_category.rb
      
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
        
      
  
      
    
      spec/factories/books_category.rb
      
>>>>>>> 4e81ea2 (Featire specs)
=======
        
      
  
      
    
      spec/factories/books_category.rb
      
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> 37e48018 (Featire specs)
=======
        
      
  
      
    
      spec/factories/books_category.rb
      
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
        
      
  
      
    
      spec/factories/books_categories.rb
      
>>>>>>> 75fa7e1b (Rebased)
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 365d41ed (Featire specs)
=======
>>>>>>> c05ee511 (Featire specs)
=======
>>>>>>> f136376a (Featire specs)
=======
>>>>>>> 1ca9c0ea (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
        
      
  
      
    
      spec/factories/books_category.rb
      
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> c12b71de (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 7b22ad7e (Featire specs)
=======
>>>>>>> b97bb382 (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> bf05825 (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 973ba8c (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
        
      
  
      
    
      spec/factories/books_category.rb
      
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
        
      
  
      
    
      spec/factories/books_category.rb
      
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
        
      
  
      
    
      spec/factories/books_category.rb
      
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
        
      
  
      
    
      spec/factories/books_categories.rb
      
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> 13fca83d (Rebased)
=======
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376a (Featire specs)
=======
=======
=======
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0ea (Featire specs)
=======
=======
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888bf (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
        
      
  
      
    
      spec/factories/books_category.rb
      
>>>>>>> 4552227 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 393eff3b (Featire specs)
=======
=======
>>>>>>> ef483b6d (Fix)
=======
        
      
  
      
    
      spec/factories/books_categories.rb
      
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d9d85ca6 (Fix)
=======
        
      
  
      
    
      spec/factories/books_categories.rb
      
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> 37e48018 (Featire specs)
=======
        
      
  
      
    
      spec/factories/books_categories.rb
      
>>>>>>> 11792758 (Rebased)
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> bf05825 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
        
      
  
      
    
      spec/factories/books_category.rb
      
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
        
      
  
      
    
      spec/factories/books_category.rb
      
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
        
      
  
      
    
      spec/factories/books_category.rb
      
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
        
      
  
      
    
      spec/factories/books_categories.rb
      
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> bc6bc8d2 (Rebased)
=======
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> d52f9efe (Featire specs)
=======
=======
=======
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> c12b71de (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
        
      
  
      
    
      spec/factories/books_category.rb
      
>>>>>>> 4552227 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
>>>>>>> b904d7ae (Featire specs)
=======
>>>>>>> ef483b6d (Fix)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 96394f1 (Featire specs)
=======
        
      
  
      
    
      spec/factories/books_category.rb
      
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
        
      
  
      
    
      spec/factories/books_category.rb
      
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
        
      
  
      
    
      spec/factories/books_category.rb
      
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
        
      
  
      
    
      spec/factories/books_categories.rb
      
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5e31aeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 53db2224 (Featire specs)
=======
=======
=======
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
=======
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
=======
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
=======
=======
        
      
  
      
    
      spec/factories/books_category.rb
      
>>>>>>> 4552227 (Featire specs)
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 392646b5 (Featire specs)
=======
=======
=======
        
      
  
      
    
      spec/factories/books_categories.rb
      
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      4 relevant lines.
      4 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            FactoryBot.define do
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

              factory :books_category do
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

                book
          
        4. 
        
        
      
        
        
          
      4. 
            1
            

            

                category
          
        5. 
        
        
      
        
        
          
      5. 
            
            

            

              end
          
        6. 
        
        
      
        
        
          
      6. 
            
            

            

            end
          
        7. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/factories/categories.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      3 relevant lines.
      3 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            FactoryBot.define do
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

              factory :category do
          
        3. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> e6fc67c7 (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> cc390719 (Manifest_cache true)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> 73f364d8 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> d365be68 (Manifest_cache true)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
          
      3. 
            12
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
<<<<<<< HEAD
=======
=======
=======
>>>>>>> 251144b4 (Manifest_cache true)
>>>>>>> df37394 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
>>>>>>> c8da2e3 (Fix)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
=======
>>>>>>> f92a45b (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> 0e864a5 (Manifest_cache true)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> fb61c5a (Featire specs)
=======
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> 1cce66c (Manifest_cache true)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 2a25e4c (Featire specs)
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> df37394 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
>>>>>>> e18eb87 (Fix)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
>>>>>>> c8da2e3 (Fix)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
>>>>>>> c59d1a99 (Manifest_cache true)
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
          
      4. 
            12
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 490b01d6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> b3f2049 (Featire specs)
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> e9f3851 (Manifest_cache true)
=======
>>>>>>> 307f31f (Manifest_cache true)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> d782a28 (Manifest_cache true)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 35d17b9 (Manifest_cache true)
=======
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
>>>>>>> 35d17b9 (Manifest_cache true)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
          
      5. 
            12
>>>>>>> b832d45 (Featire specs)
>>>>>>> 86d584a (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
          
      6. 
            12
>>>>>>> b832d45 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> b15044a (Manifest_cache true)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
          
      7. 
            12
>>>>>>> b832d45 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      8. 
            12
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ebcdce06 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> b3f2049 (Featire specs)
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> e9f3851 (Manifest_cache true)
=======
>>>>>>> 307f31f (Manifest_cache true)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> d782a28 (Manifest_cache true)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 35d17b9 (Manifest_cache true)
=======
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
>>>>>>> 35d17b9 (Manifest_cache true)
          
      9. 
            12
>>>>>>> b832d45 (Featire specs)
>>>>>>> 86d584a (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
          
      10. 
            12
>>>>>>> b832d45 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> b15044a (Manifest_cache true)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
          
      11. 
            12
>>>>>>> b832d45 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> b3f2049 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> e9f3851 (Manifest_cache true)
=======
>>>>>>> 307f31f (Manifest_cache true)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> d782a28 (Manifest_cache true)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 35d17b9 (Manifest_cache true)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> add330c (Manifest_cache true)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 15bff2e (Manifest_cache true)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> 6c71f00 (Manifest_cache true)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 35d17b9 (Manifest_cache true)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> add330c (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 15bff2e (Manifest_cache true)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 6c71f00 (Manifest_cache true)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
>>>>>>> 0b43b18 (Manifest_cache true)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
          
      12. 
            12
>>>>>>> b832d45 (Featire specs)
>>>>>>> 86d584a (Manifest_cache true)
=======
<<<<<<< HEAD
=======
=======
>>>>>>> 715fac2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 73f364d8 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> ebcdce06 (Featire specs)
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
>>>>>>> 7a08014b (Featire specs)
=======
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> e6fc67c7 (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
>>>>>>> 715fac2 (Featire specs)
>>>>>>> fb61c5a (Featire specs)
>>>>>>> 73f364d8 (Featire specs)
          
      13. 
            1
=======
<<<<<<< HEAD
          
      14. 
            8
=======
          
      15. 
            1
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
=======
          
      16. 
            8
>>>>>>> 752f0c0 (Featire specs)
=======
          
      17. 
            1
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
      18. 
            8
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fb61c5a (Featire specs)
=======
=======
>>>>>>> e5890c2 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 0e864a5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e5890c2 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 490b01d6 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 251144b4 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 86d584a (Manifest_cache true)
>>>>>>> e5890c2 (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> ebcdce06 (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
>>>>>>> c59d1a99 (Manifest_cache true)
=======
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> cc390719 (Manifest_cache true)
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 86d584a (Manifest_cache true)
>>>>>>> e5890c2 (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> 86d584a (Manifest_cache true)
>>>>>>> 0e864a5 (Manifest_cache true)
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
>>>>>>> 0b43b18 (Manifest_cache true)
=======
          
      19. 
            1
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> cc390719 (Manifest_cache true)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> 255dd8d (Manifest_cache true)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 255dd8d (Manifest_cache true)
>>>>>>> d4235040 (Manifest_cache true)
=======
=======
>>>>>>> 4a2f2ad8 (Featire specs)
=======
>>>>>>> 73f364d8 (Featire specs)
=======
>>>>>>> d365be68 (Manifest_cache true)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 255dd8d (Manifest_cache true)
=======
>>>>>>> fd310ed (Manifest_cache true)
>>>>>>> 86229876 (Manifest_cache true)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5890c2 (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 9440753 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fb61c5a (Featire specs)
=======
>>>>>>> 1cce66c (Manifest_cache true)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ebcdce06 (Featire specs)
=======
>>>>>>> c59d1a99 (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> e5890c2 (Manifest_cache true)
=======
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> 0e864a5 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> cc390719 (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 416166f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> 8181d13 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
>>>>>>> 715fac2 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 73f364d8 (Featire specs)
=======
>>>>>>> 0b43b18 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> d365be68 (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
          
      20. 
            8
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 73f364d8 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 9bfbd88 (Featire specs)
<<<<<<< HEAD
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
          
      21. 
            1
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> c51bf93 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> c51bf93 (Featire specs)
>>>>>>> 7a08014b (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
=======
>>>>>>> fb61c5a (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
>>>>>>> afa56d1 (Featire specs)
>>>>>>> e1ecabbe (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
=======
          
      22. 
            1
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
<<<<<<< HEAD
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
>>>>>>> fd3f47ab (Featire specs)
          
      23. 
            8
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> 74240509 (Fix book_spec decrease quantity and price)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
>>>>>>> 74240509 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bb5c652 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 824bb2b (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 5c33a07 (Featire specs)
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
          
      24. 
            1
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> add330c (Manifest_cache true)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
      25. 
            8
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
          
      26. 
            12
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
>>>>>>> 9a49b7b (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
>>>>>>> 6fa625b (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> c8cdb08 (Manifest_cache true)
=======
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
>>>>>>> b3f2049 (Featire specs)
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> c8cdb08 (Manifest_cache true)
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> c8cdb08 (Manifest_cache true)
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> b3f2049 (Featire specs)
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
          
      27. 
            12
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
>>>>>>> 6fa625b (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
          
      28. 
            12
>>>>>>> 9620751 (Featire specs)
=======
=======
          
      29. 
            12
>>>>>>> 6da9530 (Featire specs)
=======
          
      30. 
            12
>>>>>>> 9620751 (Featire specs)
=======
          
      31. 
            12
>>>>>>> 2a25e4c (Featire specs)
=======
          
      32. 
            8
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 53db2224 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d34a0770 (Manifest_cache true)
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
=======
=======
>>>>>>> e9f3851 (Manifest_cache true)
>>>>>>> b719333 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 5507b42 (Featire specs)
>>>>>>> 932dbec (Featire specs)
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> d34a0770 (Manifest_cache true)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5e31aeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 53db2224 (Featire specs)
=======
=======
=======
>>>>>>> e9f3851 (Manifest_cache true)
>>>>>>> 3be4d14 (Manifest_cache true)
>>>>>>> 1b8f36d8 (Manifest_cache true)
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
>>>>>>> 70fcacc (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 70fcacc (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
          
      33. 
            1
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d34a0770 (Manifest_cache true)
=======
>>>>>>> 824ea7c9 (Manifest_cache true)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 1b8f36d8 (Manifest_cache true)
=======
>>>>>>> 8a3779d4 (Manifest_cache true)
>>>>>>> b9cc4e9 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 78717cc (Manifest_cache true)
=======
=======
>>>>>>> 009401d (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
=======
=======
>>>>>>> 3be4d14 (Manifest_cache true)
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
>>>>>>> a71befd (Manifest_cache true)
          
      34. 
            8
=======
          
      35. 
            1
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824ea7c9 (Manifest_cache true)
=======
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 8a3779d4 (Manifest_cache true)
=======
>>>>>>> 7b22ad7e (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
>>>>>>> 6fa625b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 98beee2 (Manifest_cache true)
=======
=======
>>>>>>> 009401d (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
          
      36. 
            8
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> ae409ca (Featire specs)
=======
=======
=======
          
      37. 
            1
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> c8cdb08 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 385b8df (Manifest_cache true)
=======
=======
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 379a979 (Featire specs)
=======
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 7bc7f9f (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 490b01d6 (Manifest_cache true)
=======
=======
>>>>>>> 7bc7f9f (Manifest_cache true)
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> adc21e0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 84d0df6 (Manifest_cache true)
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 37e48018 (Featire specs)
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
=======
=======
=======
          
      38. 
            8
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 4d90e3d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
=======
=======
          
      39. 
            1
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 00f8b58 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 450f4e3 (Manifest_cache true)
=======
=======
=======
          
      40. 
            8
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
>>>>>>> 11792758 (Rebased)
=======
=======
          
      41. 
            1
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> aa3618b (Rebased)
<<<<<<< HEAD
>>>>>>> 75fa7e1b (Rebased)
=======
=======
>>>>>>> aa3618b (Rebased)
>>>>>>> 31d15e66 (Fix)
=======
=======
          
      42. 
            12
>>>>>>> a5d032d (Fix)
>>>>>>> 160fb15 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
=======
=======
>>>>>>> d782a28 (Manifest_cache true)
>>>>>>> a304bcf (Manifest_cache true)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
          
      43. 
            1
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> c8cdb08 (Manifest_cache true)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> e3e66f3 (Featire specs)
          
      44. 
            8
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 8cbdfeb (Manifest_cache true)
>>>>>>> 9c0d812 (Featire specs)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
          
      45. 
            1
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 00f8b58 (Manifest_cache true)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
      46. 
            8
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      47. 
            1
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      48. 
            12
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e5890c2 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 251144b4 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> 13fca83d (Rebased)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> ae884b47 (Fix)
=======
=======
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376a (Featire specs)
=======
=======
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b719333 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0341d6de (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> bf137e4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 21793167 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0ea (Featire specs)
=======
=======
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a304bcf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d245196f (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888bf (Featire specs)
=======
=======
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
>>>>>>> 35d17b9 (Manifest_cache true)
>>>>>>> 255dd8d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 304cd28a (Manifest_cache true)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 74240509 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e59c273d (Manifest_cache true)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a1a479e2 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
      49. 
            8
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 393eff3b (Featire specs)
=======
=======
=======
=======
          
      50. 
            1
>>>>>>> 998f08d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 64dceec (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 7afa007b (Manifest_cache true)
=======
=======
=======
=======
          
      51. 
            8
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
      52. 
            12
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
>>>>>>> d9d85ca6 (Fix)
=======
          
      53. 
            12
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 9bfbd88 (Featire specs)
>>>>>>> ebcdce06 (Featire specs)
=======
>>>>>>> 7bc7f9f (Manifest_cache true)
>>>>>>> c59d1a99 (Manifest_cache true)
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
>>>>>>> aa3618b (Rebased)
>>>>>>> 11792758 (Rebased)
=======
>>>>>>> 31d15e66 (Fix)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
=======
=======
>>>>>>> d782a28 (Manifest_cache true)
>>>>>>> a304bcf (Manifest_cache true)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
          
      54. 
            1
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> c8cdb08 (Manifest_cache true)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> e3e66f3 (Featire specs)
          
      55. 
            8
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 8cbdfeb (Manifest_cache true)
>>>>>>> 9c0d812 (Featire specs)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
          
      56. 
            1
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 00f8b58 (Manifest_cache true)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
      57. 
            8
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      58. 
            1
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      59. 
            12
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> fdab719f (Fix)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e5890c2 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> bc6bc8d2 (Rebased)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> 8288136d (Fix)
=======
=======
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> d52f9efe (Featire specs)
=======
=======
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b719333 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d34a0770 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> bf137e4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 824ea7c9 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a304bcf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> bd30d038 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> c12b71de (Featire specs)
=======
=======
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
>>>>>>> 35d17b9 (Manifest_cache true)
>>>>>>> 255dd8d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d4235040 (Manifest_cache true)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4367ccb1 (Manifest_cache true)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
      60. 
            8
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b904d7ae (Featire specs)
=======
=======
=======
=======
          
      61. 
            1
>>>>>>> 998f08d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 64dceec (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4fac471d (Manifest_cache true)
=======
=======
=======
=======
          
      62. 
            8
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
      63. 
            12
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
>>>>>>> ef483b6d (Fix)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
>>>>>>> a71befd (Manifest_cache true)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
>>>>>>> 6fa625b (Manifest_cache true)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
          
      64. 
            8
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> d782a28 (Manifest_cache true)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
          
      65. 
            1
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> c8cdb08 (Manifest_cache true)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
=======
          
      66. 
            8
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
          
      67. 
            1
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 00f8b58 (Manifest_cache true)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
      68. 
            8
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 49e8a6c (Rebased)
=======
          
      69. 
            1
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
          
      70. 
            12
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0e864a5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> cc390719 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 0c57e4e (Fix)
<<<<<<< HEAD
>>>>>>> 8887ba5b (Fix)
=======
=======
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5e31aeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 53db2224 (Featire specs)
=======
=======
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 3be4d14 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1b8f36d8 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a71befd (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8a3779d4 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 551c6ab (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 56531f25 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 35d17b9 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> fd310ed (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 86229876 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> add330c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 42e9c2e (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 16ebb0ff (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0f24a043 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 15bff2e (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> c0159bf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1d0f5cbf (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> b8c2784f (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
=======
          
      71. 
            8
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 392646b5 (Featire specs)
=======
=======
=======
=======
=======
          
      72. 
            1
>>>>>>> 998f08d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 6c71f00 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> ca274ec (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a56ba36d (Manifest_cache true)
=======
=======
=======
=======
=======
          
      73. 
            8
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
      74. 
            12
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 715fac2 (Featire specs)
<<<<<<< HEAD
>>>>>>> fb61c5a (Featire specs)
<<<<<<< HEAD
>>>>>>> 73f364d8 (Featire specs)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 6fa625b (Manifest_cache true)
=======
=======
          
      75. 
            8
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
=======
=======
          
      76. 
            1
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> c8cdb08 (Manifest_cache true)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0b43b18 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1cce66c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d365be68 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
          
      77. 
            8
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            

            

                name { FFaker::Book.genre }
          
        78. 
        
        
      
        
        
          
      78. 
            
            

            

              end
          
        79. 
        
        
      
        
        
          
      79. 
            
            

            

            end
          
        80. 
        
        
      
    
      
  
      

      

      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
=======
>>>>>>> f92a45b (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> fb61c5a (Featire specs)
=======
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> 1cce66c (Manifest_cache true)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 2a25e4c (Featire specs)
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 0b43b18 (Manifest_cache true)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5506bd0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
>>>>>>> 904663c (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 715fac2 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 7d58507 (Add login registration pages)
=======
<<<<<<< HEAD
>>>>>>> 49e8a6c (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> d782a28 (Manifest_cache true)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 35d17b9 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 852864e (Add login registration pages)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> add330c (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 551f3c1 (Add login registration pages)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 15bff2e (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> ccec311 (Add login registration pages)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6c71f00 (Manifest_cache true)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8c3e531 (Add login registration pages)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1d59aaa (Fix)
=======
<<<<<<< HEAD
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 715fac2 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 03c0867 (Add login registration pages)
=======
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 490b01d6 (Manifest_cache true)
=======
>>>>>>> 6066f925 (Add login registration pages)
=======
>>>>>>> 6e923b9d (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8249ff3c (Add login registration pages)
=======
>>>>>>> 34509eee (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e989024d (Add login registration pages)
=======
<<<<<<< HEAD
>>>>>>> 75fa7e1b (Rebased)
=======
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f6e20266 (Add login registration pages)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> e59c273d (Manifest_cache true)
=======
>>>>>>> a1a479e2 (Fix book_spec decrease quantity and price)
=======
>>>>>>> ed8ea634 (Add login registration pages)
=======
>>>>>>> 393eff3b (Featire specs)
=======
>>>>>>> 7afa007b (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2be0d057 (Add login registration pages)
=======
>>>>>>> d9d85ca6 (Fix)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> c7a726c5 (Rebased)
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 74240509 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
<<<<<<< HEAD
=======
>>>>>>> c59d1a99 (Manifest_cache true)
=======
>>>>>>> bae2b7de (Add login registration pages)
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 56fd9d41 (Add login registration pages)
=======
>>>>>>> 11792758 (Rebased)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> 7a08014b (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> 9a49b7b (Rebased)
=======
>>>>>>> 70fcacc (Featire specs)
=======
>>>>>>> 78717cc (Manifest_cache true)
=======
>>>>>>> 98beee2 (Manifest_cache true)
=======
>>>>>>> ae409ca (Featire specs)
=======
>>>>>>> 385b8df (Manifest_cache true)
=======
>>>>>>> 379a979 (Featire specs)
=======
>>>>>>> 7bc7f9f (Manifest_cache true)
=======
>>>>>>> 156ffe6 (Add login registration pages)
=======
>>>>>>> adc21e0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 490b01d6 (Manifest_cache true)
=======
>>>>>>> 156ffe6 (Add login registration pages)
=======
<<<<<<< HEAD
>>>>>>> 6066f925 (Add login registration pages)
=======
>>>>>>> adc21e0 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
>>>>>>> 84d0df6 (Manifest_cache true)
=======
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 793a6ed (Add login registration pages)
=======
>>>>>>> 4d90e3d (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8249ff3c (Add login registration pages)
=======
>>>>>>> 4d90e3d (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
>>>>>>> 450f4e3 (Manifest_cache true)
=======
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
=======
>>>>>>> c5efe8e (Add login registration pages)
=======
>>>>>>> aa3618b (Rebased)
=======
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> c51bf93 (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
>>>>>>> 904663c (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
>>>>>>> c5efe8e (Add login registration pages)
=======
<<<<<<< HEAD
>>>>>>> e989024d (Add login registration pages)
=======
>>>>>>> aa3618b (Rebased)
=======
<<<<<<< HEAD
>>>>>>> 75fa7e1b (Rebased)
=======
>>>>>>> 824bb2b (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> c51bf93 (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> a8b17c32 (Add login registration pages)
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> d52f9efe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7d58507 (Add login registration pages)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a8b17c32 (Add login registration pages)
=======
>>>>>>> 49e8a6c (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> 5507b42 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> 5507b42 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> d34a0770 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
>>>>>>> 009401d (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 251144b4 (Manifest_cache true)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> fc3774fd (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 7d58507 (Add login registration pages)
=======
<<<<<<< HEAD
>>>>>>> 49e8a6c (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
=======
>>>>>>> 307f31f (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 824ea7c9 (Manifest_cache true)
=======
>>>>>>> 307f31f (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> d782a28 (Manifest_cache true)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 35d17b9 (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> d782a28 (Manifest_cache true)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 35d17b9 (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> c59d1a99 (Manifest_cache true)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9bfbd88 (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
<<<<<<< HEAD
=======
=======
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9bfbd88 (Featire specs)
<<<<<<< HEAD
>>>>>>> ebcdce06 (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> 6da9530 (Featire specs)
>>>>>>> 0f8241bb (Featire specs)
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
>>>>>>> 4f4ea3f9 (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 7a08014b (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> e6fc67c7 (Featire specs)
=======
>>>>>>> 73f364d8 (Featire specs)
=======
>>>>>>> 73dcd461 (Add login registration pages)
=======
        
      
=======
<<<<<<< HEAD
=======
=======
=======
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 88d49ad (Add login registration pages)
=======
=======
=======
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> a636fda (Featire specs)
=======
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
>>>>>>> 6fa625b (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> c8cdb08 (Manifest_cache true)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9ec6862 (Add login registration pages)
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
>>>>>>> 57a2e05 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 8249ff3c (Add login registration pages)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> cacbab9 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e989024d (Add login registration pages)
=======
<<<<<<< HEAD
>>>>>>> c59d1a99 (Manifest_cache true)
=======
=======
>>>>>>> 9ec6862 (Add login registration pages)
>>>>>>> bae2b7de (Add login registration pages)
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
        
      
  
      
    
      spec/factories/reviews.rb
      
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 7375d4b (Manifest_cache true)
=======
<<<<<<< HEAD
=======
=======
>>>>>>> ebcdce06 (Featire specs)
=======
        
      
=======
=======
>>>>>>> bae2b7de (Add login registration pages)
        
      
  
      
    
      spec/factories/users.rb
      
=======
>>>>>>> c51bf93 (Featire specs)
>>>>>>> 7a08014b (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> f92a45b (Featire specs)
=======
>>>>>>> fb61c5a (Featire specs)
=======
>>>>>>> 8d4ec55 (Add login registration pages)
=======
>>>>>>> 730a8ca (Add login registration pages)
=======
=======
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
=======
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
>>>>>>> 6fa625b (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 3cf8dd4 (Featire specs)
>>>>>>> b3f2049 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 86d584a (Manifest_cache true)
=======
=======
>>>>>>> 9ec6862 (Add login registration pages)
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c871248 (Add login registration pages)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> cacbab9 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e055dd0 (Rebased)
>>>>>>> 7d58507 (Add login registration pages)
=======
<<<<<<< HEAD
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> b3f2049 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
>>>>>>> b3f2049 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
=======
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
>>>>>>> 86d584a (Manifest_cache true)
>>>>>>> 0e864a5 (Manifest_cache true)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7d58507 (Add login registration pages)
>>>>>>> c871248 (Add login registration pages)
=======
>>>>>>> 0b43b18 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1cce66c (Manifest_cache true)
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
        
      
=======
=======
=======
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 03c0867 (Add login registration pages)
        
      
  
      
    
      spec/factories/users.rb
      
=======
        
      
  
      
    
      spec/feature/book_spec.rb
      
>>>>>>> 7a02bbe (Featire specs)
    
      
      
  100.0%


      lines covered
    
      

    

    
      
<<<<<<< HEAD
      2 relevant lines.
      2 lines covered and
=======
      105 relevant lines.
      105 lines covered and
>>>>>>> 7a02bbe (Featire specs)
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

<<<<<<< HEAD
            FactoryBot.define do
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

              factory :user do
          
        3. 
        
        
      
        
        
          
      3. 
            
            

            

              end
          
        4. 
        
        
      
        
        
          
      4. 
            
            

            

            end
          
        5. 
        
        
      
    
      
  
      

      

      
<<<<<<< HEAD
>>>>>>> 1214e1f (Add login registration pages)
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
=======
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 22ee41c (Add login registration pages)
>>>>>>> 03c0867 (Add login registration pages)
        
      
>>>>>>> 715fac2 (Featire specs)
  
      
<<<<<<< HEAD
    
      spec/factories/reviews.rb
      
>>>>>>> 84003439 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f92a45b (Featire specs)
=======
        
      
  
      
    
      spec/factories/users.rb
      
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
=======
>>>>>>> 659083f (Featire specs)
=======
        
      
  
      
    
      spec/factories/users.rb
      
=======
<<<<<<< HEAD
=======
        
      
  
      
    
      spec/factories/users.rb
      
=======
<<<<<<< HEAD
=======
>>>>>>> bf554f4 (Rebased)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
        
      
  
      
    
      spec/factories/reviews.rb
      
<<<<<<< HEAD
>>>>>>> 49e8a6c (Rebased)
=======
=======
=======
>>>>>>> 7375d4b (Manifest_cache true)
=======
>>>>>>> 6da9530 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
=======
=======
        
      
  
      
    
      spec/factories/users.rb
      
=======
=======
        
      
  
      
    
      spec/factories/users.rb
      
=======
=======
>>>>>>> bf554f4 (Rebased)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> f182ac7 (Add login registration pages)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57da3ff (Add login registration pages)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a624084 (Add login registration pages)
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> b15044a (Manifest_cache true)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6a9fede (Add login registration pages)
        
      
=======
        
      
>>>>>>> 7c4ea7f (Fix)
  
      
<<<<<<< HEAD
    
      spec/factories/reviews.rb
      
<<<<<<< HEAD
>>>>>>> 49e8a6c (Rebased)
=======
=======
=======
>>>>>>> 7375d4b (Manifest_cache true)
=======
        
      
  
      
    
      spec/factories/users.rb
      
=======
=======
        
      
  
      
    
      spec/factories/users.rb
      
=======
=======
        
      
  
      
    
      spec/factories/users.rb
      
=======
=======
        
      
  
      
    
      spec/factories/users.rb
      
=======
    
      spec/factories/coupons.rb
      
>>>>>>> 1d59aaa (Fix)
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      6 relevant lines.
      6 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            FactoryBot.define do
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

              factory :coupon do
          
        3. 
        
        
      
        
        
          
      3. 
            4
            

            

                code { SecureRandom.hex }
          
        4. 
        
        
      
        
        
          
      4. 
            4
            

            

                is_active { true }
          
        5. 
        
        
      
        
        
          
      5. 
            4
            

            

                active_till_date { FFaker::Time.datetime }
          
        6. 
        
        
      
        
        
          
      6. 
            1
            

            

                discount { rand(0..50) / 100 }
          
        7. 
        
        
      
        
        
          
      7. 
            
            

            

              end
          
        8. 
        
        
      
        
        
          
      8. 
            
            

            

            end
          
        9. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/factories/order_books.rb
      
=======
    
      spec/feature/book_spec.rb
      
>>>>>>> 4e81ea2 (Featire specs)
=======
        
      
  
      
    
      spec/feature/book_spec.rb
      
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
    
      
      
  100.0%


      lines covered
    
      

    

    
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
      2 relevant lines.
      2 lines covered and
=======
      105 relevant lines.
      105 lines covered and
>>>>>>> 4552227 (Featire specs)
=======
      105 relevant lines.
      105 lines covered and
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
            FactoryBot.define do
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

              factory :user do
          
        3. 
        
        
      
        
        
          
      3. 
            
            

            

              end
          
        4. 
        
        
      
        
        
          
      4. 
            
            

            

            end
          
        5. 
        
        
      
    
      
  
      

      

      
>>>>>>> e1f4d17 (Add login registration pages)
        
      
  
      
    
      spec/feature/book_spec.rb
      
>>>>>>> 7a02bbe (Featire specs)
=======
        
      
  
      
    
      spec/feature/book_spec.rb
      
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
    
      
      
  100.0%


      lines covered
    
      

    

    
      
<<<<<<< HEAD
<<<<<<< HEAD
      2 relevant lines.
      2 lines covered and
=======
      105 relevant lines.
      105 lines covered and
>>>>>>> 7a02bbe (Featire specs)
=======
      105 relevant lines.
      105 lines covered and
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
            FactoryBot.define do
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

              factory :user do
          
        3. 
        
        
      
        
        
          
      3. 
            
            

            

              end
          
        4. 
        
        
      
        
        
          
      4. 
            
            

            

            end
          
        5. 
        
        
      
    
      
  
      

      

      
>>>>>>> 730a8ca (Add login registration pages)
        
      
  
      
    
      spec/feature/book_spec.rb
      
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
    
      
      
  100.0%


      lines covered
    
      

    

    
      
<<<<<<< HEAD
      2 relevant lines.
      2 lines covered and
=======
      105 relevant lines.
      105 lines covered and
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

<<<<<<< HEAD
            FactoryBot.define do
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

              factory :user do
          
        3. 
        
        
      
        
        
          
      3. 
            
            

            

              end
          
        4. 
        
        
      
        
        
          
      4. 
            
            

            

            end
          
        5. 
        
        
      
    
      
  
      

      

      
>>>>>>> 1214e1f (Add login registration pages)
        
      
  
      
    
      spec/feature/book_spec.rb
      
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
=======
        
      
  
      
    
      spec/feature/book_spec.rb
      
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
        
      
  
      
    
      spec/feature/book_spec.rb
      
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
        
      
  
      
    
      spec/feature/book_spec.rb
      
>>>>>>> 08edf50 (Featire specs)
>>>>>>> ee5242b (Featire specs)
    
      
      
  100.0%


      lines covered
    
      

    

    
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
      2 relevant lines.
      2 lines covered and
=======
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
      5 relevant lines.
      5 lines covered and
=======
      105 relevant lines.
      105 lines covered and
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
=======
      105 relevant lines.
      105 lines covered and
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
      105 relevant lines.
      105 lines covered and
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
      105 relevant lines.
      105 lines covered and
>>>>>>> 08edf50 (Featire specs)
>>>>>>> ee5242b (Featire specs)
=======
      5 relevant lines.
      5 lines covered and
>>>>>>> 1d59aaa (Fix)
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            FactoryBot.define do
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              factory :user do
          
        3. 
        
        
      
        
        
          
      3. 
            
            

            

              end
          
        4. 
        
        
      
        
        
          
      4. 
            
            

            

            end
          
        5. 
        
        
      
    
      
  
      

      

      
>>>>>>> e1f4d17 (Add login registration pages)
        
      
  
      
    
      spec/feature/book_spec.rb
      
>>>>>>> 7a02bbe (Featire specs)
=======
        
      
  
      
    
      spec/feature/book_spec.rb
      
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
    
      
      
  100.0%


      lines covered
    
      

    

    
      
<<<<<<< HEAD
<<<<<<< HEAD
      2 relevant lines.
      2 lines covered and
=======
      105 relevant lines.
      105 lines covered and
>>>>>>> 7a02bbe (Featire specs)
=======
      105 relevant lines.
      105 lines covered and
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
            FactoryBot.define do
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

              factory :user do
          
        3. 
        
        
      
        
        
          
      3. 
            
            

            

              end
          
        4. 
        
        
      
        
        
          
      4. 
            
            

            

            end
          
        5. 
        
        
      
    
      
  
      

      

      
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
        
      
  
      
    
      spec/feature/book_spec.rb
      
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 659083f (Featire specs)
=======
=======
=======
        
      
  
      
    
      spec/feature/book_spec.rb
      
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
    
      
      
  100.0%


      lines covered
    
      

    

    
      
<<<<<<< HEAD
<<<<<<< HEAD
      2 relevant lines.
      2 lines covered and
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
      5 relevant lines.
      5 lines covered and
=======
      105 relevant lines.
      105 lines covered and
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
=======
      105 relevant lines.
      105 lines covered and
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
            FactoryBot.define do
=======
            require 'rails_helper'
>>>>>>> d0dc1f1 (Featire specs)
=======
            require 'rails_helper'
>>>>>>> 752f0c0 (Featire specs)
          
        2. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
          
      2. 
            1
=======
          
      3. 
            
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      4. 
            
>>>>>>> 752f0c0 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
              factory :user do
          
        5. 
        
        
      
        
        
          
      5. 
            
            

            

              end
          
        6. 
        
        
      
        
        
          
      6. 
            
            

            

            end
          
        7. 
        
        
      
    
      
  
      

      

      
>>>>>>> 1214e1f (Add login registration pages)
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
>>>>>>> f92a45b (Featire specs)
        
      
  
      
    
      spec/feature/book_spec.rb
      
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
        
      
  
      
    
      spec/feature/book_spec.rb
      
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
=======
        
      
  
      
    
      spec/feature/book_spec.rb
      
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> f182ac7 (Add login registration pages)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57da3ff (Add login registration pages)
<<<<<<< HEAD
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> a624084 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e60833c (Add login registration pages)
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 64dceec (Manifest_cache true)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 6a9fede (Add login registration pages)
>>>>>>> f416f45 (Add login registration pages)
        
      
=======
        
      
>>>>>>> 7c4ea7f (Fix)
  
      
<<<<<<< HEAD
    
      spec/factories/reviews.rb
      
=======
=======
>>>>>>> 7375d4b (Manifest_cache true)
=======
        
      
  
      
    
      spec/factories/users.rb
      
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
        
      
  
      
    
      spec/factories/users.rb
      
<<<<<<< HEAD
=======
=======
=======
        
      
  
      
    
      spec/factories/users.rb
      
=======
=======
        
      
  
      
    
      spec/factories/users.rb
      
=======
    
      spec/factories/coupons.rb
      
>>>>>>> 5b7749a (Fix)
=======
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
=======
        
      
  
      
    
      spec/feature/book_spec.rb
      
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
    
      
      
  100.0%


      lines covered
    
      

    

    
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
      6 relevant lines.
      6 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            FactoryBot.define do
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

              factory :coupon do
          
        3. 
        
        
      
        
        
          
      3. 
            4
            

            

                code { SecureRandom.hex }
          
        4. 
        
        
      
        
        
          
      4. 
            4
            

            

                is_active { true }
          
        5. 
        
        
      
        
        
          
      5. 
            4
            

            

                active_till_date { FFaker::Time.datetime }
          
        6. 
        
        
      
        
        
          
      6. 
            1
            

            

                discount { rand(0..50) / 100 }
          
        7. 
        
        
      
        
        
          
      7. 
            
            

            

              end
          
        8. 
        
        
      
        
        
          
      8. 
            
            

            

            end
          
        9. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/factories/order_books.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
      2 relevant lines.
      2 lines covered and
=======
      105 relevant lines.
      105 lines covered and
>>>>>>> 4552227 (Featire specs)
=======
      105 relevant lines.
      105 lines covered and
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 2ee03d3 (Featire specs)
>>>>>>> afa56d1 (Featire specs)
      5 relevant lines.
      5 lines covered and
=======
      105 relevant lines.
      105 lines covered and
>>>>>>> d0dc1f1 (Featire specs)
=======
      105 relevant lines.
      105 lines covered and
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0ed7f7c (Featire specs)
=======
<<<<<<< HEAD
=======
=======
      105 relevant lines.
      105 lines covered and
>>>>>>> 4e81ea2 (Featire specs)
=======
      105 relevant lines.
      105 lines covered and
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
=======
=======
      5 relevant lines.
      5 lines covered and
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> e055dd0 (Rebased)
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
>>>>>>> afa56d1 (Featire specs)
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
            FactoryBot.define do
<<<<<<< HEAD
=======
=======
            require 'rails_helper'
>>>>>>> d0dc1f1 (Featire specs)
=======
            require 'rails_helper'
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0ed7f7c (Featire specs)
=======
<<<<<<< HEAD
=======
=======
            require 'rails_helper'
>>>>>>> 4e81ea2 (Featire specs)
=======
            require 'rails_helper'
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
=======
=======
=======
            require 'rails_helper'
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
            require 'rails_helper'
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
=======
=======
=======
            require 'rails_helper'
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
            FactoryBot.define do
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> e055dd0 (Rebased)
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

              factory :user do
          
        3. 
        
        
      
        
        
          
      3. 
            
            

            

              end
          
        4. 
        
        
      
        
        
          
      4. 
            
            

            

            end
          
        5. 
        
        
      
    
      
  
      

      

      
>>>>>>> e1f4d17 (Add login registration pages)
        
      
  
      
    
      spec/feature/book_spec.rb
      
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
        
      
  
      
    
      spec/feature/book_spec.rb
      
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
    
      
      
  100.0%


      lines covered
    
      

    

    
      
<<<<<<< HEAD
<<<<<<< HEAD
      2 relevant lines.
      2 lines covered and
=======
<<<<<<< HEAD
      2 relevant lines.
      2 lines covered and
=======
      105 relevant lines.
      105 lines covered and
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
      105 relevant lines.
      105 lines covered and
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
            FactoryBot.define do
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

              factory :user do
          
        3. 
        
        
      
        
        
          
      3. 
            
            

            

              end
          
        4. 
        
        
      
        
        
          
      4. 
            
            

            

            end
          
        5. 
        
        
      
    
      
  
      

      

      
>>>>>>> 730a8ca (Add login registration pages)
        
      
  
      
    
      spec/feature/book_spec.rb
      
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
    
      
      
  100.0%


      lines covered
    
      

    

    
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
      2 relevant lines.
      2 lines covered and
=======
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
      5 relevant lines.
      5 lines covered and
=======
      105 relevant lines.
      105 lines covered and
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
=======
      105 relevant lines.
      105 lines covered and
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
      105 relevant lines.
      105 lines covered and
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
      2 relevant lines.
      2 lines covered and
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
      2 relevant lines.
      2 lines covered and
=======
      105 relevant lines.
      105 lines covered and
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
            FactoryBot.define do
=======
            require 'rails_helper'
>>>>>>> d0dc1f1 (Featire specs)
=======
            require 'rails_helper'
>>>>>>> 752f0c0 (Featire specs)
=======
            require 'rails_helper'
>>>>>>> 4e81ea2 (Featire specs)
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
          
        2. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 5506bd0 (Featire specs)
          
      2. 
            1
=======
          
      3. 
            
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      4. 
            
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
          
      5. 
            
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
            

            

<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
          
      6. 
            
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      7. 
            
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
          
      8. 
            
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      9. 
            
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
=======
          
      10. 
            
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
          
      11. 
            1
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              factory :user do
          
        12. 
        
        
      
        
        
          
      12. 
            
            

            

              end
          
        13. 
        
        
      
        
        
          
      13. 
            
            

            

            end
          
        14. 
        
        
      
    
      
  
      

      

      
>>>>>>> e1f4d17 (Add login registration pages)
        
      
  
      
    
      spec/feature/book_spec.rb
      
>>>>>>> 7a02bbe (Featire specs)
=======
        
      
  
      
    
      spec/feature/book_spec.rb
      
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
    
      
      
  100.0%


      lines covered
    
      

    

    
      
<<<<<<< HEAD
<<<<<<< HEAD
      2 relevant lines.
      2 lines covered and
=======
      105 relevant lines.
      105 lines covered and
>>>>>>> 7a02bbe (Featire specs)
=======
      105 relevant lines.
      105 lines covered and
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
            FactoryBot.define do
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

              factory :user do
          
        3. 
        
        
      
        
        
          
      3. 
            
            

            

              end
          
        4. 
        
        
      
        
        
          
      4. 
            
            

            

            end
          
        5. 
        
        
      
    
      
  
      

      

      
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> e5752db (Featire specs)
        
      
  
      
    
      spec/feature/book_spec.rb
      
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
=======
        
      
  
      
    
      spec/feature/book_spec.rb
      
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
    
      
      
  100.0%


      lines covered
    
      

    

    
      
<<<<<<< HEAD
<<<<<<< HEAD
      2 relevant lines.
      2 lines covered and
=======
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
      5 relevant lines.
      5 lines covered and
=======
      105 relevant lines.
      105 lines covered and
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
=======
      105 relevant lines.
      105 lines covered and
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6da9530 (Featire specs)
            FactoryBot.define do
=======
            require 'rails_helper'
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
=======
            require 'rails_helper'
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
          
        2. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6da9530 (Featire specs)
          
      2. 
            1
=======
          
      3. 
            
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
=======
          
      4. 
            
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              factory :user do
          
        5. 
        
        
      
        
        
          
      5. 
            
            

            

              end
          
        6. 
        
        
      
        
        
          
      6. 
            
            

            

            end
          
        7. 
        
        
      
    
      
  
      

      

      
>>>>>>> 1214e1f (Add login registration pages)
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> e3e66f3 (Featire specs)
        
      
  
      
    
      spec/feature/book_spec.rb
      
<<<<<<< HEAD
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
        
      
  
      
    
      spec/feature/book_spec.rb
      
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
<<<<<<< HEAD
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
        
      
  
      
    
      spec/feature/book_spec.rb
      
>>>>>>> 4e81ea2 (Featire specs)
=======
        
      
  
      
    
      spec/feature/book_spec.rb
      
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
    
      
      
  100.0%


      lines covered
    
      

    

    
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
      2 relevant lines.
      2 lines covered and
=======
      105 relevant lines.
      105 lines covered and
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
      5 relevant lines.
      5 lines covered and
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
      5 relevant lines.
      5 lines covered and
=======
      105 relevant lines.
      105 lines covered and
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
      105 relevant lines.
      105 lines covered and
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
<<<<<<< HEAD
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
      105 relevant lines.
      105 lines covered and
>>>>>>> 4e81ea2 (Featire specs)
=======
      105 relevant lines.
      105 lines covered and
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
      5 relevant lines.
      5 lines covered and
>>>>>>> 49e8a6c (Rebased)
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> bc6bc8d2 (Rebased)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
      5 relevant lines.
      5 lines covered and
>>>>>>> 5b7749a (Fix)
>>>>>>> ef483b6d (Fix)
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
            FactoryBot.define do
=======
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
            FactoryBot.define do
=======
            require 'rails_helper'
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
=======
=======
            require 'rails_helper'
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
=======
<<<<<<< HEAD
=======
=======
=======
            require 'rails_helper'
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
            require 'rails_helper'
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
            require 'rails_helper'
>>>>>>> 4e81ea2 (Featire specs)
=======
            require 'rails_helper'
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
            require 'rails_helper'
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
            require 'rails_helper'
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
=======
=======
=======
            require 'rails_helper'
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
=======
            FactoryBot.define do
>>>>>>> 49e8a6c (Rebased)
>>>>>>> 311e9fa (Rebased)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
            require 'rails_helper'
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
            require 'rails_helper'
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
            require 'rails_helper'
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
            require 'rails_helper'
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
            FactoryBot.define do
>>>>>>> 5b7749a (Fix)
          
        2. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
          
      2. 
            1
=======
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      3. 
            1
=======
          
      4. 
            
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      5. 
            
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
            

            

<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      6. 
            
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      7. 
            
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      8. 
            
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      9. 
            
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
          
      10. 
            
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
          
      11. 
            1
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      12. 
            
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      13. 
            
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      14. 
            1
>>>>>>> 5b7749a (Fix)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
              factory :user do
          
        15. 
        
        
      
        
        
          
      15. 
            
            

            

              end
          
        16. 
        
        
      
        
        
          
      16. 
            
            

            

            end
          
        17. 
        
        
      
    
      
  
      

      

      
>>>>>>> 1214e1f (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
=======
        
      
  
      
    
      spec/feature/book_spec.rb
      
>>>>>>> d0dc1f1 (Featire specs)
=======
        
      
  
      
    
      spec/feature/book_spec.rb
      
>>>>>>> 752f0c0 (Featire specs)
=======
        
      
  
      
    
      spec/feature/book_spec.rb
      
>>>>>>> 4e81ea2 (Featire specs)
=======
        
      
  
      
    
      spec/feature/book_spec.rb
      
>>>>>>> 08edf50 (Featire specs)
    
      
      
  100.0%


      lines covered
    
      

    

    
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
      5 relevant lines.
      5 lines covered and
=======
      105 relevant lines.
      105 lines covered and
>>>>>>> d0dc1f1 (Featire specs)
=======
      105 relevant lines.
      105 lines covered and
>>>>>>> 752f0c0 (Featire specs)
=======
      105 relevant lines.
      105 lines covered and
>>>>>>> 4e81ea2 (Featire specs)
=======
      105 relevant lines.
      105 lines covered and
>>>>>>> 08edf50 (Featire specs)
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
            FactoryBot.define do
=======
            require 'rails_helper'
>>>>>>> d0dc1f1 (Featire specs)
=======
            require 'rails_helper'
>>>>>>> 752f0c0 (Featire specs)
=======
            require 'rails_helper'
>>>>>>> 4e81ea2 (Featire specs)
=======
            require 'rails_helper'
>>>>>>> 08edf50 (Featire specs)
=======
            require 'rails_helper'
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
          
        2. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      2. 
            1
=======
          
      3. 
            
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      4. 
            
>>>>>>> 752f0c0 (Featire specs)
=======
          
      5. 
            
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      6. 
            
>>>>>>> 08edf50 (Featire specs)
=======
          
      7. 
            
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              factory :review do
=======
            
>>>>>>> d0dc1f1 (Featire specs)
=======
            
>>>>>>> 752f0c0 (Featire specs)
=======
            
>>>>>>> 4e81ea2 (Featire specs)
=======
            
>>>>>>> 08edf50 (Featire specs)
=======
            
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
              factory :review do
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 49f2e24 (Featire specs)
              factory :review do
=======
            
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
=======
            
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
            
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 973ba8c (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
=======
            
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
=======
            
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
            
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 4e81ea2 (Featire specs)
=======
            
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
            
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
            
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
            
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
=======
              factory :review do
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> bc6bc8d2 (Rebased)
=======
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> d52f9efe (Featire specs)
=======
=======
=======
=======
            
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
=======
            
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> c12b71de (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
=======
            
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
            
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
=======
=======
            
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b904d7ae (Featire specs)
=======
=======
=======
            
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
=======
=======
              factory :order_book do
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
>>>>>>> ef483b6d (Fix)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
            
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 0676508 (Featire specs)
=======
            
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
=======
            
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
            
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
=======
            
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
            
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
=======
            
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
              factory :review do
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5e31aeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 53db2224 (Featire specs)
=======
=======
=======
=======
            
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
            
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
=======
=======
            
>>>>>>> 08edf50 (Featire specs)
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
=======
=======
            
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0f24a043 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
=======
=======
            
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> b8c2784f (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
            
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 392646b5 (Featire specs)
=======
=======
=======
=======
            
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price)
=======
=======
=======
              factory :order_book do
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
=======
=======
            
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
        8. 
        
        
      
        
        
          
      8. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                title { FFaker::Lorem.words(5) }
=======
            RSpec.describe 'Books', type: :feature do
>>>>>>> d0dc1f1 (Featire specs)
=======
            RSpec.describe 'Books', type: :feature do
>>>>>>> 752f0c0 (Featire specs)
=======
            RSpec.describe 'Books', type: :feature do
>>>>>>> 4e81ea2 (Featire specs)
=======
            RSpec.describe 'Books', type: :feature do
>>>>>>> 08edf50 (Featire specs)
=======
            RSpec.describe 'Books', type: :feature do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> c12b71de (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
>>>>>>> b904d7ae (Featire specs)
=======
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
=======
>>>>>>> ef483b6d (Fix)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
>>>>>>> bdc24a1a (Rebased)
=======
>>>>>>> 53db2224 (Featire specs)
=======
>>>>>>> 7b22ad7e (Featire specs)
=======
>>>>>>> b97bb382 (Featire specs)
=======
>>>>>>> 4a2f2ad8 (Featire specs)
=======
>>>>>>> 0f24a043 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 21873de0 (Featire specs)
=======
>>>>>>> b8c2784f (Fix book_spec decrease quantity and price)
=======
>>>>>>> 392646b5 (Featire specs)
=======
>>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1049b80c (Fix)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
>>>>>>> e055dd0 (Rebased)
=======
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 973ba8c (Featire specs)
=======
>>>>>>> 8181d13 (Featire specs)
=======
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 72b9cab (Featire specs)
=======
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 15c51b7 (Featire specs)
=======
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9e081dc (Fix)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d52f9efe (Featire specs)
=======
=======
>>>>>>> 53db2224 (Featire specs)
=======
>>>>>>> 7b22ad7e (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c12b71de (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
                title { FFaker::Lorem.words(5) }
=======
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5e31aeb (Featire specs)
=======
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 973ba8c (Featire specs)
=======
=======
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
=======
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
=======
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
=======
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
                title { FFaker::Lorem.words(5) }
=======
            RSpec.describe 'Books', type: :feature do
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
            RSpec.describe 'Books', type: :feature do
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
            RSpec.describe 'Books', type: :feature do
>>>>>>> 4e81ea2 (Featire specs)
=======
            RSpec.describe 'Books', type: :feature do
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
=======
            RSpec.describe 'Books', type: :feature do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
=======
=======
            RSpec.describe 'Books', type: :feature do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
            RSpec.describe 'Books', type: :feature do
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
            RSpec.describe 'Books', type: :feature do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
=======
=======
            RSpec.describe 'Books', type: :feature do
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b904d7ae (Featire specs)
=======
=======
=======
            RSpec.describe 'Books', type: :feature do
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
=======
=======
                order
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
>>>>>>> ef483b6d (Fix)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
            RSpec.describe 'Books', type: :feature do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 973ba8c (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
=======
            RSpec.describe 'Books', type: :feature do
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
            RSpec.describe 'Books', type: :feature do
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
=======
            RSpec.describe 'Books', type: :feature do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
            RSpec.describe 'Books', type: :feature do
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
=======
            RSpec.describe 'Books', type: :feature do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
                title { FFaker::Lorem.words(5) }
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5e31aeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 53db2224 (Featire specs)
=======
=======
=======
=======
            RSpec.describe 'Books', type: :feature do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
            RSpec.describe 'Books', type: :feature do
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
=======
=======
            RSpec.describe 'Books', type: :feature do
>>>>>>> 08edf50 (Featire specs)
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
=======
=======
            RSpec.describe 'Books', type: :feature do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0f24a043 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
=======
=======
            RSpec.describe 'Books', type: :feature do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> b8c2784f (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
            RSpec.describe 'Books', type: :feature do
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 392646b5 (Featire specs)
=======
=======
=======
=======
            RSpec.describe 'Books', type: :feature do
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price)
=======
=======
=======
                order
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
        9. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> ef483b6d (Fix)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
>>>>>>> bdc24a1a (Rebased)
=======
>>>>>>> 53db2224 (Featire specs)
=======
>>>>>>> 7b22ad7e (Featire specs)
=======
>>>>>>> b97bb382 (Featire specs)
=======
>>>>>>> 4a2f2ad8 (Featire specs)
=======
>>>>>>> 0f24a043 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 21873de0 (Featire specs)
=======
>>>>>>> b8c2784f (Fix book_spec decrease quantity and price)
=======
>>>>>>> 392646b5 (Featire specs)
=======
>>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1049b80c (Fix)
=======
>>>>>>> 2612be03 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
>>>>>>> e055dd0 (Rebased)
=======
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 973ba8c (Featire specs)
=======
>>>>>>> 8181d13 (Featire specs)
=======
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 72b9cab (Featire specs)
=======
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 15c51b7 (Featire specs)
=======
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9e081dc (Fix)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> e055dd0 (Rebased)
>>>>>>> bdc24a1a (Rebased)
          
      9. 
            1
=======
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 973ba8c (Featire specs)
=======
=======
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
=======
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
=======
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
=======
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
          
      10. 
            1
=======
          
      11. 
            5
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      12. 
            5
>>>>>>> 752f0c0 (Featire specs)
=======
          
      13. 
            5
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8181d13 (Featire specs)
=======
          
      14. 
            5
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
=======
          
      15. 
            5
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 72b9cab (Featire specs)
=======
          
      16. 
            5
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
=======
          
      17. 
            5
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 15c51b7 (Featire specs)
=======
          
      18. 
            5
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
=======
          
      19. 
            5
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      20. 
            1
>>>>>>> 5b7749a (Fix)
=======
>>>>>>> 973ba8c (Featire specs)
=======
>>>>>>> 8181d13 (Featire specs)
=======
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 72b9cab (Featire specs)
=======
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 15c51b7 (Featire specs)
=======
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 1d59aaa (Fix)
          
      21. 
            1
>>>>>>> 9e081dc (Fix)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                rating { FFaker::Number.rand(0..5) }
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 973ba8c (Featire specs)
=======
>>>>>>> 8181d13 (Featire specs)
=======
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 72b9cab (Featire specs)
=======
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 15c51b7 (Featire specs)
=======
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
                rating { FFaker::Number.rand(0..5) }
=======
              let(:category_one) { FactoryBot.create(:category) }
>>>>>>> d0dc1f1 (Featire specs)
=======
              let(:category_one) { FactoryBot.create(:category) }
>>>>>>> 752f0c0 (Featire specs)
=======
              let(:category_one) { FactoryBot.create(:category) }
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
              let(:category_one) { FactoryBot.create(:category) }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
              let(:category_one) { FactoryBot.create(:category) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
              let(:category_one) { FactoryBot.create(:category) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
              let(:category_one) { FactoryBot.create(:category) }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
              let(:category_one) { FactoryBot.create(:category) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
              let(:category_one) { FactoryBot.create(:category) }
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
              let(:category_one) { FactoryBot.create(:category) }
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 9e081dc (Fix)
                book
          
        22. 
        
        
      
        
        
          
      22. 
            5
            

            

                quantity { 1 }
          
        23. 
        
        
      
        
        
          
      23. 
            
            

            

              end
          
        24. 
        
        
      
        
        
          
      24. 
            
            

            

            end
          
        25. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/factories/orders.rb
      
    
      
      
  77.78%


      lines covered
    
      

    

    
      
      9 relevant lines.
      7 lines covered and
      2 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
<<<<<<< HEAD
=======
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
          
      2. 
            1
=======
          
      3. 
            5
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5e31aeb (Featire specs)
=======
=======
          
      4. 
            5
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 9e081dc (Fix)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9e081dc (Fix)
            FactoryBot.define do
          
        5. 
        
        
      
        
        
          
      5. 
            1
            

            

              factory :order do
          
        6. 
        
        
      
        
        
          
      6. 
            5
            

            

                status { 'created' }
          
        7. 
        
        
      
        
        
          
      7. 
            
            

            

            
<<<<<<< HEAD
=======
=======
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
                rating { FFaker::Number.rand(0..5) }
=======
              let(:category_one) { FactoryBot.create(:category) }
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5e31aeb (Featire specs)
=======
=======
              let(:category_one) { FactoryBot.create(:category) }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 973ba8c (Featire specs)
=======
=======
              let(:category_one) { FactoryBot.create(:category) }
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 8181d13 (Featire specs)
=======
=======
              let(:category_one) { FactoryBot.create(:category) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
=======
=======
              let(:category_one) { FactoryBot.create(:category) }
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 72b9cab (Featire specs)
=======
=======
              let(:category_one) { FactoryBot.create(:category) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
=======
=======
              let(:category_one) { FactoryBot.create(:category) }
>>>>>>> 4552227 (Featire specs)
>>>>>>> 15c51b7 (Featire specs)
=======
=======
              let(:category_one) { FactoryBot.create(:category) }
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
=======
          
        8. 
        
        
      
        
        
          
      8. 
            1
            

            

                transient do
          
        9. 
        
        
      
        
        
          
      9. 
            1
            

            

                  books_count { 1 }
          
        10. 
        
        
      
        
        
          
      10. 
            
            

            

                end
          
        11. 
        
        
      
        
        
          
      11. 
            
            

            

            
          
        12. 
        
        
      
        
        
          
      12. 
            1
            

            

                after :create do |order, books_count|
          
        13. 
        
        
      
        
        
          
      13. 
            4
            

            

                  order.books do
          
        14. 
        
        
      
        
        
          
      14. 
            
            

            

                    Array.new(books_count) do
          
        15. 
        
        
      
        
        
          
      15. 
            
            

            

                      association(:order, books: [instance])
          
        16. 
        
        
      
        
        
          
      16. 
            
            

            

                    end
          
        17. 
        
        
      
        
        
          
      17. 
            
            

            

                  end
          
        18. 
        
        
      
        
        
          
      18. 
            
            

            

                end
          
        19. 
        
        
      
        
        
          
      19. 
            
            

            

              end
          
        20. 
        
        
      
        
        
          
      20. 
            
            

            

            end
          
        21. 
        
        
      
    
      
  
      

      

      
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
        
      
  
      
    
      spec/factories/reviews.rb
      
=======
        
      
  
      
    
      spec/feature/book_spec.rb
      
>>>>>>> d0dc1f1 (Featire specs)
=======
        
      
  
      
    
      spec/feature/book_spec.rb
      
>>>>>>> 752f0c0 (Featire specs)
    
      
      
  100.0%


      lines covered
    
      

    

    
      
<<<<<<< HEAD
<<<<<<< HEAD
      5 relevant lines.
      5 lines covered and
=======
      105 relevant lines.
      105 lines covered and
>>>>>>> d0dc1f1 (Featire specs)
=======
      105 relevant lines.
      105 lines covered and
>>>>>>> 752f0c0 (Featire specs)
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
            FactoryBot.define do
=======
            require 'rails_helper'
>>>>>>> d0dc1f1 (Featire specs)
=======
            require 'rails_helper'
>>>>>>> 752f0c0 (Featire specs)
          
        2. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
          
      2. 
            1
=======
          
      3. 
            
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      4. 
            
>>>>>>> 752f0c0 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
              factory :review do
=======
            
>>>>>>> d0dc1f1 (Featire specs)
=======
            
>>>>>>> 752f0c0 (Featire specs)
          
        5. 
        
        
      
        
        
          
      5. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 2ee03d3 (Featire specs)
                title { FFaker::Lorem.words(5) }
=======
            RSpec.describe 'Books', type: :feature do
>>>>>>> d0dc1f1 (Featire specs)
=======
            RSpec.describe 'Books', type: :feature do
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
=======
            RSpec.describe 'Books', type: :feature do
>>>>>>> 4e81ea2 (Featire specs)
=======
            RSpec.describe 'Books', type: :feature do
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
          
        6. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
          
      6. 
            1
            

            

                rating { FFaker::Number.rand(0..5) }
>>>>>>> 9e081dc (Fix)
          
        7. 
        
        
      
        
        
          
      7. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                transient do
          
        8. 
        
        
      
        
        
          
      8. 
            1
            

            

                  books_count { 1 }
          
        9. 
        
        
      
        
        
          
      9. 
            
            

            

                end
          
        10. 
        
        
      
        
        
          
      10. 
            
            

            

            
          
        11. 
        
        
      
        
        
          
      11. 
            1
            

            

                after :create do |order, books_count|
          
        12. 
        
        
      
        
        
          
      12. 
            4
            

            

                  order.books do
          
        13. 
        
        
      
        
        
          
      13. 
            
            

            

                    Array.new(books_count) do
          
        14. 
        
        
      
        
        
          
      14. 
            
            

            

                      association(:order, books: [instance])
          
        15. 
        
        
      
        
        
          
      15. 
            
            

            

                    end
          
        16. 
        
        
      
        
        
          
      16. 
            
            

            

                  end
          
        17. 
        
        
      
        
        
          
      17. 
            
            

            

                end
          
        18. 
        
        
      
        
        
          
      18. 
            
            

            

              end
          
        19. 
        
        
      
        
        
          
      19. 
            
            

            

            end
          
        20. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/factories/reviews.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      5 relevant lines.
      5 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            FactoryBot.define do
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

              factory :review do
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

                title { FFaker::Lorem.words(5) }
          
        4. 
        
        
      
        
        
=======
>>>>>>> 6da9530 (Featire specs)
          
      4. 
            1
            

            

                rating { FFaker::Number.rand(0..5) }
<<<<<<< HEAD
>>>>>>> 5b7749a (Fix)
=======
>>>>>>> 6da9530 (Featire specs)
          
        5. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      5. 
            1
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      6. 
            1
=======
          
      7. 
            3
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      8. 
            3
>>>>>>> 752f0c0 (Featire specs)
=======
          
      9. 
            3
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      10. 
            3
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      11. 
            3
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
          
      12. 
            1
>>>>>>> 6da9530 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
=======
          
      13. 
            3
>>>>>>> 7a02bbe (Featire specs)
=======
          
      14. 
            3
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
          
      15. 
            3
>>>>>>> 4552227 (Featire specs)
=======
          
      16. 
            3
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
=======
          
      17. 
            1
>>>>>>> 5b7749a (Fix)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 5e31aeb (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 51bc18c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 973ba8c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9e081dc (Fix)
                body { FFaker::Lorem.words(500) }
          
        18. 
        
        
      
        
        
          
      18. 
            
            

            

              end
          
        19. 
        
        
      
        
        
          
      19. 
            
            

            

            end
          
        20. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/factories/shippings.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      8 relevant lines.
      8 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            FactoryBot.define do
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

              factory :shipping do
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

                user
          
        4. 
        
        
      
        
        
          
      4. 
            1
            

            

                address { FFaker::AddressUA.street_address }
          
        5. 
        
        
      
        
        
          
      5. 
            1
            

            

                city { FFaker::AddressUA.city }
          
        6. 
        
        
      
        
        
          
      6. 
            1
            

            

                zip { FFaker::AddressUA.zip_code }
          
        7. 
        
        
      
        
        
          
      7. 
            1
            

            

                country { FFaker::AddressUA.country }
          
        8. 
        
        
      
        
        
          
      8. 
            1
            

            

                phone { FFaker::PhoneNumberUA.home_phone_number }
          
        9. 
        
        
      
        
        
          
      9. 
            
            

            

              end
          
        10. 
        
        
      
        
        
          
      10. 
            
            

            

            end
          
        11. 
        
        
      
    
      
  
      

      

      
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9a49b7b (Rebased)
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
        
      
  
      
    
      spec/factories/users.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      5 relevant lines.
      5 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            FactoryBot.define do
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

              factory :user do
          
        3. 
        
        
      
        
        
          
      3. 
            17
            

            

                email { FFaker::Internet.email }
          
        4. 
        
        
      
        
        
          
      4. 
            24
            

            

                password { 'password' }
          
        5. 
        
        
      
        
        
          
      5. 
            24
            

            

                confirmed_at { Time.zone.now }
          
        6. 
        
        
      
        
        
          
      6. 
            
            

            

              end
          
        7. 
        
        
      
        
        
          
      7. 
            
            

            

            end
          
        8. 
        
        
      
    
      
  
      

      

      
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
        
      
>>>>>>> 9bfbd88 (Featire specs)
  
      
    
      spec/factories/reviews.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      5 relevant lines.
      5 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            FactoryBot.define do
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

              factory :review do
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

                title { FFaker::Lorem.words(5) }
          
        4. 
        
        
      
        
        
          
      4. 
            1
            

            

                rating { FFaker::Number.rand(0..5) }
          
        5. 
        
        
      
        
        
          
      5. 
            1
            

            

                body { FFaker::Lorem.words(500) }
          
        6. 
        
        
      
        
        
          
      6. 
            
            

            

              end
          
        7. 
        
        
      
        
        
          
      7. 
            
            

            

            end
          
        8. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/factories/shippings.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      8 relevant lines.
      8 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            FactoryBot.define do
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

              factory :shipping do
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

                user
          
        4. 
        
        
      
        
        
          
      4. 
            1
            

            

                address { FFaker::AddressUA.street_address }
          
        5. 
        
        
      
        
        
          
      5. 
            1
            

            

                city { FFaker::AddressUA.city }
          
        6. 
        
        
      
        
        
          
      6. 
            1
            

            

                zip { FFaker::AddressUA.zip_code }
          
        7. 
        
        
      
        
        
          
      7. 
            1
            

            

                country { FFaker::AddressUA.country }
          
        8. 
        
        
      
        
        
          
      8. 
            1
            

            

                phone { FFaker::PhoneNumberUA.home_phone_number }
          
        9. 
        
        
      
        
        
          
      9. 
            
            

            

              end
          
        10. 
        
        
      
        
        
          
      10. 
            
            

            

            end
          
        11. 
        
        
      
    
      
  
      

      

      
>>>>>>> aca90e3 (Rebased)
>>>>>>> c7a726c5 (Rebased)
        
      
  
      
    
      spec/factories/users.rb
      
<<<<<<< HEAD
=======
=======
=======
        
      
  
      
    
      spec/factories/users.rb
      
=======
=======
        
      
  
      
    
      spec/factories/users.rb
      
=======
=======
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
        
      
  
      
    
      spec/factories/reviews.rb
      
<<<<<<< HEAD
>>>>>>> 75fa7e1b (Rebased)
=======
=======
=======
>>>>>>> c51bf93 (Featire specs)
=======
>>>>>>> 730a8ca (Add login registration pages)
=======
=======
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
>>>>>>> 6fa625b (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 86d584a (Manifest_cache true)
=======
=======
>>>>>>> 9ec6862 (Add login registration pages)
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> cacbab9 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 7d58507 (Add login registration pages)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> cacbab9 (Add login registration pages)
>>>>>>> 56fd9d41 (Add login registration pages)
        
      
  
      
    
      spec/factories/reviews.rb
      
=======
<<<<<<< HEAD
=======
        
      
  
      
    
      spec/factories/users.rb
      
=======
<<<<<<< HEAD
=======
=======
        
      
  
      
    
      spec/factories/users.rb
      
=======
=======
        
      
  
      
    
      spec/factories/users.rb
      
=======
=======
>>>>>>> bf554f4 (Rebased)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
        
      
  
      
    
      spec/factories/reviews.rb
      
<<<<<<< HEAD
>>>>>>> 49e8a6c (Rebased)
=======
=======
=======
>>>>>>> 7375d4b (Manifest_cache true)
=======
>>>>>>> bae2b7de (Add login registration pages)
        
      
  
      
    
      spec/feature/book_spec.rb
      
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
=======
        
      
  
      
    
      spec/feature/book_spec.rb
      
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
        
      
  
      
    
      spec/feature/book_spec.rb
      
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> f182ac7 (Add login registration pages)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 57da3ff (Add login registration pages)
<<<<<<< HEAD
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> a624084 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e60833c (Add login registration pages)
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 64dceec (Manifest_cache true)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 6a9fede (Add login registration pages)
>>>>>>> f416f45 (Add login registration pages)
        
      
=======
        
      
>>>>>>> 7c4ea7f (Fix)
  
      
<<<<<<< HEAD
    
      spec/factories/reviews.rb
      
=======
=======
>>>>>>> 7375d4b (Manifest_cache true)
=======
        
      
  
      
    
      spec/factories/users.rb
      
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
        
      
  
      
    
      spec/factories/users.rb
      
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
=======
        
      
  
      
    
      spec/factories/users.rb
      
=======
=======
        
      
  
      
    
      spec/factories/users.rb
      
<<<<<<< HEAD
=======
    
      spec/factories/coupons.rb
      
>>>>>>> 5b7749a (Fix)
=======
=======
=======
=======
=======
>>>>>>> bf554f4 (Rebased)
        
      
  
      
    
      spec/factories/reviews.rb
      
>>>>>>> 11792758 (Rebased)
    
      
      
  100.0%


      lines covered
    
      

    

    
      
<<<<<<< HEAD
      2 relevant lines.
      2 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            FactoryBot.define do
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

              factory :user do
          
        3. 
        
        
      
        
        
          
      3. 
            
            

            

              end
          
        4. 
        
        
      
        
        
          
      4. 
            
            

            

            end
          
        5. 
        
        
      
    
      
  
      

      

      
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> 56fd9d41 (Add login registration pages)
        
      
  
      
    
      spec/feature/book_spec.rb
      
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 37e48018 (Featire specs)
=======
=======
        
      
  
      
    
      spec/feature/book_spec.rb
      
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
    
      
      
  100.0%


      lines covered
    
      

    

    
      
<<<<<<< HEAD
<<<<<<< HEAD
      6 relevant lines.
      6 lines covered and
=======
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
      2 relevant lines.
      2 lines covered and
=======
      105 relevant lines.
      105 lines covered and
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 37e48018 (Featire specs)
=======
=======
      105 relevant lines.
      105 lines covered and
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
            FactoryBot.define do
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

              factory :coupon do
          
        3. 
        
        
      
        
        
          
      3. 
            4
            

            

                code { SecureRandom.hex }
          
        4. 
        
        
      
        
        
          
      4. 
            4
            

            

                is_active { true }
          
        5. 
        
        
      
        
        
          
      5. 
            4
            

            

                active_till_date { FFaker::Time.datetime }
          
        6. 
        
        
      
        
        
          
      6. 
            1
            

            

                discount { rand(0..50) / 100 }
          
        7. 
        
        
      
        
        
          
      7. 
            
            

            

              end
          
        8. 
        
        
      
        
        
          
      8. 
            
            

            

            end
          
        9. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/factories/order_books.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
      2 relevant lines.
      2 lines covered and
=======
      105 relevant lines.
      105 lines covered and
>>>>>>> 4552227 (Featire specs)
=======
      105 relevant lines.
      105 lines covered and
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
            FactoryBot.define do
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

              factory :user do
          
        3. 
        
        
      
        
        
          
      3. 
            
            

            

              end
          
        4. 
        
        
      
        
        
          
      4. 
            
            

            

            end
          
        5. 
        
        
      
    
      
  
      

      

      
>>>>>>> e1f4d17 (Add login registration pages)
        
      
  
      
    
      spec/feature/book_spec.rb
      
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
        
      
  
      
    
      spec/feature/book_spec.rb
      
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
    
      
      
  100.0%


      lines covered
    
      

    

    
      
<<<<<<< HEAD
<<<<<<< HEAD
      2 relevant lines.
      2 lines covered and
=======
<<<<<<< HEAD
      2 relevant lines.
      2 lines covered and
=======
      105 relevant lines.
      105 lines covered and
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
      105 relevant lines.
      105 lines covered and
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
            FactoryBot.define do
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

              factory :user do
          
        3. 
        
        
      
        
        
          
      3. 
            
            

            

              end
          
        4. 
        
        
      
        
        
          
      4. 
            
            

            

            end
          
        5. 
        
        
      
    
      
  
      

      

      
>>>>>>> 730a8ca (Add login registration pages)
        
      
  
      
    
      spec/feature/book_spec.rb
      
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
    
      
      
  100.0%


      lines covered
    
      

    

    
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
      2 relevant lines.
      2 lines covered and
=======
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
      5 relevant lines.
      5 lines covered and
=======
      105 relevant lines.
      105 lines covered and
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
=======
      105 relevant lines.
      105 lines covered and
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
      105 relevant lines.
      105 lines covered and
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
      2 relevant lines.
      2 lines covered and
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
      2 relevant lines.
      2 lines covered and
=======
      105 relevant lines.
      105 lines covered and
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
      5 relevant lines.
      5 lines covered and
>>>>>>> 11792758 (Rebased)
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
            FactoryBot.define do
=======
            require 'rails_helper'
>>>>>>> d0dc1f1 (Featire specs)
=======
            require 'rails_helper'
>>>>>>> 752f0c0 (Featire specs)
=======
            require 'rails_helper'
>>>>>>> 4e81ea2 (Featire specs)
          
        2. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      2. 
            1
=======
          
      3. 
            
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      4. 
            
>>>>>>> 752f0c0 (Featire specs)
=======
          
      5. 
            
>>>>>>> 4e81ea2 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              factory :user do
          
        6. 
        
        
      
        
        
          
      6. 
            
            

            

              end
          
        7. 
        
        
      
        
        
          
      7. 
            
            

            

            end
          
        8. 
        
        
      
    
      
  
      

      

      
>>>>>>> e1f4d17 (Add login registration pages)
        
      
  
      
    
      spec/feature/book_spec.rb
      
>>>>>>> 7a02bbe (Featire specs)
=======
        
      
  
      
    
      spec/feature/book_spec.rb
      
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
    
      
      
  100.0%


      lines covered
    
      

    

    
      
<<<<<<< HEAD
<<<<<<< HEAD
      2 relevant lines.
      2 lines covered and
=======
      105 relevant lines.
      105 lines covered and
>>>>>>> 7a02bbe (Featire specs)
=======
      105 relevant lines.
      105 lines covered and
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 11792758 (Rebased)
            FactoryBot.define do
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

<<<<<<< HEAD
              factory :user do
          
        3. 
        
        
      
        
        
          
      3. 
            
            

            

              end
          
        4. 
        
        
      
        
        
          
      4. 
            
            

            

            end
          
        5. 
        
        
      
    
      
  
      

      

      
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> e5752db (Featire specs)
        
      
  
      
    
      spec/feature/book_spec.rb
      
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
=======
        
      
  
      
    
      spec/feature/book_spec.rb
      
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
    
      
      
  100.0%


      lines covered
    
      

    

    
      
<<<<<<< HEAD
<<<<<<< HEAD
      2 relevant lines.
      2 lines covered and
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
      5 relevant lines.
      5 lines covered and
=======
      105 relevant lines.
      105 lines covered and
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
=======
      105 relevant lines.
      105 lines covered and
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
            FactoryBot.define do
=======
            require 'rails_helper'
>>>>>>> d0dc1f1 (Featire specs)
=======
            require 'rails_helper'
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
=======
            require 'rails_helper'
>>>>>>> 4e81ea2 (Featire specs)
=======
            require 'rails_helper'
>>>>>>> 08edf50 (Featire specs)
=======
            require 'rails_helper'
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
            require 'rails_helper'
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 37e48018 (Featire specs)
=======
=======
            require 'rails_helper'
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
          
        2. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
          
      2. 
            1
=======
          
      3. 
            
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      4. 
            
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
=======
          
      5. 
            
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      6. 
            
>>>>>>> 08edf50 (Featire specs)
=======
          
      7. 
            
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      8. 
            
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 37e48018 (Featire specs)
=======
=======
          
      9. 
            
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              factory :review do
=======
            
>>>>>>> d0dc1f1 (Featire specs)
=======
            
>>>>>>> 752f0c0 (Featire specs)
=======
            
>>>>>>> 4e81ea2 (Featire specs)
=======
            
>>>>>>> 08edf50 (Featire specs)
=======
            
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
            
>>>>>>> 7a02bbe (Featire specs)
=======
            
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
              factory :review do
>>>>>>> 11792758 (Rebased)
          
        10. 
        
        
      
        
        
          
      10. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                title { FFaker::Lorem.words(5) }
=======
            RSpec.describe 'Books', type: :feature do
>>>>>>> d0dc1f1 (Featire specs)
=======
            RSpec.describe 'Books', type: :feature do
>>>>>>> 752f0c0 (Featire specs)
=======
            RSpec.describe 'Books', type: :feature do
>>>>>>> 4e81ea2 (Featire specs)
=======
            RSpec.describe 'Books', type: :feature do
>>>>>>> 08edf50 (Featire specs)
=======
            RSpec.describe 'Books', type: :feature do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
            RSpec.describe 'Books', type: :feature do
>>>>>>> 7a02bbe (Featire specs)
=======
            RSpec.describe 'Books', type: :feature do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
                title { FFaker::Lorem.words(5) }
>>>>>>> 11792758 (Rebased)
          
        11. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 11792758 (Rebased)
          
      11. 
            1
            

            

                rating { FFaker::Number.rand(0..5) }
          
        12. 
        
        
      
        
        
          
      12. 
            1
            

            

                body { FFaker::Lorem.words(500) }
          
        13. 
        
        
      
        
        
          
      13. 
            
            

            

              end
          
        14. 
        
        
      
        
        
          
      14. 
            
            

            

            end
          
        15. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/factories/shippings.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      8 relevant lines.
      8 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            FactoryBot.define do
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

              factory :shipping do
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

                user
          
        4. 
        
        
      
        
        
          
      4. 
            1
            

            

                address { FFaker::AddressUA.street_address }
          
        5. 
        
        
      
        
        
          
      5. 
            1
            

            

                city { FFaker::AddressUA.city }
          
        6. 
        
        
      
        
        
          
      6. 
            1
            

            

                zip { FFaker::AddressUA.zip_code }
          
        7. 
        
        
      
        
        
          
      7. 
            1
            

            

                country { FFaker::AddressUA.country }
          
        8. 
        
        
      
        
        
          
      8. 
            1
            

            

                phone { FFaker::PhoneNumberUA.home_phone_number }
          
        9. 
        
        
      
        
        
          
      9. 
            
            

            

              end
          
        10. 
        
        
      
        
        
          
      10. 
            
            

            

            end
          
        11. 
        
        
      
    
      
  
      

      

      
>>>>>>> c033601 (Rebased)
>>>>>>> 9a49b7b (Rebased)
        
      
  
      
    
      spec/factories/users.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      5 relevant lines.
      5 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            FactoryBot.define do
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

<<<<<<< HEAD
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 11792758 (Rebased)
              factory :user do
          
        3. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
          
      3. 
=======
          
      4. 
            1
=======
          
      5. 
            13
>>>>>>> 31d15e66 (Fix)
            

            

                email { FFaker::Internet.email }
          
        6. 
        
        
      
        
        
          
      6. 
            20
            

            

                password { 'password' }
          
        7. 
        
        
      
        
        
          
      7. 
            20
            

            

                confirmed_at { Time.zone.now }
          
        8. 
        
        
      
        
        
          
      8. 
>>>>>>> 11792758 (Rebased)
            
            

            

              end
          
        9. 
        
        
      
        
        
<<<<<<< HEAD
          
      9. 
=======
          
      10. 
>>>>>>> 11792758 (Rebased)
            
            

            

            end
          
        11. 
        
        
      
    
      
  
      

      

      
<<<<<<< HEAD
>>>>>>> 1214e1f (Add login registration pages)
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> e3e66f3 (Featire specs)
        
      
  
      
    
      spec/feature/book_spec.rb
      
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
        
      
  
      
    
      spec/feature/book_spec.rb
      
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
<<<<<<< HEAD
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
        
      
  
      
    
      spec/feature/book_spec.rb
      
>>>>>>> 4e81ea2 (Featire specs)
=======
        
      
  
      
    
      spec/feature/book_spec.rb
      
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
    
      
      
  100.0%


      lines covered
    
      

    

    
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
      2 relevant lines.
      2 lines covered and
=======
=======
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
>>>>>>> fc3774fd (Featire specs)
      5 relevant lines.
      5 lines covered and
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
      5 relevant lines.
      5 lines covered and
=======
      105 relevant lines.
      105 lines covered and
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
      105 relevant lines.
      105 lines covered and
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
<<<<<<< HEAD
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
      105 relevant lines.
      105 lines covered and
>>>>>>> 4e81ea2 (Featire specs)
=======
      105 relevant lines.
      105 lines covered and
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
      5 relevant lines.
      5 lines covered and
>>>>>>> 49e8a6c (Rebased)
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> 13fca83d (Rebased)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
      5 relevant lines.
      5 lines covered and
>>>>>>> 5b7749a (Fix)
>>>>>>> d9d85ca6 (Fix)
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
            FactoryBot.define do
=======
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
            FactoryBot.define do
=======
            require 'rails_helper'
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
=======
=======
            require 'rails_helper'
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
=======
<<<<<<< HEAD
=======
=======
=======
            require 'rails_helper'
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
            require 'rails_helper'
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
            require 'rails_helper'
>>>>>>> 4e81ea2 (Featire specs)
=======
            require 'rails_helper'
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
            require 'rails_helper'
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
            require 'rails_helper'
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
=======
=======
=======
            require 'rails_helper'
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
=======
            FactoryBot.define do
>>>>>>> 49e8a6c (Rebased)
>>>>>>> 311e9fa (Rebased)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
            require 'rails_helper'
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
            require 'rails_helper'
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
            require 'rails_helper'
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
            require 'rails_helper'
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
            FactoryBot.define do
>>>>>>> 5b7749a (Fix)
          
        2. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
          
      2. 
            1
=======
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      3. 
            1
=======
          
      4. 
            
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      5. 
            
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
            

            

<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      6. 
            
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      7. 
            
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      8. 
            
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      9. 
            
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
          
      10. 
            
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
          
      11. 
            1
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      12. 
            
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      13. 
            
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      14. 
            1
>>>>>>> 5b7749a (Fix)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
              factory :user do
          
        15. 
        
        
      
        
        
          
      15. 
            
            

            

              end
          
        16. 
        
        
      
        
        
          
      16. 
            
            

            

            end
          
        17. 
        
        
      
    
      
  
      

      

      
>>>>>>> e1f4d17 (Add login registration pages)
        
      
  
      
    
      spec/feature/book_spec.rb
      
>>>>>>> 7a02bbe (Featire specs)
=======
        
      
  
      
    
      spec/feature/book_spec.rb
      
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
    
      
      
  100.0%


      lines covered
    
      

    

    
      
<<<<<<< HEAD
<<<<<<< HEAD
      2 relevant lines.
      2 lines covered and
=======
      105 relevant lines.
      105 lines covered and
>>>>>>> 7a02bbe (Featire specs)
=======
      105 relevant lines.
      105 lines covered and
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
            FactoryBot.define do
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

              factory :user do
          
        3. 
        
        
      
        
        
          
      3. 
            
            

            

              end
          
        4. 
        
        
      
        
        
          
      4. 
            
            

            

            end
          
        5. 
        
        
      
    
      
  
      

      

      
>>>>>>> 730a8ca (Add login registration pages)
        
      
  
      
    
      spec/feature/book_spec.rb
      
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 8249ff3c (Add login registration pages)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
=======
=======
>>>>>>> e055dd0 (Rebased)
=======
>>>>>>> 0c57e4e (Fix)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> e18eb87 (Fix)
=======
=======
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> e055dd0 (Rebased)
=======
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 0c57e4e (Fix)
>>>>>>> 1214e1f (Add login registration pages)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 22ee41c (Add login registration pages)
        
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9bfbd88 (Featire specs)
  
      
    
      spec/factories/reviews.rb
      
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
=======
        
      
>>>>>>> c033601 (Rebased)
  
      
    
      spec/feature/admin/author_spec.rb
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9a49b7b (Rebased)
=======
    
      
=======
        
      
  
      
    
      spec/feature/admin/author_spec.rb
      
>>>>>>> e3e66f3 (Featire specs)
    
      
      
  100.0%


      lines covered
    
      

    

    
      
<<<<<<< HEAD
<<<<<<< HEAD
      5 relevant lines.
      5 lines covered and
=======
      31 relevant lines.
      31 lines covered and
>>>>>>> 9a49b7b (Rebased)
=======
      31 relevant lines.
      31 lines covered and
>>>>>>> e3e66f3 (Featire specs)
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
            FactoryBot.define do
=======
            RSpec.describe 'Author' do
>>>>>>> 9a49b7b (Rebased)
=======
            RSpec.describe 'Author' do
>>>>>>> e3e66f3 (Featire specs)
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
              factory :review do
=======
              include_context 'with api request authentication helper methods'
>>>>>>> 9a49b7b (Rebased)
=======
              include_context 'with api request authentication helper methods'
>>>>>>> e3e66f3 (Featire specs)
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
                title { FFaker::Lorem.words(5) }
=======
              include_context 'with api request global before and after hooks'
>>>>>>> 9a49b7b (Rebased)
=======
=======
            RSpec.describe 'Books', type: :feature do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
            RSpec.describe 'Books', type: :feature do
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
=======
=======
=======
            RSpec.describe 'Books', type: :feature do
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
            RSpec.describe 'Books', type: :feature do
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
=======
            RSpec.describe 'Books', type: :feature do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
            RSpec.describe 'Books', type: :feature do
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
=======
=======
=======
            RSpec.describe 'Books', type: :feature do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
=======
                title { FFaker::Lorem.words(5) }
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
=======
=======
=======
            RSpec.describe 'Books', type: :feature do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
=======
=======
            RSpec.describe 'Books', type: :feature do
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
          
        4. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
          
      4. 
            1
=======
          
      5. 
            5
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      6. 
            5
>>>>>>> 752f0c0 (Featire specs)
=======
          
      7. 
            5
>>>>>>> 4e81ea2 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                rating { FFaker::Number.rand(0..5) }
=======
              let(:category_one) { FactoryBot.create(:category) }
>>>>>>> d0dc1f1 (Featire specs)
=======
              let(:category_one) { FactoryBot.create(:category) }
>>>>>>> 752f0c0 (Featire specs)
=======
              let(:category_one) { FactoryBot.create(:category) }
>>>>>>> 4e81ea2 (Featire specs)
          
        8. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      8. 
            1
=======
          
      9. 
            3
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      10. 
            3
>>>>>>> 752f0c0 (Featire specs)
=======
          
      11. 
            3
>>>>>>> 4e81ea2 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5b7749a (Fix)
                body { FFaker::Lorem.words(500) }
          
        12. 
        
        
      
        
        
          
      12. 
            
            

            

              end
          
        13. 
        
        
      
        
        
          
      13. 
            
            

            

            end
          
        14. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/factories/shippings.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      8 relevant lines.
      8 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            FactoryBot.define do
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

              factory :shipping do
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

                user
          
        4. 
        
        
      
        
        
          
      4. 
            1
            

            

                address { FFaker::AddressUA.street_address }
          
        5. 
        
        
      
        
        
          
      5. 
            1
            

            

                city { FFaker::AddressUA.city }
          
        6. 
        
        
      
        
        
          
      6. 
            1
            

            

                zip { FFaker::AddressUA.zip_code }
          
        7. 
        
        
      
        
        
          
      7. 
            1
            

            

                country { FFaker::AddressUA.country }
          
        8. 
        
        
      
        
        
          
      8. 
            1
            

            

                phone { FFaker::PhoneNumberUA.home_phone_number }
          
        9. 
        
        
      
        
        
          
      9. 
            
            

            

              end
          
        10. 
        
        
      
        
        
          
      10. 
            
            

            

            end
          
        11. 
        
        
      
    
      
  
      

      

      
>>>>>>> aca90e3 (Rebased)
        
      
  
      
    
      spec/factories/users.rb
      
>>>>>>> 11792758 (Rebased)
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      5 relevant lines.
      5 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            FactoryBot.define do
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

              factory :user do
          
        3. 
        
        
      
        
        
          
      3. 
            17
            

            

                email { FFaker::Internet.email }
          
        4. 
        
        
      
        
        
          
      4. 
            24
            

            

                password { 'password' }
          
        5. 
        
        
      
        
        
          
      5. 
            24
            

            

                confirmed_at { Time.zone.now }
          
        6. 
        
        
      
        
        
          
      6. 
            
            

            

              end
          
        7. 
        
        
      
        
        
          
      7. 
            
            

            

            end
          
        8. 
        
        
      
    
      
  
      

      

      
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
=======
=======
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
=======
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 557c1b8 (Fix)
>>>>>>> 1214e1f (Add login registration pages)
        
      
=======
        
      
>>>>>>> aca90e3 (Rebased)
  
      
<<<<<<< HEAD
    
      spec/feature/book_spec.rb
      
>>>>>>> d0dc1f1 (Featire specs)
=======
        
      
  
      
    
      spec/feature/book_spec.rb
      
>>>>>>> 752f0c0 (Featire specs)
=======
        
      
  
      
    
      spec/feature/book_spec.rb
      
>>>>>>> 4e81ea2 (Featire specs)
=======
        
      
  
      
    
      spec/feature/book_spec.rb
      
>>>>>>> 08edf50 (Featire specs)
=======
    
      spec/feature/admin/author_spec.rb
      
<<<<<<< HEAD
>>>>>>> c7a726c5 (Rebased)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
    
      
=======
        
      
  
      
    
      spec/feature/admin/author_spec.rb
      
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 6da9530 (Featire specs)
    
      
=======
        
      
  
      
    
      spec/feature/admin/author_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 75fa7e1b (Rebased)
      5 relevant lines.
      5 lines covered and
=======
      31 relevant lines.
      31 lines covered and
>>>>>>> c7a726c5 (Rebased)
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

<<<<<<< HEAD
            FactoryBot.define do
<<<<<<< HEAD
=======
            require 'rails_helper'
>>>>>>> d0dc1f1 (Featire specs)
=======
            require 'rails_helper'
>>>>>>> 752f0c0 (Featire specs)
=======
            require 'rails_helper'
>>>>>>> 4e81ea2 (Featire specs)
=======
            require 'rails_helper'
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
=======
=======
            require 'rails_helper'
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
            require 'rails_helper'
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
            require 'rails_helper'
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 75fa7e1b (Rebased)
=======
            RSpec.describe 'Author' do
>>>>>>> c7a726c5 (Rebased)
          
        2. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
          
      2. 
            1
=======
          
      3. 
            
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      4. 
            
>>>>>>> 752f0c0 (Featire specs)
=======
          
      5. 
            
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      6. 
            
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
=======
=======
          
      7. 
            
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      8. 
            
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
          
      9. 
            
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
          
      10. 
            1
>>>>>>> 75fa7e1b (Rebased)
=======
          
      11. 
            1
>>>>>>> c7a726c5 (Rebased)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
              factory :review do
=======
            
>>>>>>> d0dc1f1 (Featire specs)
=======
            
>>>>>>> 752f0c0 (Featire specs)
=======
            
>>>>>>> 4e81ea2 (Featire specs)
=======
            
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
=======
=======
            
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
            
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
            
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
              factory :review do
>>>>>>> 75fa7e1b (Rebased)
=======
=======
>>>>>>> d8dd3b4a (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
              factory :review do
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
              factory :review do
=======
            
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
=======
            
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
            
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
=======
            
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
=======
            
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
            
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 4e81ea2 (Featire specs)
=======
            
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
            
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
            
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
=======
            
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
=======
              factory :review do
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> 13fca83d (Rebased)
=======
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376a (Featire specs)
=======
=======
=======
=======
            
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0ea (Featire specs)
=======
=======
=======
            
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888bf (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
=======
            
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 74240509 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
            
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a1a479e2 (Fix book_spec decrease quantity and price)
=======
=======
=======
            
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 393eff3b (Featire specs)
=======
=======
=======
            
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price)
=======
=======
              factory :order_book do
>>>>>>> 5b7749a (Fix)
>>>>>>> d9d85ca6 (Fix)
=======
              include_context 'with api request authentication helper methods'
>>>>>>> c7a726c5 (Rebased)
          
        12. 
        
        
      
        
        
          
      12. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
                title { FFaker::Lorem.words(5) }
=======
            RSpec.describe 'Books', type: :feature do
>>>>>>> d0dc1f1 (Featire specs)
=======
            RSpec.describe 'Books', type: :feature do
>>>>>>> 752f0c0 (Featire specs)
=======
            RSpec.describe 'Books', type: :feature do
>>>>>>> 4e81ea2 (Featire specs)
=======
            RSpec.describe 'Books', type: :feature do
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
=======
=======
            RSpec.describe 'Books', type: :feature do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
            RSpec.describe 'Books', type: :feature do
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
            RSpec.describe 'Books', type: :feature do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
                title { FFaker::Lorem.words(5) }
>>>>>>> 75fa7e1b (Rebased)
=======
=======
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 365d41ed (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 13fca83d (Rebased)
=======
>>>>>>> f136376a (Featire specs)
=======
>>>>>>> 1ca9c0ea (Featire specs)
=======
>>>>>>> 4bf888bf (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> 74240509 (Fix book_spec decrease quantity and price)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> a1a479e2 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 393eff3b (Featire specs)
=======
>>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d9d85ca6 (Fix)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376a (Featire specs)
=======
=======
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0ea (Featire specs)
=======
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> 4bf888bf (Featire specs)
                title { FFaker::Lorem.words(5) }
=======
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
                title { FFaker::Lorem.words(5) }
=======
            RSpec.describe 'Books', type: :feature do
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
            RSpec.describe 'Books', type: :feature do
>>>>>>> 752f0c0 (Featire specs)
=======
            RSpec.describe 'Books', type: :feature do
>>>>>>> 4e81ea2 (Featire specs)
=======
            RSpec.describe 'Books', type: :feature do
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
=======
            RSpec.describe 'Books', type: :feature do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 74240509 (Fix book_spec decrease quantity and price)
=======
=======
=======
            RSpec.describe 'Books', type: :feature do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
            RSpec.describe 'Books', type: :feature do
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
            RSpec.describe 'Books', type: :feature do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a1a479e2 (Fix book_spec decrease quantity and price)
=======
=======
=======
            RSpec.describe 'Books', type: :feature do
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 393eff3b (Featire specs)
=======
=======
=======
            RSpec.describe 'Books', type: :feature do
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price)
=======
=======
                order
>>>>>>> 5b7749a (Fix)
>>>>>>> d9d85ca6 (Fix)
=======
              include_context 'with api request global before and after hooks'
>>>>>>> c7a726c5 (Rebased)
          
        13. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 75fa7e1b (Rebased)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> d9d85ca6 (Fix)
=======
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84809242 (Featire specs)
          
      13. 
            1
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      14. 
            1
=======
          
      15. 
=======
>>>>>>> 84003439 (Featire specs)
=======
=======
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> 9a49b7b (Rebased)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
          
      16. 
            
            

            

            
          
        17. 
        
        
      
        
        
          
      17. 
            2
            

            

              let(:first_name) { FFaker::Name.first_name }
          
        18. 
        
        
      
        
        
          
      18. 
            2
            

            

              let(:last_name) { FFaker::Name.last_name }
          
        19. 
        
        
      
        
        
          
      19. 
            
            

            

            
          
        20. 
        
        
      
        
        
          
      20. 
            2
            

            

              let(:new_name) { FFaker::Name.first_name }
          
        21. 
        
        
      
        
        
          
      21. 
            2
            

            

              let(:old_name) { author.first_name }
          
        22. 
        
        
      
        
        
          
      22. 
            
            

            

            
          
        23. 
        
        
      
        
        
          
      23. 
            4
            

            

              let(:author) { create(:author) }
          
        24. 
        
        
      
        
        
          
      24. 
            
            

            

            
          
        25. 
        
        
      
        
        
          
      25. 
            1
            

            

              before do
          
        26. 
        
        
      
        
        
          
      26. 
            4
            

            

                sign_in(create(:admin_user), :admin_user)
          
        27. 
        
        
      
        
        
          
      27. 
            
            

            

              end
          
        28. 
        
        
      
        
        
          
      28. 
            
            

            

            
          
        29. 
        
        
      
        
        
          
      29. 
            1
            

            

              it 'can create an author' do
          
        30. 
        
        
      
        
        
          
      30. 
            1
            

            

                visit 'admin/authors'
          
        31. 
        
        
      
        
        
          
      31. 
            
            

            

            
          
        32. 
        
        
      
        
        
          
      32. 
            1
            

            

                click_link('New Author')
          
        33. 
        
        
      
        
        
          
      33. 
            
            

            

            
          
        34. 
        
        
      
        
        
          
      34. 
            1
            

            

                fill_in 'author[first_name]', with: first_name
          
        35. 
        
        
      
        
        
          
      35. 
            1
            

            

                fill_in 'author[last_name]', with: last_name
          
        36. 
        
        
      
        
        
          
      36. 
            
            

            

            
          
        37. 
        
        
      
        
        
          
      37. 
            2
            

            

                expect { click_button('Create Author') }.to change(Author, :count).from(0).to(1)
          
        38. 
        
        
      
        
        
          
      38. 
            
            

            

              end
          
        39. 
        
        
      
        
        
          
      39. 
            
            

            

            
          
        40. 
        
        
      
        
        
          
      40. 
            1
            

            

              it 'can delete an author' do
          
        41. 
        
        
      
        
        
          
      41. 
            1
            

            

                author
          
        42. 
        
        
      
        
        
          
      42. 
            
            

            

            
          
        43. 
        
        
      
        
        
          
      43. 
            1
            

            

                visit 'admin/authors'
          
        44. 
        
        
      
        
        
          
      44. 
            
            

            

            
          
        45. 
        
        
      
        
        
          
      45. 
            2
            

            

                expect { click_link('Delete') }.to change(Author, :count).from(1).to(0)
          
        46. 
        
        
      
        
        
          
      46. 
            
            

            

              end
          
        47. 
        
        
      
        
        
          
      47. 
            
            

            

            
          
        48. 
        
        
      
        
        
          
      48. 
            1
            

            

              it 'can view an author' do
          
        49. 
        
        
      
        
        
          
      49. 
            1
            

            

                author
          
        50. 
        
        
      
        
        
          
      50. 
            
            

            

            
          
        51. 
        
        
      
        
        
          
      51. 
            1
            

            

                visit 'admin/authors'
          
        52. 
        
        
      
        
        
          
      52. 
            
            

            

            
          
        53. 
        
        
      
        
        
          
      53. 
            1
            

            

                click_link('View')
          
        54. 
        
        
      
        
        
          
      54. 
            
            

            

            
          
        55. 
        
        
      
        
        
          
      55. 
            1
            

            

                expect(page).to have_content(author.first_name)
          
        56. 
        
        
      
        
        
          
      56. 
            
            

            

              end
          
        57. 
        
        
      
        
        
          
      57. 
            
            

            

            
          
        58. 
        
        
      
        
        
          
      58. 
            1
            

            

              it 'can edit an author' do
          
        59. 
        
        
      
        
        
          
      59. 
            1
            

            

                author
          
        60. 
        
        
      
        
        
          
      60. 
            
            

            

            
          
        61. 
        
        
      
        
        
          
      61. 
            1
            

            

                visit 'admin/authors'
          
        62. 
        
        
      
        
        
          
      62. 
            
            

            

            
          
        63. 
        
        
      
        
        
          
      63. 
            1
            

            

                click_link('Edit')
          
        64. 
        
        
      
        
        
          
      64. 
            
            

            

            
          
        65. 
        
        
      
        
        
          
      65. 
            1
            

            

                fill_in 'author[first_name]', with: new_name
          
        66. 
        
        
      
        
        
          
      66. 
            
            

            

            
          
        67. 
        
        
      
        
        
          
      67. 
            4
            

            

                expect { click_button('Update Author') }.to change { author.reload.first_name }.from(old_name).to(new_name)
          
        68. 
        
        
      
        
        
          
      68. 
            
            

            

              end
          
        69. 
        
        
      
        
        
          
      69. 
            
            

            

            end
          
        70. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/feature/admin/book_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      43 relevant lines.
      43 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            RSpec.describe 'Book' do
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

              include_context 'with api request authentication helper methods'
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

              include_context 'with api request global before and after hooks'
          
        4. 
        
        
      
        
        
          
      4. 
            
            

            

            
          
        5. 
        
        
      
        
        
          
      5. 
            7
            

            

              let(:book) { create(:book) }
<<<<<<< HEAD
=======
=======
              let(:category_two) { FactoryBot.create(:category) }
>>>>>>> d0dc1f1 (Featire specs)
=======
              let(:category_two) { FactoryBot.create(:category) }
>>>>>>> 752f0c0 (Featire specs)
=======
              let(:category_two) { FactoryBot.create(:category) }
>>>>>>> 4e81ea2 (Featire specs)
=======
              let(:category_two) { FactoryBot.create(:category) }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
              let(:category_two) { FactoryBot.create(:category) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
              include_context 'with api request global before and after hooks'
          
        6. 
        
        
      
        
        
          
      6. 
            
            

            

            
          
        7. 
        
        
      
        
        
          
      7. 
            2
            

            

              let(:first_name) { FFaker::Name.first_name }
          
        8. 
        
        
      
        
        
          
      8. 
            2
            

            

              let(:last_name) { FFaker::Name.last_name }
          
        9. 
        
        
      
        
        
          
      9. 
            
            

            

            
          
        10. 
        
        
      
        
        
          
      10. 
            2
            

            

              let(:new_name) { FFaker::Name.first_name }
          
        11. 
        
        
      
        
        
          
      11. 
            2
            

            

              let(:old_name) { author.first_name }
          
        12. 
        
        
      
        
        
          
      12. 
            
            

            

            
          
        13. 
        
        
      
        
        
          
      13. 
            4
            

            

              let(:author) { create(:author) }
          
        14. 
        
        
      
        
        
          
      14. 
            
            

            

            
          
        15. 
        
        
      
        
        
          
      15. 
            1
            

            

              before do
          
        16. 
        
        
      
        
        
          
      16. 
            4
            

            

                sign_in(create(:admin_user), :admin_user)
          
        17. 
        
        
      
        
        
          
      17. 
            
            

            

              end
          
        18. 
        
        
      
        
        
          
      18. 
            
            

            

            
          
        19. 
        
        
      
        
        
          
      19. 
            1
            

            

              it 'can create an author' do
          
        20. 
        
        
      
        
        
          
      20. 
            1
            

            

                visit 'admin/authors'
          
        21. 
        
        
      
        
        
          
      21. 
            
            

            

            
          
        22. 
        
        
      
        
        
          
      22. 
            1
            

            

                click_link('New Author')
          
        23. 
        
        
      
        
        
          
      23. 
            
            

            

            
          
        24. 
        
        
      
        
        
          
      24. 
            1
            

            

                fill_in 'author[first_name]', with: first_name
          
        25. 
        
        
      
        
        
          
      25. 
            1
            

            

                fill_in 'author[last_name]', with: last_name
          
        26. 
        
        
      
        
        
          
      26. 
            
            

            

            
          
        27. 
        
        
      
        
        
          
      27. 
            2
            

            

                expect { click_button('Create Author') }.to change(Author, :count).from(0).to(1)
          
        28. 
        
        
      
        
        
          
      28. 
            
            

            

              end
          
        29. 
        
        
      
        
        
          
      29. 
            
            

            

            
          
        30. 
        
        
      
        
        
          
      30. 
            1
            

            

              it 'can delete an author' do
          
        31. 
        
        
      
        
        
          
      31. 
            1
            

            

                author
          
        32. 
        
        
      
        
        
          
      32. 
            
            

            

            
          
        33. 
        
        
      
        
        
          
      33. 
            1
            

            

                visit 'admin/authors'
          
        34. 
        
        
      
        
        
          
      34. 
            
            

            

            
          
        35. 
        
        
      
        
        
          
      35. 
            2
            

            

                expect { click_link('Delete') }.to change(Author, :count).from(1).to(0)
          
        36. 
        
        
      
        
        
          
      36. 
            
            

            

              end
          
        37. 
        
        
      
        
        
          
      37. 
            
            

            

            
          
        38. 
        
        
      
        
        
          
      38. 
            1
            

            

              it 'can view an author' do
          
        39. 
        
        
      
        
        
          
      39. 
            1
            

            

                author
          
        40. 
        
        
      
        
        
          
      40. 
            
            

            

            
          
        41. 
        
        
      
        
        
          
      41. 
            1
            

            

                visit 'admin/authors'
          
        42. 
        
        
      
        
        
          
      42. 
            
            

            

            
          
        43. 
        
        
      
        
        
          
      43. 
            1
            

            

                click_link('View')
          
        44. 
        
        
      
        
        
          
      44. 
            
            

            

            
          
        45. 
        
        
      
        
        
          
      45. 
            1
            

            

                expect(page).to have_content(author.first_name)
          
        46. 
        
        
      
        
        
          
      46. 
            
            

            

              end
          
        47. 
        
        
      
        
        
          
      47. 
            
            

            

            
          
        48. 
        
        
      
        
        
          
      48. 
            1
            

            

              it 'can edit an author' do
          
        49. 
        
        
      
        
        
          
      49. 
            1
            

            

                author
          
        50. 
        
        
      
        
        
          
      50. 
            
            

            

            
          
        51. 
        
        
      
        
        
          
      51. 
            1
            

            

                visit 'admin/authors'
          
        52. 
        
        
      
        
        
          
      52. 
            
            

            

            
          
        53. 
        
        
      
        
        
          
      53. 
            1
            

            

                click_link('Edit')
          
        54. 
        
        
      
        
        
          
      54. 
            
            

            

            
          
        55. 
        
        
      
        
        
          
      55. 
            1
            

            

                fill_in 'author[first_name]', with: new_name
          
        56. 
        
        
      
        
        
          
      56. 
            
            

            

            
          
        57. 
        
        
      
        
        
          
      57. 
            4
            

            

                expect { click_button('Update Author') }.to change { author.reload.first_name }.from(old_name).to(new_name)
          
        58. 
        
        
      
        
        
          
      58. 
            
            

            

              end
          
        59. 
        
        
      
        
        
          
      59. 
            
            

            

            end
          
        60. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/feature/admin/book_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      43 relevant lines.
      43 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            RSpec.describe 'Book' do
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

              include_context 'with api request authentication helper methods'
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

              include_context 'with api request global before and after hooks'
          
        4. 
        
        
      
        
        
          
      4. 
            
            

            

            
          
        5. 
        
        
      
        
        
          
      5. 
            7
            

            

              let(:book) { create(:book) }
<<<<<<< HEAD
=======
              let(:category_two) { FactoryBot.create(:category) }
>>>>>>> d0dc1f1 (Featire specs)
=======
              let(:category_two) { FactoryBot.create(:category) }
>>>>>>> 752f0c0 (Featire specs)
=======
              let(:category_two) { FactoryBot.create(:category) }
>>>>>>> 4e81ea2 (Featire specs)
=======
              let(:category_two) { FactoryBot.create(:category) }
>>>>>>> 08edf50 (Featire specs)
=======
              let(:category_two) { FactoryBot.create(:category) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
              let(:category_two) { FactoryBot.create(:category) }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
              let(:category_two) { FactoryBot.create(:category) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
              let(:category_two) { FactoryBot.create(:category) }
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
              let(:category_two) { FactoryBot.create(:category) }
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
          
        6. 
        
        
      
        
        
          
      6. 
            1
            

            

              let(:params) do
          
        7. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      7. 
            1
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      8. 
            1
=======
          
      9. 
            4
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      10. 
            4
>>>>>>> 752f0c0 (Featire specs)
=======
          
      11. 
            4
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      12. 
            4
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      13. 
            4
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      14. 
            4
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      15. 
            4
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      16. 
            4
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      17. 
            4
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      18. 
            1
>>>>>>> 5b7749a (Fix)
            

            

                { title: FFaker::Book.title,
          
        19. 
        
        
      
        
        
          
      19. 
            
            

            

                  description: FFaker::Book.description,
          
        20. 
        
        
      
        
        
          
      20. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                  price_cents: FFaker::Number.rand(1..100),
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                  price_cents: FFaker::Number.rand(1..100),
=======
                  price: FFaker::Number.rand(1..100),
>>>>>>> d0dc1f1 (Featire specs)
=======
                  price: FFaker::Number.rand(1..100),
>>>>>>> 752f0c0 (Featire specs)
=======
                  price: FFaker::Number.rand(1..100),
>>>>>>> 4e81ea2 (Featire specs)
=======
                  price: FFaker::Number.rand(1..100),
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                  price: FFaker::Number.rand(1..100),
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
                  price: FFaker::Number.rand(1..100),
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  price: FFaker::Number.rand(1..100),
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                  price: FFaker::Number.rand(1..100),
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
                  price: FFaker::Number.rand(1..100),
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
                  price: FFaker::Number.rand(1..100),
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
                  price_cents: FFaker::Number.rand(1..100),
>>>>>>> 5b7749a (Fix)
          
        21. 
        
        
      
        
        
          
      21. 
            
            

            

                  dimensions: FFaker::Book.cover,
          
        22. 
        
        
      
        
        
          
      22. 
            
            

            

                  year_of_publication: FFaker::Number.rand(1900..2022),
          
        23. 
        
        
      
        
        
          
      23. 
            
            

            

                  materials: 'Soft cover',
          
        24. 
        
        
      
        
        
          
      24. 
            
            

            

                  quantity: FFaker::Number.rand(2..5) }
          
        25. 
        
        
      
        
        
          
      25. 
            
            

            

              end
          
        26. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
          
      26. 
            
            

            

            
          
        27. 
        
        
      
        
        
          
      27. 
            1
            

            

              before do
          
        28. 
        
        
      
        
        
          
      28. 
            6
            

            

                sign_in(create(:admin_user), :admin_user)
          
        29. 
        
        
      
        
        
          
      29. 
            
            

            

            
          
        30. 
        
        
      
        
        
          
      30. 
            6
            

            

                book
          
        31. 
        
        
      
        
        
          
      31. 
            
            

            

            
          
        32. 
        
        
      
        
        
          
      32. 
            6
            

            

                visit 'admin/books'
          
        33. 
        
        
      
        
        
          
      33. 
            
            

            

              end
          
        34. 
        
        
      
        
        
          
      34. 
            
            

            

            
          
        35. 
        
        
      
        
        
          
      35. 
            1
            

            

              it 'can create an book' do
          
        36. 
        
        
      
        
        
          
      36. 
            1
            

            

                click_link('New Book')
          
        37. 
        
        
      
        
        
          
      37. 
            
            

            

            
          
        38. 
        
        
      
        
        
          
      38. 
            1
            

            

                fill_in 'book[title]', with: params[:title]
          
        39. 
        
        
      
        
        
          
      39. 
            1
            

            

                fill_in 'book[description]', with: params[:description]
          
        40. 
        
        
      
        
        
          
      40. 
            1
            

            

                fill_in 'book[year_of_publication]', with: params[:year_of_publication]
          
        41. 
        
        
      
        
        
          
      41. 
            1
            

            

                fill_in 'book[price_cents]', with: params[:price_cents]
          
        42. 
        
        
      
        
        
          
      42. 
            1
            

            

                fill_in 'book[materials]', with: params[:materials]
          
        43. 
        
        
      
        
        
          
      43. 
            1
            

            

                fill_in 'book[dimensions]', with: params[:dimensions]
          
        44. 
        
        
      
        
        
          
      44. 
            1
            

            

                fill_in 'book[quantity]', with: params[:quantity]
          
        45. 
        
        
      
        
        
          
      45. 
            
            

            

            
          
        46. 
        
        
      
        
        
          
      46. 
            1
            

            

                click_button('Create Book')
          
        47. 
        
        
      
        
        
          
      47. 
            
            

            

            
          
        48. 
        
        
      
        
        
          
      48. 
            1
            

            

                expect(page).to have_content(params[:title])
          
        49. 
        
        
      
        
        
          
      49. 
            
            

            

              end
          
        50. 
        
        
      
        
        
          
      50. 
            
            

            

            
          
        51. 
        
        
      
        
        
          
      51. 
            1
            

            

              it 'can delete an book' do
          
        52. 
        
        
      
        
        
          
      52. 
            1
            

            

                click_link('Delete')
          
        53. 
        
        
      
        
        
          
      53. 
            
            

            

            
          
        54. 
        
        
      
        
        
          
      54. 
            1
            

            

                expect(page).not_to have_content(book.title)
          
        55. 
        
        
      
        
        
          
      55. 
            
            

            

              end
          
        56. 
        
        
      
        
        
          
      56. 
            
            

            

            
          
        57. 
        
        
      
        
        
          
      57. 
            1
            

            

              it 'can view an book' do
          
        58. 
        
        
      
        
        
          
      58. 
            1
            

            

                click_link('View')
          
        59. 
        
        
      
        
        
          
      59. 
            
            

            

            
          
        60. 
        
        
      
        
        
          
      60. 
            1
            

            

                expect(page).to have_content(book.title)
          
        61. 
        
        
      
        
        
          
      61. 
            
            

            

              end
          
        62. 
        
        
      
        
        
          
      62. 
            
            

            

            
          
        63. 
        
        
      
        
        
          
      63. 
            1
            

            

              it 'can edit an book' do
          
        64. 
        
        
      
        
        
          
      64. 
            1
            

            

                click_link('Edit')
          
        65. 
        
        
      
        
        
          
      65. 
            
            

            

            
          
        66. 
        
        
      
        
        
          
      66. 
            1
            

            

                fill_in 'book[title]', with: 'New title'
          
        67. 
        
        
      
        
        
          
      67. 
            
            

            

            
          
        68. 
        
        
      
        
        
          
      68. 
            1
            

            

                click_button('Update Book')
          
        69. 
        
        
      
        
        
          
      69. 
            
            

            

            
          
        70. 
        
        
      
        
        
          
      70. 
            1
            

            

                expect(page).to have_content('New title')
          
        71. 
        
        
      
        
        
          
      71. 
            
            

            

              end
          
        72. 
        
        
      
        
        
          
      72. 
            
            

            

            
          
        73. 
        
        
      
        
        
          
      73. 
            1
            

            

              context 'when image' do
          
        74. 
        
        
      
        
        
          
      74. 
            1
            

            

                before do
          
        75. 
        
        
      
        
        
          
      75. 
            2
            

            

                  click_link('Edit')
          
        76. 
        
        
      
        
        
          
      76. 
            
            

            

            
          
        77. 
        
        
      
        
        
          
      77. 
            2
            

            

                  page.attach_file('book[images][]', './app/assets/images/Web-Book-Cover.png')
          
        78. 
        
        
      
        
        
          
      78. 
            
            

            

            
          
        79. 
        
        
      
        
        
          
      79. 
            2
            

            

                  click_on 'Update Book'
          
        80. 
        
        
      
        
        
          
      80. 
            
            

            

                end
          
        81. 
        
        
      
        
        
          
      81. 
            
            

            

            
          
        82. 
        
        
      
        
        
          
      82. 
            1
            

            

                it 'can add images to book' do
          
        83. 
        
        
      
        
        
          
      83. 
            1
            

            

                  expect(book.reload.images.count).to eq(1)
          
        84. 
        
        
      
        
        
          
      84. 
            
            

            

                end
          
        85. 
        
        
      
        
        
          
      85. 
            
            

            

            
          
        86. 
        
        
      
        
        
          
      86. 
            1
            

            

                it 'can delete images from book' do
          
        87. 
        
        
      
        
        
          
      87. 
            1
            

            

                  click_link('Edit')
          
        88. 
        
        
      
        
        
          
      88. 
            
            

            

            
          
        89. 
        
        
      
        
        
          
      89. 
            1
            

            

                  click_link('Delete')
          
        90. 
        
        
      
        
        
          
      90. 
            
            

            

            
          
        91. 
        
        
      
        
        
          
      91. 
            1
            

            

                  expect(book.reload.images.count).to eq(0)
          
        92. 
        
        
      
        
        
          
      92. 
            
            

            

                end
          
        93. 
        
        
      
        
        
          
      93. 
            
            

            

              end
          
        94. 
        
        
      
        
        
          
      94. 
            
            

            

            end
          
        95. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/feature/admin/category_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      25 relevant lines.
      25 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            RSpec.describe 'Category' do
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

              include_context 'with api request authentication helper methods'
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

              include_context 'with api request global before and after hooks'
          
        4. 
        
        
      
        
        
          
      4. 
            
            

            

            
          
        5. 
        
        
      
        
        
          
      5. 
            2
            

            

              let(:category_name) { FFaker::Book.genre }
          
        6. 
        
        
      
        
        
          
      6. 
            
            

            

            
          
        7. 
        
        
      
        
        
          
      7. 
            5
            

            

              let(:category) { create(:category) }
          
        8. 
        
        
      
        
        
          
      8. 
            
            

            

            
          
        9. 
        
        
      
        
        
          
      9. 
            1
            

            

              before do
          
        10. 
        
        
      
        
        
          
      10. 
            4
            

            

                sign_in(create(:admin_user), :admin_user)
          
        11. 
        
        
      
        
        
          
      11. 
            
            

            

            
          
        12. 
        
        
      
        
        
          
      12. 
            4
            

            

                category
          
        13. 
        
        
      
        
        
          
      13. 
            
            

            

            
          
        14. 
        
        
      
        
        
          
      14. 
            4
            

            

                visit 'admin/categories'
          
        15. 
        
        
      
        
        
          
      15. 
            
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      16. 
            7
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      17. 
            7
>>>>>>> 752f0c0 (Featire specs)
=======
          
      18. 
            7
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      19. 
            7
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      20. 
            7
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      21. 
            7
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      22. 
            7
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      23. 
            7
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      24. 
            7
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              end
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              end
=======
              let(:book) { FactoryBot.create(:book) }
>>>>>>> d0dc1f1 (Featire specs)
=======
              let(:book) { FactoryBot.create(:book) }
>>>>>>> 752f0c0 (Featire specs)
=======
              let(:book) { FactoryBot.create(:book) }
>>>>>>> 4e81ea2 (Featire specs)
=======
              let(:book) { FactoryBot.create(:book) }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
              let(:book) { FactoryBot.create(:book) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
              let(:book) { FactoryBot.create(:book) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
              let(:book) { FactoryBot.create(:book) }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
              let(:book) { FactoryBot.create(:book) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
              let(:book) { FactoryBot.create(:book) }
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
              let(:book) { FactoryBot.create(:book) }
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
              end
>>>>>>> 5b7749a (Fix)
          
        25. 
        
        
      
        
        
          
      25. 
            
            

            

            
          
        26. 
        
        
      
        
        
          
      26. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              it 'can create an category' do
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              it 'can create an category' do
=======
              describe '#show book' do
>>>>>>> d0dc1f1 (Featire specs)
=======
              describe '#show book' do
>>>>>>> 752f0c0 (Featire specs)
=======
              describe '#show book' do
>>>>>>> 4e81ea2 (Featire specs)
=======
              describe '#show book' do
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
              describe '#show book' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
              describe '#show book' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
              describe '#show book' do
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
              describe '#show book' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
              describe '#show book' do
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
              describe '#show book' do
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
              it 'can create an category' do
>>>>>>> 5b7749a (Fix)
          
        27. 
        
        
      
        
        
          
      27. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                click_link('New Category')
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                click_link('New Category')
=======
                it 'show books info' do
>>>>>>> d0dc1f1 (Featire specs)
=======
                it 'show books info' do
>>>>>>> 752f0c0 (Featire specs)
=======
                it 'show books info' do
>>>>>>> 4e81ea2 (Featire specs)
=======
                it 'show books info' do
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                it 'show books info' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
                it 'show books info' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                it 'show books info' do
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                it 'show books info' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
                it 'show books info' do
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
                it 'show books info' do
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
                click_link('New Category')
>>>>>>> 5b7749a (Fix)
          
        28. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      28. 
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      29. 
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      30. 
            1
            

            

                  visit "books/#{book.id}"
          
        31. 
        
        
      
        
        
          
      31. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      32. 
>>>>>>> 5b7749a (Fix)
            
            

            

            
          
        33. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      33. 
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      34. 
=======
          
      35. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      36. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
      37. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      38. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      39. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      40. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      41. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      42. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      43. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      44. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      45. 
>>>>>>> 5b7749a (Fix)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                fill_in 'category[name]', with: category_name
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                fill_in 'category[name]', with: category_name
=======
                  expect(page).to have_content(book.title)
>>>>>>> d0dc1f1 (Featire specs)
=======
                  expect(page).to have_content(book.title)
>>>>>>> 752f0c0 (Featire specs)
=======
                  expect(page).to have_content(book.title)
>>>>>>> 4e81ea2 (Featire specs)
=======
                  expect(page).to have_content(book.title)
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                  expect(page).to have_content(book.title)
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
                  expect(page).to have_content(book.title)
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  expect(page).to have_content(book.title)
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                  expect(page).to have_content(book.title)
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
                  expect(page).to have_content(book.title)
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
                  expect(page).to have_content(book.title)
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
                fill_in 'category[name]', with: category_name
>>>>>>> 5b7749a (Fix)
          
        46. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      46. 
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      47. 
=======
          
      48. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      49. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
      50. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      51. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      52. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      53. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      54. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      55. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      56. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      57. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      58. 
>>>>>>> 5b7749a (Fix)
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
            
          
        59. 
        
        
      
        
        
          
      59. 
            1
            

            

                click_button('Create Category')
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
                end
>>>>>>> d0dc1f1 (Featire specs)
=======
                end
>>>>>>> 752f0c0 (Featire specs)
=======
                end
>>>>>>> 4e81ea2 (Featire specs)
=======
                end
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                end
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
                end
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                end
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                end
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
                end
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
                end
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
          
        60. 
        
        
      
        
        
          
      60. 
            
            

            

            
          
        61. 
        
        
      
        
        
          
      61. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                expect(page).to have_content(category_name)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                expect(page).to have_content(category_name)
=======
                it 'clicked Beck to results' do
>>>>>>> d0dc1f1 (Featire specs)
=======
                it 'clicked Beck to results' do
>>>>>>> 752f0c0 (Featire specs)
=======
                it 'clicked Beck to results' do
>>>>>>> 4e81ea2 (Featire specs)
=======
                it 'clicked Beck to results' do
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                it 'clicked Beck to results' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
                it 'clicked Beck to results' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                it 'clicked Beck to results' do
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                it 'clicked Beck to results' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
                it 'clicked Beck to results' do
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
                it 'clicked Beck to results' do
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
                expect(page).to have_content(category_name)
>>>>>>> 5b7749a (Fix)
          
        62. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      62. 
            
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      63. 
            
=======
          
      64. 
            1
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      65. 
            1
>>>>>>> 752f0c0 (Featire specs)
=======
          
      66. 
            1
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      67. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      68. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      69. 
            1
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      70. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      71. 
            1
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      72. 
            1
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      73. 
            
>>>>>>> 5b7749a (Fix)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              end
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              end
=======
                  visit "books/#{book.id}"
>>>>>>> d0dc1f1 (Featire specs)
=======
                  visit "books/#{book.id}"
>>>>>>> 752f0c0 (Featire specs)
=======
                  visit "books/#{book.id}"
>>>>>>> 4e81ea2 (Featire specs)
=======
                  visit "books/#{book.id}"
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                  visit "books/#{book.id}"
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
                  visit "books/#{book.id}"
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  visit "books/#{book.id}"
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                  visit "books/#{book.id}"
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
                  visit "books/#{book.id}"
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
                  visit "books/#{book.id}"
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
              end
>>>>>>> 5b7749a (Fix)
          
        74. 
        
        
      
        
        
          
      74. 
            
            

            

            
          
        75. 
        
        
      
        
        
          
      75. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              it 'can delete an category' do
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              it 'can delete an category' do
=======
                  find('a', class: 'general-back-link').click
>>>>>>> d0dc1f1 (Featire specs)
=======
                  find('a', class: 'general-back-link').click
>>>>>>> 752f0c0 (Featire specs)
=======
                  find('a', class: 'general-back-link').click
>>>>>>> 4e81ea2 (Featire specs)
=======
                  find('a', class: 'general-back-link').click
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                  find('a', class: 'general-back-link').click
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
                  find('a', class: 'general-back-link').click
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  find('a', class: 'general-back-link').click
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                  find('a', class: 'general-back-link').click
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
                  find('a', class: 'general-back-link').click
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
                  find('a', class: 'general-back-link').click
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
              it 'can delete an category' do
>>>>>>> 5b7749a (Fix)
          
        76. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
          
      76. 
            1
            

            

                click_link('Delete')
          
        77. 
        
        
      
        
        
          
      77. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      78. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      79. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
      80. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      81. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      82. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      83. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      84. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      85. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      86. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      87. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
            
            

            

            
          
        88. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      88. 
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      89. 
=======
          
      90. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      91. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
      92. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      93. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      94. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      95. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      96. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      97. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      98. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      99. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      100. 
>>>>>>> 5b7749a (Fix)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                expect(page).not_to have_content(category.name)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                expect(page).not_to have_content(category.name)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
                  expect(page).to have_content('Catalog')
          
        101. 
        
        
      
        
        
          
      101. 
            
            

            

                end
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
                expect(page).not_to have_content(category.name)
>>>>>>> 5b7749a (Fix)
          
        102. 
        
        
      
        
        
          
      102. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              end
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              end
=======
            
>>>>>>> d0dc1f1 (Featire specs)
=======
            
>>>>>>> 752f0c0 (Featire specs)
=======
            
>>>>>>> 4e81ea2 (Featire specs)
=======
            
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
            
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
            
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
            
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
            
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
            
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
            
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
              end
>>>>>>> 5b7749a (Fix)
          
        103. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      103. 
            
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      104. 
            
=======
          
      105. 
            1
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      106. 
            1
>>>>>>> 752f0c0 (Featire specs)
=======
          
      107. 
            1
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      108. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      109. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      110. 
            1
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      111. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      112. 
            1
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      113. 
            1
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      114. 
            
>>>>>>> 5b7749a (Fix)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
            
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
            
=======
                context 'when test read more' do
>>>>>>> d0dc1f1 (Featire specs)
=======
                context 'when test read more' do
>>>>>>> 752f0c0 (Featire specs)
=======
                context 'when test read more' do
>>>>>>> 4e81ea2 (Featire specs)
=======
                context 'when test read more' do
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                context 'when test read more' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
                context 'when test read more' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                context 'when test read more' do
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                context 'when test read more' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
                context 'when test read more' do
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
                context 'when test read more' do
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
            
>>>>>>> 5b7749a (Fix)
          
        115. 
        
        
      
        
        
          
      115. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              it 'can view an category' do
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              it 'can view an category' do
=======
                  it 'show read more' do
>>>>>>> d0dc1f1 (Featire specs)
=======
                  it 'show read more' do
>>>>>>> 752f0c0 (Featire specs)
=======
                  it 'show read more' do
>>>>>>> 4e81ea2 (Featire specs)
=======
                  it 'show read more' do
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                  it 'show read more' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
                  it 'show read more' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it 'show read more' do
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                  it 'show read more' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
                  it 'show read more' do
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
                  it 'show read more' do
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
              it 'can view an category' do
>>>>>>> 5b7749a (Fix)
          
        116. 
        
        
      
        
        
          
      116. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                click_link('View')
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                click_link('View')
=======
                    visit "books/#{book.id}"
>>>>>>> d0dc1f1 (Featire specs)
=======
                    visit "books/#{book.id}"
>>>>>>> 752f0c0 (Featire specs)
=======
                    visit "books/#{book.id}"
>>>>>>> 4e81ea2 (Featire specs)
=======
                    visit "books/#{book.id}"
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                    visit "books/#{book.id}"
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
                    visit "books/#{book.id}"
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                    visit "books/#{book.id}"
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                    visit "books/#{book.id}"
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
                    visit "books/#{book.id}"
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
                    visit "books/#{book.id}"
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
                click_link('View')
>>>>>>> 5b7749a (Fix)
          
        117. 
        
        
      
        
        
          
      117. 
            
            

            

            
          
        118. 
        
        
      
        
        
          
      118. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                expect(page).to have_content(category.name)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                expect(page).to have_content(category.name)
=======
                    expect(page).to have_content('Read More')
>>>>>>> d0dc1f1 (Featire specs)
=======
                    expect(page).to have_content('Read More')
>>>>>>> 752f0c0 (Featire specs)
=======
                    expect(page).to have_content('Read More')
>>>>>>> 4e81ea2 (Featire specs)
=======
                    expect(page).to have_content('Read More')
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                    expect(page).to have_content('Read More')
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
                    expect(page).to have_content('Read More')
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                    expect(page).to have_content('Read More')
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                    expect(page).to have_content('Read More')
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
                    expect(page).to have_content('Read More')
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
                    expect(page).to have_content('Read More')
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
                expect(page).to have_content(category.name)
>>>>>>> 5b7749a (Fix)
          
        119. 
        
        
      
        
        
          
      119. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              end
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              end
=======
                  end
>>>>>>> d0dc1f1 (Featire specs)
=======
                  end
>>>>>>> 752f0c0 (Featire specs)
=======
                  end
>>>>>>> 4e81ea2 (Featire specs)
=======
                  end
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                  end
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
                  end
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  end
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                  end
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
                  end
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
                  end
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
              end
>>>>>>> 5b7749a (Fix)
          
        120. 
        
        
      
        
        
          
      120. 
            
            

            

            
          
        121. 
        
        
      
        
        
          
      121. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              it 'can edit an category' do
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              it 'can edit an category' do
=======
                  it 'clicked read more', js: true do
>>>>>>> d0dc1f1 (Featire specs)
=======
                  it 'clicked read more', js: true do
>>>>>>> 752f0c0 (Featire specs)
=======
                  it 'clicked read more', js: true do
>>>>>>> 4e81ea2 (Featire specs)
=======
                  it 'clicked read more', js: true do
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                  it 'clicked read more', js: true do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
                  it 'clicked read more', js: true do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it 'clicked read more', js: true do
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                  it 'clicked read more', js: true do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
                  it 'clicked read more', js: true do
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
                  it 'clicked read more', js: true do
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
              it 'can edit an category' do
>>>>>>> 5b7749a (Fix)
          
        122. 
        
        
      
        
        
          
      122. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                click_link('Edit')
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                click_link('Edit')
=======
                    visit "books/#{book.id}"
>>>>>>> d0dc1f1 (Featire specs)
=======
                    visit "books/#{book.id}"
>>>>>>> 752f0c0 (Featire specs)
=======
                    visit "books/#{book.id}"
>>>>>>> 4e81ea2 (Featire specs)
=======
                    visit "books/#{book.id}"
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                    visit "books/#{book.id}"
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
                    visit "books/#{book.id}"
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                    visit "books/#{book.id}"
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                    visit "books/#{book.id}"
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
                    visit "books/#{book.id}"
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
                    visit "books/#{book.id}"
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
                click_link('Edit')
>>>>>>> 5b7749a (Fix)
          
        123. 
        
        
      
        
        
          
      123. 
            
            

            

            
          
        124. 
        
        
      
        
        
          
      124. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                fill_in 'category[name]', with: 'New Genre'
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                fill_in 'category[name]', with: 'New Genre'
=======
                    click_link 'Read More'
>>>>>>> d0dc1f1 (Featire specs)
=======
                    click_link 'Read More'
>>>>>>> 752f0c0 (Featire specs)
=======
                    click_link 'Read More'
>>>>>>> 4e81ea2 (Featire specs)
=======
                    click_link 'Read More'
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                    click_link 'Read More'
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
                    click_link 'Read More'
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                    click_link 'Read More'
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                    click_link 'Read More'
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
                    click_link 'Read More'
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
                    click_link 'Read More'
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
                fill_in 'category[name]', with: 'New Genre'
>>>>>>> 5b7749a (Fix)
          
        125. 
        
        
      
        
        
          
      125. 
            
            

            

            
          
        126. 
        
        
      
        
        
          
      126. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                click_button('Update Category')
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                click_button('Update Category')
=======
                    expect(page).not_to have_content('Read More')
>>>>>>> d0dc1f1 (Featire specs)
=======
                    expect(page).not_to have_content('Read More')
>>>>>>> 752f0c0 (Featire specs)
=======
                    expect(page).not_to have_content('Read More')
>>>>>>> 4e81ea2 (Featire specs)
=======
                    expect(page).not_to have_content('Read More')
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                    expect(page).not_to have_content('Read More')
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
                    expect(page).not_to have_content('Read More')
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                    expect(page).not_to have_content('Read More')
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                    expect(page).not_to have_content('Read More')
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
                    expect(page).not_to have_content('Read More')
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
                    expect(page).not_to have_content('Read More')
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
                click_button('Update Category')
>>>>>>> 5b7749a (Fix)
          
        127. 
        
        
      
        
        
          
      127. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
            
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
            
=======
                  end
>>>>>>> d0dc1f1 (Featire specs)
=======
                  end
>>>>>>> 752f0c0 (Featire specs)
=======
                  end
>>>>>>> 4e81ea2 (Featire specs)
=======
                  end
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                  end
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
                  end
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  end
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                  end
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
                  end
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
                  end
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
            
>>>>>>> 5b7749a (Fix)
          
        128. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      128. 
            1
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      129. 
            1
=======
          
      130. 
            
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      131. 
            
>>>>>>> 752f0c0 (Featire specs)
=======
          
      132. 
            
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      133. 
            
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      134. 
            
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      135. 
            
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      136. 
            
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      137. 
            
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      138. 
            
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      139. 
            1
>>>>>>> 5b7749a (Fix)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                expect(page).to have_content('New Genre')
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                expect(page).to have_content('New Genre')
=======
                end
>>>>>>> d0dc1f1 (Featire specs)
=======
                end
>>>>>>> 752f0c0 (Featire specs)
=======
                end
>>>>>>> 4e81ea2 (Featire specs)
=======
                end
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                end
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
                end
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                end
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                end
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
                end
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
                end
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
                expect(page).to have_content('New Genre')
>>>>>>> 5b7749a (Fix)
          
        140. 
        
        
      
        
        
          
      140. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
              end
          
        141. 
        
        
      
        
        
          
      141. 
            
            

            

            end
          
        142. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/feature/billing_spec.rb
      
    
      
      
  73.08%


      lines covered
    
      

    

    
      
      26 relevant lines.
      19 lines covered and
      7 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            RSpec.describe 'Billing', type: :feature do
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

              include_context 'with api request authentication helper methods'
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

              include_context 'with api request global before and after hooks'
          
        4. 
        
        
      
        
        
          
      4. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
            
          
        5. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
          
      5. 
            2
            

            

              let(:user) { create(:user) }
          
        6. 
        
        
      
        
        
          
      6. 
            1
            

            

              let(:attributes_for) { attributes_for(:billing) }
          
        7. 
        
        
      
        
        
          
      7. 
            
            

            

            
          
        8. 
        
        
      
        
        
          
      8. 
            1
            

            

              describe '#fill_in', js: true do
          
        9. 
        
        
      
        
        
          
      9. 
            1
            

            

                it 'fill in billing' do
          
        10. 
        
        
      
        
        
          
      10. 
            1
            

            

                  sign_in(user)
          
        11. 
        
        
      
        
        
          
      11. 
            
            

            

            
          
        12. 
        
        
      
        
        
          
      12. 
            1
            

            

                  visit edit_user_path(user.id)
          
        13. 
        
        
      
        
        
          
      13. 
            
            

            

            
          
        14. 
        
        
      
        
        
          
      14. 
            1
            

            

                  within('div#billing.col-md-5.mb-40') do
          
        15. 
        
        
      
        
        
          
      15. 
            1
            

            

                    find_all('div', class: 'form-group')[0] do
          
        16. 
        
        
      
        
        
          
      16. 
            
            

            

                      fill_in :first_name, with: attributes_for[:first_name]
          
        17. 
        
        
      
        
        
          
      17. 
            
            

            

                    end
          
        18. 
        
        
      
        
        
          
      18. 
            1
            

            

                    find_all('div', class: 'form-group')[1] do
          
        19. 
        
        
      
        
        
          
      19. 
            
            

            

                      fill_in :last_name, with: attributes_for[:last_name]
          
        20. 
        
        
      
        
        
          
      20. 
            
            

            

                    end
          
        21. 
        
        
      
        
        
          
      21. 
            1
            

            

                    find_all('div', class: 'form-group')[2] do
          
        22. 
        
        
      
        
        
          
      22. 
            
            

            

                      fill_in :address, with: attributes_for[:address]
          
        23. 
        
        
      
        
        
          
      23. 
            
            

            

                    end
          
        24. 
        
        
      
        
        
          
      24. 
            1
            

            

                    find_all('div', class: 'form-group')[3] do
          
        25. 
        
        
      
        
        
          
      25. 
            
            

            

                      fill_in :city, with: attributes_for[:city]
          
        26. 
        
        
      
        
        
          
      26. 
            
            

            

                    end
          
        27. 
        
        
      
        
        
          
      27. 
            1
            

            

                    find_all('div', class: 'form-group')[4] do
          
        28. 
        
        
      
        
        
          
      28. 
            
            

            

                      fill_in :zip, with: attributes_for[:zip]
          
        29. 
        
        
      
        
        
          
      29. 
            
            

            

                    end
          
        30. 
        
        
      
        
        
          
      30. 
            1
            

            

                    find_all('div', class: 'form-group')[5] do
          
        31. 
        
        
      
        
        
          
      31. 
            
            

            

                      fill_in :country, with: attributes_for[:country]
          
        32. 
        
        
      
        
        
          
      32. 
            
            

            

                    end
          
        33. 
        
        
      
        
        
          
      33. 
            1
            

            

                    find_all('div', class: 'form-group')[6] do
          
        34. 
        
        
      
        
        
          
      34. 
            
            

            

                      fill_in :phone, with: attributes_for[:phone]
          
        35. 
        
        
      
        
        
          
      35. 
            
            

            

                    end
          
        36. 
        
        
      
        
        
          
      36. 
            1
            

            

                    click_on I18n.t('settings.save')
          
        37. 
        
        
      
        
        
          
      37. 
            
            

            

                  end
          
        38. 
        
        
      
        
        
          
      38. 
            
            

            

            
          
        39. 
        
        
      
        
        
          
      39. 
            1
            

            

                  expect(page).to have_content(I18n.t('settings.message.update'))
          
        40. 
        
        
      
        
        
          
      40. 
            
            

            

                end
          
        41. 
        
        
      
        
        
          
      41. 
            
            

            

              end
          
        42. 
        
        
      
        
        
          
      42. 
            
            

            

            end
          
        43. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/feature/book_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      104 relevant lines.
      104 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            RSpec.describe 'Book', type: :feature do
          
        2. 
        
        
      
        
        
          
      2. 
            5
            

            

              let(:category_one) { create(:category) }
          
        3. 
        
        
      
        
        
          
      3. 
            3
            

            

              let(:category_two) { create(:category) }
          
        4. 
        
        
      
        
        
          
      4. 
            1
            

            

              let(:params) do
          
        5. 
        
        
      
        
        
          
      5. 
            4
            

            

                { title: FFaker::Book.title,
          
        6. 
        
        
      
        
        
          
      6. 
            
            

            

                  description: FFaker::Book.description,
          
        7. 
        
        
      
        
        
          
      7. 
            
            

            

                  price_cents: FFaker::Number.rand(1..100),
          
        8. 
        
        
      
        
        
          
      8. 
            
            

            

                  dimensions: FFaker::Book.cover,
          
        9. 
        
        
      
        
        
          
      9. 
            
            

            

                  year_of_publication: FFaker::Number.rand(1900..2022),
          
        10. 
        
        
      
        
        
          
      10. 
            
            

            

                  materials: 'Soft cover',
          
        11. 
        
        
      
        
        
          
      11. 
            
            

            

                  quantity: FFaker::Number.rand(2..5) }
          
        12. 
        
        
      
        
        
          
      12. 
            
            

            

              end
          
        13. 
        
        
      
        
        
          
      13. 
            7
            

            

              let(:book) { create(:book).decorate }
          
        14. 
        
        
      
        
        
          
      14. 
            
            

            

            
          
        15. 
        
        
      
        
        
          
      15. 
            1
            

            

              describe '#show book' do
          
        16. 
        
        
      
        
        
          
      16. 
            1
            

            

                it 'show books info' do
          
        17. 
        
        
      
        
        
          
      17. 
            1
            

            

                  visit "books/#{book.id}"
          
        18. 
        
        
      
        
        
          
      18. 
            
            

            

            
          
        19. 
        
        
      
        
        
          
      19. 
            1
            

            

                  expect(page).to have_content(book.title)
          
        20. 
        
        
      
        
        
          
      20. 
            
            

            

                end
          
        21. 
        
        
      
        
        
          
      21. 
            
            

            

            
          
        22. 
        
        
      
        
        
          
      22. 
            1
            

            

                it 'clicked Beck to results' do
          
        23. 
        
        
      
        
        
          
      23. 
            1
            

            

                  visit "books/#{book.id}"
          
        24. 
        
        
      
        
        
          
      24. 
            
            

            

            
          
        25. 
        
        
      
        
        
          
      25. 
            1
            

            

                  find('a', class: 'general-back-link').click
          
        26. 
        
        
      
        
        
          
      26. 
            
            

            

            
          
        27. 
        
        
      
        
        
          
      27. 
            1
            

            

                  expect(page).to have_content(I18n.t('catalog_page.title'))
          
        28. 
        
        
      
        
        
          
      28. 
            
            

            

                end
          
        29. 
        
        
      
        
        
          
      29. 
            
            

            

            
          
        30. 
        
        
      
        
        
          
      30. 
            1
            

            

                context 'when test read more' do
          
        31. 
        
        
      
        
        
          
      31. 
            1
            

            

                  it 'show read more' do
          
        32. 
        
        
      
        
        
          
      32. 
            1
            

            

                    visit "books/#{book.id}"
          
        33. 
        
        
      
        
        
          
      33. 
            
            

            

            
          
        34. 
        
        
      
        
        
          
      34. 
            1
            

            

                    expect(page).to have_content(I18n.t('book_page.read_more'))
          
        35. 
        
        
      
        
        
          
      35. 
            
            

            

                  end
          
        36. 
        
        
      
        
        
          
      36. 
            
            

            

            
          
        37. 
        
        
      
        
        
          
      37. 
            1
            

            

                  it 'clicked read more', js: true do
          
        38. 
        
        
      
        
        
          
      38. 
            1
            

            

                    visit "books/#{book.id}"
          
        39. 
        
        
      
        
        
          
      39. 
            
            

            

            
          
        40. 
        
        
      
        
        
          
      40. 
            1
            

            

                    click_link I18n.t('book_page.read_more')
          
        41. 
        
        
      
        
        
          
      41. 
            
            

            

            
          
        42. 
        
        
      
        
        
          
      42. 
            1
            

            

                    expect(page).not_to have_content(I18n.t('book_page.read_more'))
          
        43. 
        
        
      
        
        
          
      43. 
            
            

            

                  end
          
        44. 
        
        
      
        
        
          
      44. 
            
            

            

                end
          
        45. 
        
        
      
        
        
          
      45. 
            
            

            

            
          
        46. 
        
        
      
        
        
          
      46. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      47. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      48. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
      49. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      50. 
>>>>>>> 08edf50 (Featire specs)
=======
          
      51. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      52. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
      53. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      54. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      55. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
            1
            

            

                context 'when quantity changes', js: true do
          
        56. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
          
      56. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      57. 
=======
          
      58. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      59. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
      60. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      61. 
>>>>>>> 08edf50 (Featire specs)
=======
          
      62. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      63. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
      64. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      65. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      66. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      67. 
>>>>>>> 5b7749a (Fix)
            1
            

            

                  before do
          
        68. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
          
      68. 
            2
            

            

                    visit "books/#{book.id}"
          
        69. 
        
        
      
        
        
          
      69. 
            
            

            

            
          
        70. 
        
        
      
        
        
<<<<<<< HEAD
          
      70. 
            2
            

            

                    find('a', class: 'inc').click
          
        71. 
        
        
      
        
        
          
      71. 
            
            

            

                  end
          
        72. 
        
        
      
        
        
          
      72. 
            
            

            

            
          
        73. 
        
        
      
        
        
          
      73. 
            1
            

            

                  it 'increase quantity' do
          
        74. 
        
        
      
        
        
          
      74. 
            1
            

            

                    expect(page).to have_content("€#{Money.new(book.price_cents * 2)}")
          
        75. 
        
        
      
        
        
          
      75. 
            
            

            

                  end
          
        76. 
        
        
      
        
        
          
      76. 
            
            

            

            
          
        77. 
        
        
      
        
        
          
      77. 
            1
            

            

                  it 'decrease quantity' do
          
        78. 
        
        
      
        
        
          
      78. 
            1
            

            

                    find('a', class: 'dec').click
          
        79. 
        
        
      
        
        
          
      79. 
            1
            

            

                    expect(page).to have_content("€#{book.price}")
          
        80. 
        
        
      
        
        
          
      80. 
            
            

            

                  end
          
        81. 
        
        
      
        
        
          
      81. 
            
            

            

                end
          
        82. 
        
        
      
        
        
          
      82. 
            
            

            

              end
          
        83. 
        
        
      
        
        
          
      83. 
            
            

            

            
          
        84. 
        
        
      
        
        
          
      84. 
            1
            

            

              describe '#catalog' do
          
        85. 
        
        
      
        
        
          
      85. 
            1
            

            

                describe 'filter by category' do
          
        86. 
        
        
      
        
        
          
      86. 
            1
            

            

                  before do
          
        87. 
        
        
      
        
        
          
      87. 
            2
            

            

                    category_one.books.create(params)
          
        88. 
        
        
      
        
        
          
      88. 
            2
            

            

                    visit books_path
          
        89. 
        
        
      
        
        
          
      89. 
            
            

            

                  end
          
        90. 
        
        
      
        
        
          
      90. 
            
            

            

            
          
        91. 
        
        
      
        
        
          
      91. 
            1
            

            

                  after do
          
        92. 
        
        
      
        
        
          
      92. 
            2
            

            

                    category_one.destroy
          
        93. 
        
        
      
        
        
          
      93. 
            
            

            

                  end
          
        94. 
        
        
      
        
        
          
      94. 
            
            

            

            
          
        95. 
        
        
      
        
        
          
      95. 
            1
            

            

                  it 'show book count for category' do
          
        96. 
        
        
      
        
        
          
      96. 
            1
            

            

                    expect(page).to have_content(category_one.books.size)
          
        97. 
        
        
      
        
        
          
      97. 
            
            

            

                  end
          
        98. 
        
        
      
        
        
          
      98. 
            
            

            

            
          
        99. 
        
        
      
        
        
          
      99. 
            1
            

            

                  it 'filter book by category' do
          
        100. 
        
        
      
        
        
          
      100. 
            1
            

            

                    within 'ul', class: 'list-inline pt-10 mb-25 mr-240', id: 'filter' do
          
        101. 
        
        
      
        
        
          
      101. 
            1
            

            

                      click_on category_one.name
          
        102. 
        
        
      
        
        
          
      102. 
            
            

            

                    end
          
        103. 
        
        
      
        
        
          
      103. 
            
            

            

            
          
        104. 
        
        
      
        
        
          
      104. 
            1
            

            

                    expect(page).to have_content(category_one.books.first.title)
          
        105. 
        
        
      
        
        
          
      105. 
            
            

            

                  end
          
        106. 
        
        
      
        
        
          
      106. 
            
            

            

                end
          
        107. 
        
        
      
        
        
          
      107. 
            
            

            

            
          
        108. 
        
        
      
        
        
          
      108. 
            1
            

            

                describe 'filter by all books' do
          
        109. 
        
        
      
        
        
          
      109. 
            1
            

            

                  before do
          
        110. 
        
        
      
        
        
          
      110. 
            2
            

            

                    category_one.books.create(params)
          
        111. 
        
        
      
        
        
          
      111. 
            2
            

            

                    category_two.books.create(params)
          
        112. 
        
        
      
        
        
          
      112. 
            
            

            

            
          
        113. 
        
        
      
        
        
          
      113. 
            2
            

            

                    visit books_path
          
        114. 
        
        
      
        
        
          
      114. 
            
            

            

            
          
        115. 
        
        
      
        
        
          
      115. 
            2
            

            

                    click_on I18n.t('catalog_page.all')
          
        116. 
        
        
      
        
        
          
      116. 
            
            

            

                  end
          
        117. 
        
        
      
        
        
          
      117. 
            
            

            

            
          
        118. 
        
        
      
        
        
          
      118. 
            1
            

            

                  after do
          
        119. 
        
        
      
        
        
          
      119. 
            2
            

            

                    category_one.destroy
          
        120. 
        
        
      
        
        
          
      120. 
            2
            

            

                    category_two.destroy
          
        121. 
        
        
      
        
        
          
      121. 
            
            

            

                  end
          
        122. 
        
        
      
        
        
          
      122. 
            
            

            

            
          
        123. 
        
        
      
        
        
          
      123. 
            1
            

            

                  it 'shown books for first category' do
          
        124. 
        
        
      
        
        
          
      124. 
            1
            

            

                    expect(page).to have_content(category_one.books.first.title)
          
        125. 
        
        
      
        
        
          
      125. 
            
            

            

                  end
          
        126. 
        
        
      
        
        
          
      126. 
            
            

            

            
          
        127. 
        
        
      
        
        
          
      127. 
            1
            

            

                  it 'shown books for second category' do
          
        128. 
        
        
      
        
        
          
      128. 
            1
            

            

                    expect(page).to have_content(category_two.books.first.title)
          
        129. 
        
        
      
        
        
          
      129. 
            
            

            

                  end
          
        130. 
        
        
      
        
        
          
      130. 
            
            

            

                end
          
        131. 
        
        
      
        
        
          
      131. 
            
            

            

              end
          
        132. 
        
        
      
        
        
          
      132. 
            
            

            

            
          
        133. 
        
        
      
        
        
          
      133. 
            1
            

            

              describe 'load_more' do
          
        134. 
        
        
      
        
        
          
      134. 
            1
            

            

                before do
          
        135. 
        
        
      
        
        
          
      135. 
            3
            

            

                  24.times do
          
        136. 
        
        
      
        
        
          
      136. 
            72
            

            

                    books << create(:book)
          
        137. 
        
        
      
        
        
          
      137. 
            
            

            

                  end
          
        138. 
        
        
      
        
        
          
      138. 
            
            

            

                end
          
        139. 
        
        
      
        
        
          
      139. 
            
            

            

            
          
        140. 
        
        
      
        
        
          
      140. 
            4
            

            

                let(:books) { [] }
          
        141. 
        
        
      
        
        
          
      141. 
            
            

            

            
          
        142. 
        
        
      
        
        
          
      142. 
            1
            

            

                it 'show books without view more button' do
          
        143. 
        
        
      
        
        
          
      143. 
            1
            

            

                  visit books_path
          
        144. 
        
        
      
        
        
          
      144. 
            
            

            

            
          
        145. 
        
        
      
        
        
          
      145. 
            1
            

            

                  find('a', id: 'view_more', class: 'view_more').click
          
        146. 
        
        
      
        
        
          
      146. 
            
            

            

            
          
        147. 
        
        
      
        
        
          
      147. 
            1
            

            

                  expect(page).not_to have_css('a', class: 'view_more hidden', id: 'view_more')
          
        148. 
        
        
      
        
        
          
      148. 
            
            

            

                end
          
        149. 
        
        
      
        
        
          
      149. 
            
            

            

            
          
        150. 
        
        
      
        
        
          
      150. 
            1
            

            

                context 'when view more' do
          
        151. 
        
        
      
        
        
          
      151. 
            1
            

            

                  it 'show books with view more button' do
          
        152. 
        
        
      
        
        
          
      152. 
            1
            

            

                    visit books_path
          
        153. 
        
        
      
        
        
          
      153. 
            
            

            

            
          
        154. 
        
        
      
        
        
          
      154. 
            1
            

            

                    expect(page).to have_css('a', class: 'view_more')
          
        155. 
        
        
      
        
        
          
      155. 
            
            

            

                  end
          
        156. 
        
        
      
        
        
          
      156. 
            
            

            

            
          
        157. 
        
        
      
        
        
          
      157. 
            1
            

            

                  it 'show loaded books', js: true do
          
        158. 
        
        
      
        
        
          
      158. 
            1
            

            

                    visit books_path
          
        159. 
        
        
      
        
        
          
      159. 
            
            

            

            
          
        160. 
        
        
      
        
        
          
      160. 
            1
            

            

                    find('a', class: 'view_more').click
          
        161. 
        
        
      
        
        
          
      161. 
            
            

            

            
          
        162. 
        
        
      
        
        
          
      162. 
            1
            

            

                    expect(page).to have_content(books.last.title)
          
        163. 
        
        
      
        
        
          
      163. 
            
            

            

                  end
          
        164. 
        
        
      
        
        
          
      164. 
            
            

            

                end
          
        165. 
        
        
      
        
        
          
      165. 
            
            

            

              end
          
        166. 
        
        
      
        
        
          
      166. 
            
            

            

            
          
        167. 
        
        
      
        
        
          
      167. 
            1
            

            

              describe 'sort' do
          
        168. 
        
        
      
        
        
          
      168. 
            1
            

            

                shared_examples 'sort test' do
          
        169. 
        
        
      
        
        
          
      169. 
            5
            

            

                  it 'sort books' do
          
        170. 
        
        
      
        
        
          
      170. 
            5
            

            

                    create(:book, title: 'Zimbabwe', price_cents: 75,
          
        171. 
        
        
      
        
        
          
      171. 
            
            

            

                                  created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
          
        172. 
        
        
      
        
        
          
      172. 
            5
            

            

                    create(:book, title: 'Anna', price_cents: 23,
          
        173. 
        
        
      
        
        
          
      173. 
            
            

            

                                  created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00')
          
        174. 
        
        
      
        
        
          
      174. 
            
            

            

            
          
        175. 
        
        
      
        
        
          
      175. 
            5
            

            

                    visit books_path
          
        176. 
        
        
      
        
        
          
      176. 
            
            

            

            
          
        177. 
        
        
      
        
        
          
      177. 
            5
            

            

                    find('a', class: 'dropdown-toggle lead small', text: I18n.t('catalog_page.sorting.newer_first'),
          
        178. 
        
        
      
        
        
          
      178. 
            
            

            

                              id: 'menu').click
          
        179. 
        
        
      
        
        
          
      179. 
            
            

            

            
          
        180. 
        
        
      
        
        
          
      180. 
            5
            

            

                    within 'ul', class: 'dropdown-menu', id: 'sort' do
          
        181. 
        
        
      
        
        
          
      181. 
            5
            

            

                      click_link button
          
        182. 
        
        
      
        
        
          
      182. 
            
            

            

                    end
          
        183. 
        
        
      
        
        
          
      183. 
            5
            

            

                    expect(find('.col-xs-6.col-sm-3', match: :first)).to have_content(book_title)
          
        184. 
        
        
      
        
        
          
      184. 
            
            

            

                  end
          
        185. 
        
        
      
        
        
          
      185. 
            
            

            

                end
          
        186. 
        
        
      
        
        
          
      186. 
            
            

            

            
          
        187. 
        
        
      
        
        
          
      187. 
            1
            

            

                context 'when sort by title A to Z' do
          
        188. 
        
        
      
        
        
          
      188. 
            2
            

            

                  let(:button) { I18n.t('catalog_page.sorting.title.asc') }
          
        189. 
        
        
      
        
        
          
      189. 
            2
            

            

                  let(:book_title) { 'Anna' }
          
        190. 
        
        
      
        
        
          
      190. 
            
            

            

            
          
        191. 
        
        
      
        
        
          
      191. 
            1
            

            

                  include_examples 'sort test'
          
        192. 
        
        
      
        
        
          
      192. 
            
            

            

                end
          
        193. 
        
        
      
        
        
          
      193. 
            
            

            

            
          
        194. 
        
        
      
        
        
          
      194. 
            1
            

            

                context 'when sort by title Z to A' do
          
        195. 
        
        
      
        
        
          
      195. 
            2
            

            

                  let(:button) { I18n.t('catalog_page.sorting.title.desc') }
          
        196. 
        
        
      
        
        
          
      196. 
            2
            

            

                  let(:book_title) { 'Zimbabwe' }
          
        197. 
        
        
      
        
        
          
      197. 
            
            

            

            
          
        198. 
        
        
      
        
        
          
      198. 
            1
            

            

                  include_examples 'sort test'
          
        199. 
        
        
      
        
        
          
      199. 
            
            

            

                end
          
        200. 
        
        
      
        
        
          
      200. 
            
            

            

            
          
        201. 
        
        
      
        
        
          
      201. 
            1
            

            

                context 'when sort by price High to Low' do
          
        202. 
        
        
      
        
        
          
      202. 
            2
            

            

                  let(:button) { I18n.t('catalog_page.sorting.price.desc') }
          
        203. 
        
        
      
        
        
          
      203. 
            2
            

            

                  let(:book_title) { 'Zimbabwe' }
          
        204. 
        
        
      
        
        
          
      204. 
            
            

            

            
          
        205. 
        
        
      
        
        
          
      205. 
            1
            

            

                  include_examples 'sort test'
          
        206. 
        
        
      
        
        
          
      206. 
            
            

            

                end
          
        207. 
        
        
      
        
        
          
      207. 
            
            

            

            
          
        208. 
        
        
      
        
        
          
      208. 
            1
            

            

                context 'when sort by price Low to High' do
          
        209. 
        
        
      
        
        
          
      209. 
            2
            

            

                  let(:button) { I18n.t('catalog_page.sorting.price.asc') }
          
        210. 
        
        
      
        
        
          
      210. 
            2
            

            

                  let(:book_title) { 'Anna' }
          
        211. 
        
        
      
        
        
          
      211. 
            
            

            

            
          
        212. 
        
        
      
        
        
          
      212. 
            1
            

            

                  include_examples 'sort test'
          
        213. 
        
        
      
        
        
          
      213. 
            
            

            

                end
          
        214. 
        
        
      
        
        
          
      214. 
            
            

            

            
          
        215. 
        
        
      
        
        
          
      215. 
            1
            

            

                context 'when sort by newest' do
          
        216. 
        
        
      
        
        
          
      216. 
            2
            

            

                  let(:button) { I18n.t('catalog_page.sorting.newer_first') }
          
        217. 
        
        
      
        
        
          
      217. 
            2
            

            

                  let(:book_title) { 'Zimbabwe' }
          
        218. 
        
        
      
        
        
          
      218. 
            
            

            

            
          
        219. 
        
        
      
        
        
          
      219. 
            1
            

            

                  include_examples 'sort test'
          
        220. 
        
        
      
        
        
          
      220. 
            
            

            

                end
          
        221. 
        
        
      
        
        
          
      221. 
            
            

            

              end
          
        222. 
        
        
      
        
        
          
      222. 
            
            

            

            end
          
        223. 
        
        
      
    
      
  
      

      

      
<<<<<<< HEAD
=======
        
      
  
      
    
      spec/feature/cart_spec.rb
      
    
      
      
  96.55%


      lines covered
    
      

    

    
      
      29 relevant lines.
      28 lines covered and
      1 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            require 'rails_helper'
          
        2. 
        
        
      
        
        
          
      2. 
            
            

            

            
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

            RSpec.describe 'Cart', type: :feature, js: true do
          
        4. 
        
        
      
        
        
          
      4. 
            5
            

            

              let(:book) { FactoryBot.create(:book) }
          
        5. 
        
        
      
        
        
          
      5. 
            
            

            

            
          
        6. 
        
        
      
        
        
          
      6. 
            1
            

            

              before do
          
        7. 
        
        
      
        
        
          
      7. 
            4
            

            

                book
          
        8. 
        
        
      
        
        
          
      8. 
            4
            

            

                visit book_path(book.id)
          
        9. 
        
        
      
        
        
          
      9. 
            
            

            

            
          
        10. 
        
        
      
        
        
          
      10. 
            4
            

            

                click_button I18n.t('book_page.add_to_card')
          
        11. 
        
        
      
        
        
          
      11. 
            
            

            

              end
          
        12. 
        
        
      
        
        
          
      12. 
            
            

            

            
          
        13. 
        
        
      
        
        
          
      13. 
            1
            

            

              describe '#add_book_to_order' do
          
        14. 
        
        
      
        
        
          
      14. 
            1
            

            

                it 'add book to order' do
          
        15. 
        
        
      
        
        
          
      15. 
            1
            

            

                  within('span', class: 'shop-icon') do
          
        16. 
        
        
      
        
        
          
      16. 
            1
            

            

                    expect(page).to have_content(1)
          
        17. 
        
        
      
        
        
          
      17. 
            
            

            

                  end
          
        18. 
        
        
      
        
        
          
      18. 
            
            

            

                end
          
        19. 
        
        
      
        
        
          
      19. 
            
            

            

              end
          
        20. 
        
        
      
        
        
          
      20. 
            
            

            

            
          
        21. 
        
        
      
        
        
          
      21. 
            1
            

            

              describe '#quantity_change' do
          
        22. 
        
        
      
        
        
          
      22. 
            1
            

            

                it 'book quantity inc' do
          
        23. 
        
        
      
        
        
          
      23. 
            1
            

            

                  visit orders_path
          
        24. 
        
        
      
        
        
          
      24. 
            
            

            

            
          
        25. 
        
        
      
        
        
          
      25. 
            1
            

            

                  within("a#inc#{book.id}.input-link") do
          
        26. 
        
        
      
        
        
          
      26. 
            1
            

            

                    find('i.fa.fa-plus.line-heaght-40').click
          
        27. 
        
        
      
        
        
          
      27. 
            
            

            

                  end
          
        28. 
        
        
      
        
        
          
      28. 
            
            

            

            
          
        29. 
        
        
      
        
        
          
      29. 
            1
            

            

                  sleep(2)
          
        30. 
        
        
      
        
        
          
      30. 
            
            

            

            
          
        31. 
        
        
      
        
        
          
      31. 
            1
            

            

                  expect(find_field("counter#{book.id}").value).to eq('2')
          
        32. 
        
        
      
        
        
          
      32. 
            
            

            

                end
          
        33. 
        
        
      
        
        
          
      33. 
            
            

            

            
          
        34. 
        
        
      
        
        
          
      34. 
            1
            

            

                it 'book quantity dec' do
          
        35. 
        
        
      
        
        
          
      35. 
            1
            

            

                  visit orders_path
          
        36. 
        
        
      
        
        
          
      36. 
            
            

            

            
          
        37. 
        
        
      
        
        
          
      37. 
            1
            

            

                  within("a#dec#{book.id}.input-link") do
          
        38. 
        
        
      
        
        
          
      38. 
            1
            

            

                    find('i.fa.fa-minus.line-heaght-40').click
          
        39. 
        
        
      
        
        
          
      39. 
            
            

            

                  end
          
        40. 
        
        
      
        
        
          
      40. 
            
            

            

            
          
        41. 
        
        
      
        
        
          
      41. 
            1
            

            

                  sleep(2)
          
        42. 
        
        
      
        
        
          
      42. 
            
            

            

            
          
        43. 
        
        
      
        
        
          
      43. 
            1
            

            

                  expect(find_field("counter#{book.id}").value).to eq('0')
          
        44. 
        
        
      
        
        
          
      44. 
            
            

            

                end
          
        45. 
        
        
      
        
        
          
      45. 
            
            

            

              end
          
        46. 
        
        
      
        
        
          
      46. 
            
            

            

            
          
        47. 
        
        
      
        
        
          
      47. 
            1
            

            

              describe '#remove_book_from_cart' do
          
        48. 
        
        
      
        
        
          
      48. 
            1
            

            

                it 'book quantity change' do
          
        49. 
        
        
      
        
        
          
      49. 
            1
            

            

                  visit orders_path
          
        50. 
        
        
      
        
        
          
      50. 
            
            

            

            
          
        51. 
        
        
      
        
        
          
      51. 
            1
            

            

                  find('button.close.general-cart-close').click
          
        52. 
        
        
      
        
        
          
      52. 
            
            

            

            
          
        53. 
        
        
      
        
        
          
      53. 
            
            

            

                  expect(page).to have_content(I18n.t('order.messages.delete'))
          
        54. 
        
        
      
        
        
          
      54. 
            
            

            

                end
          
        55. 
        
        
      
        
        
          
      55. 
            
            

            

              end
          
        56. 
        
        
      
        
        
          
      56. 
            
            

            

            end
          
        57. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/feature/coupon_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      30 relevant lines.
      30 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            require 'rails_helper'
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

            require_relative '../support/shared_context'
          
        3. 
        
        
      
        
        
          
      3. 
            
            

            

            
          
        4. 
        
        
      
        
        
          
      4. 
            1
            

            

            RSpec.describe 'Coupon', type: :feature, js: true do
          
        5. 
        
        
      
        
        
          
      5. 
            1
            

            

              include_context 'with api request authentication helper methods'
          
        6. 
        
        
      
        
        
          
      6. 
            1
            

            

              include_context 'with api request global before and after hooks'
          
        7. 
        
        
      
        
        
          
      7. 
            
            

            

            
          
        8. 
        
        
      
        
        
          
      8. 
            5
            

            

              let(:user) { FactoryBot.create(:user) }
          
        9. 
        
        
      
        
        
          
      9. 
            4
            

            

              let(:coupon) { FactoryBot.create(:coupon, discount: 0.15) }
          
        10. 
        
        
      
        
        
          
      10. 
            5
            

            

              let(:order) { FactoryBot.create(:order, user_id: user.id, books_count: 0) }
          
        11. 
        
        
      
        
        
          
      11. 
            5
            

            

              let(:book) { FactoryBot.create(:book, price_cents: 1234) }
          
        12. 
        
        
      
        
        
          
      12. 
            5
            

            

              let(:order_book) { FactoryBot.create(:order_book, order: order, book: book) }
          
        13. 
        
        
      
        
        
          
      13. 
            
            

            

            
          
        14. 
        
        
      
        
        
          
      14. 
            1
            

            

              before do
          
        15. 
        
        
      
        
        
          
      15. 
            4
            

            

                sign_in(user)
          
        16. 
        
        
      
        
        
          
      16. 
            4
            

            

                order
          
        17. 
        
        
      
        
        
          
      17. 
            4
            

            

                order_book
          
        18. 
        
        
      
        
        
          
      18. 
            4
            

            

                visit orders_path
          
        19. 
        
        
      
        
        
          
      19. 
            
            

            

              end
          
        20. 
        
        
      
        
        
          
      20. 
            
            

            

            
          
        21. 
        
        
      
        
        
          
      21. 
            1
            

            

              describe '#valid coupon' do
          
        22. 
        
        
      
        
        
          
      22. 
            1
            

            

                before do
          
        23. 
        
        
      
        
        
          
      23. 
            3
            

            

                  fill_in 'input', with: coupon.code
          
        24. 
        
        
      
        
        
          
      24. 
            
            

            

            
          
        25. 
        
        
      
        
        
          
      25. 
            3
            

            

                  click_button I18n.t('order.apply')
          
        26. 
        
        
      
        
        
          
      26. 
            
            

            

                end
          
        27. 
        
        
      
        
        
          
      27. 
            
            

            

            
          
        28. 
        
        
      
        
        
          
      28. 
            1
            

            

                it 'sub price' do
          
        29. 
        
        
      
        
        
          
      29. 
            1
            

            

                  expect(page).to have_content("SubTotal:\n€ 12.34")
          
        30. 
        
        
      
        
        
          
      30. 
            
            

            

                end
          
        31. 
        
        
      
        
        
          
      31. 
            
            

            

            
          
        32. 
        
        
      
        
        
          
      32. 
            1
            

            

                it 'use coupon' do
          
        33. 
        
        
      
        
        
          
      33. 
            1
            

            

                  expect(page).to have_content("Coupon:\n€ 1.85")
          
        34. 
        
        
      
        
        
          
      34. 
            
            

            

                end
          
        35. 
        
        
      
        
        
          
      35. 
            
            

            

            
          
        36. 
        
        
      
        
        
          
      36. 
            1
            

            

                it 'count price with coupon' do
          
        37. 
        
        
      
        
        
          
      37. 
            1
            

            

                  expect(page).to have_content('Order Total: € 10.49')
          
        38. 
        
        
      
        
        
          
      38. 
            
            

            

                end
          
        39. 
        
        
      
        
        
          
      39. 
            
            

            

              end
          
        40. 
        
        
      
        
        
          
      40. 
            
            

            

            
          
        41. 
        
        
      
        
        
          
      41. 
            1
            

            

              describe '#invalid coupon' do
          
        42. 
        
        
      
        
        
          
      42. 
            1
            

            

                it 'show error message' do
          
        43. 
        
        
      
        
        
          
      43. 
            1
            

            

                  fill_in 'input', with: 'dasdasdqe1243wasad'
          
        44. 
        
        
      
        
        
          
      44. 
            
            

            

            
          
        45. 
        
        
      
        
        
          
      45. 
            1
            

            

                  click_button I18n.t('order.apply')
          
        46. 
        
        
      
        
        
          
      46. 
            
            

            

            
          
        47. 
        
        
      
        
        
          
      47. 
            1
            

            

                  expect(page).to have_content(I18n.t('order.coupon.error'))
          
        48. 
        
        
      
        
        
          
      48. 
            
            

            

                end
          
        49. 
        
        
      
        
        
          
      49. 
            
            

            

              end
          
        50. 
        
        
      
        
        
          
      50. 
            
            

            

            end
          
        51. 
        
        
      
    
      
  
      

      

      
>>>>>>> 366b257 (Fix)
        
      
  
      
    
      spec/feature/home_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      49 relevant lines.
      49 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            RSpec.describe 'Home', type: :feature do
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

              include_context 'with api request authentication helper methods'
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

              include_context 'with api request global before and after hooks'
          
        4. 
        
        
      
        
        
          
      4. 
            
            

            

            
          
        5. 
        
        
      
        
        
          
      5. 
            1
            

            

              describe 'Get Started' do
          
        6. 
        
        
      
        
        
          
      6. 
            1
            

            

                it 'on click move to catalog page' do
          
        7. 
        
        
      
        
        
          
      7. 
            1
            

            

                  visit root_path
          
        8. 
        
        
      
        
        
          
      8. 
            
            

            

            
          
        9. 
        
        
      
        
        
          
      9. 
            1
            

            

                  click_on 'Get Started'
          
        10. 
        
        
      
        
        
          
      10. 
            
            

            

            
          
        11. 
        
        
      
        
        
          
      11. 
            1
            

            

                  expect(page).to have_content('Catalog')
          
        12. 
        
        
      
        
        
          
      12. 
            
            

            

                end
          
        13. 
        
        
      
        
        
          
      13. 
            
            

            

              end
          
        14. 
        
        
      
        
        
          
      14. 
            
            

            

            
          
        15. 
        
        
      
        
        
          
      15. 
            1
            

            

              describe 'navbar' do
          
        16. 
        
        
      
        
        
          
      16. 
            2
            

            

                let(:books_category) { create(:books_category) }
          
        17. 
        
        
      
        
        
          
      17. 
            
            

            

            
          
        18. 
        
        
      
        
        
          
      18. 
            1
            

            

                it 'on click home move to root-path' do
          
        19. 
        
        
      
        
        
          
      19. 
            1
            

            

                  visit books_path
          
        20. 
        
        
      
        
        
          
      20. 
            
            

            

            
          
        21. 
        
        
      
        
        
          
      21. 
            1
            

            

                  find('a', id: 'root').click
          
        22. 
        
        
      
        
        
          
      22. 
            
            

            

            
          
        23. 
        
        
      
        
        
          
      23. 
            1
            

            

                  expect(page).to have_content('Get Started')
          
        24. 
        
        
      
        
        
          
      24. 
            
            

            

                end
          
        25. 
        
        
      
        
        
          
      25. 
            
            

            

            
          
        26. 
        
        
      
        
        
          
      26. 
            1
            

            

                it 'on click category name move to root-path with books that belong to this category' do
          
        27. 
        
        
      
        
        
          
      27. 
            1
            

            

                  books_category
          
        28. 
        
        
      
        
        
          
      28. 
            
            

            

            
          
        29. 
        
        
      
        
        
          
      29. 
            1
            

            

                  visit root_path
          
        30. 
        
        
      
        
        
          
      30. 
            
            

            

            
          
        31. 
        
        
      
        
        
          
      31. 
            1
            

            

                  find('a', class: 'dropdown-toggle', text: 'Shop').click
          
        32. 
        
        
      
        
        
          
      32. 
            
            

            

            
          
        33. 
        
        
      
        
        
          
      33. 
            1
            

            

                  within('ul', id: 'nav') do
          
        34. 
        
        
      
        
        
          
      34. 
            1
            

            

                    find('a', class: 'collapse-link', text: books_category.category.name).click
          
        35. 
        
        
      
        
        
          
      35. 
            
            

            

                  end
          
        36. 
        
        
      
        
        
          
      36. 
            
            

            

            
          
        37. 
        
        
      
        
        
          
      37. 
            1
            

            

                  expect(page).to have_content(books_category.category.books.first.title)
          
        38. 
        
        
      
        
        
          
      38. 
            
            

            

                end
          
        39. 
        
        
      
        
        
          
      39. 
            
            

            

            
          
        40. 
        
        
      
        
        
          
      40. 
            1
            

            

                context 'when guest' do
          
        41. 
        
        
      
        
        
          
      41. 
            1
            

            

                  it 'on click login go to login page' do
          
        42. 
        
        
      
        
        
          
      42. 
            1
            

            

                    visit root_path
          
        43. 
        
        
      
        
        
          
      43. 
            
            

            

            
          
        44. 
        
        
      
        
        
          
      44. 
            1
            

            

                    within 'div', class: 'visible-xs' do
          
        45. 
        
        
      
        
        
          
      45. 
            1
            

            

                      click_link I18n.t('header.log_in')
          
        46. 
        
        
      
        
        
          
      46. 
            
            

            

                    end
          
        47. 
        
        
      
        
        
          
      47. 
            
            

            

            
          
        48. 
        
        
      
        
        
          
      48. 
            1
            

            

                    expect(page).to have_content(I18n.t('header.log_in'))
          
        49. 
        
        
      
        
        
          
      49. 
            
            

            

                  end
          
        50. 
        
        
      
        
        
          
      50. 
            
            

            

            
          
        51. 
        
        
      
        
        
          
      51. 
            1
            

            

                  it 'on click sing up go to sing up page' do
          
        52. 
        
        
      
        
        
          
      52. 
            1
            

            

                    visit root_path
          
        53. 
        
        
      
        
        
          
      53. 
            
            

            

            
          
        54. 
        
        
      
        
        
          
      54. 
            1
            

            

                    within 'div', class: 'visible-xs' do
          
        55. 
        
        
      
        
        
          
      55. 
            1
            

            

                      click_link I18n.t('header.sing_up')
          
        56. 
        
        
      
        
        
          
      56. 
            
            

            

                    end
          
        57. 
        
        
      
        
        
          
      57. 
            
            

            

            
          
        58. 
        
        
      
        
        
          
      58. 
            1
            

            

                    expect(page).to have_content(I18n.t('header.sing_up'))
          
        59. 
        
        
      
        
        
          
      59. 
            
            

            

                  end
          
        60. 
        
        
      
        
        
          
      60. 
            
            

            

                end
          
        61. 
        
        
      
        
        
          
      61. 
            
            

            

            
          
        62. 
        
        
      
        
        
          
      62. 
            1
            

            

                context 'when user', js: true do
          
        63. 
        
        
      
        
        
          
      63. 
            4
            

            

                  let(:user) { create(:user) }
          
        64. 
        
        
      
        
        
          
      64. 
            
            

            

            
          
        65. 
        
        
      
        
        
          
      65. 
            1
            

            

                  before do
          
        66. 
        
        
      
        
        
          
      66. 
            3
            

            

                    sign_in(user)
          
        67. 
        
        
      
        
        
          
      67. 
            
            

            

                  end
          
        68. 
        
        
      
        
        
          
      68. 
            
            

            

            
          
        69. 
        
        
      
        
        
          
      69. 
            1
            

            

                  it 'on click account show settings' do
          
        70. 
        
        
      
        
        
          
      70. 
            1
            

            

                    visit root_path
          
        71. 
        
        
      
        
        
          
      71. 
            
            

            

            
          
        72. 
        
        
      
        
        
          
      72. 
            1
            

            

                    click_on I18n.t('header.account')
          
        73. 
        
        
      
        
        
          
      73. 
            
            

            

            
          
        74. 
        
        
      
        
        
          
      74. 
            1
            

            

                    expect(page).to have_content(I18n.t('header.settings'))
          
        75. 
        
        
      
        
        
          
      75. 
            
            

            

                  end
          
        76. 
        
        
      
        
        
          
      76. 
            
            

            

            
          
        77. 
        
        
      
        
        
          
      77. 
            1
            

            

                  it 'on click account show log_out' do
          
        78. 
        
        
      
        
        
          
      78. 
            1
            

            

                    visit root_path
          
        79. 
        
        
      
        
        
          
      79. 
            
            

            

            
          
        80. 
        
        
      
        
        
          
      80. 
            1
            

            

                    click_on I18n.t('header.account')
          
        81. 
        
        
      
        
        
          
      81. 
            
            

            

            
          
        82. 
        
        
      
        
        
          
      82. 
            1
            

            

                    expect(page).to have_content(I18n.t('header.log_out'))
          
        83. 
        
        
      
        
        
          
      83. 
            
            

            

                  end
          
        84. 
        
        
      
        
        
          
      84. 
            
            

            

            
          
        85. 
        
        
      
        
        
          
      85. 
            1
            

            

                  it 'log_out' do
          
        86. 
        
        
      
        
        
          
      86. 
            1
            

            

                    visit root_path
          
        87. 
        
        
      
        
        
          
      87. 
            
            

            

            
          
        88. 
        
        
      
        
        
          
      88. 
            1
            

            

                    click_on I18n.t('header.account')
          
        89. 
        
        
      
        
        
          
      89. 
            
            

            

            
          
        90. 
        
        
      
        
        
          
      90. 
            1
            

            

                    click_on(I18n.t('header.log_out'), match: :first)
          
        91. 
        
        
      
        
        
          
      91. 
            
            

            

            
          
        92. 
        
        
      
        
        
          
      92. 
            1
            

            

                    expect(page).to have_content(I18n.t('devise.sessions.signed_out'))
          
        93. 
        
        
      
        
        
          
      93. 
            
            

            

                  end
          
        94. 
        
        
      
        
        
          
      94. 
            
            

            

                end
          
        95. 
        
        
      
        
        
          
      95. 
            
            

            

              end
          
        96. 
        
        
      
        
        
          
      96. 
            
            

            

            end
          
        97. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/feature/login_spec.rb
      
    
      
>>>>>>> a5d032d (Fix)
      
  100.0%


      lines covered
    
      

    

    
      
<<<<<<< HEAD
      31 relevant lines.
      31 lines covered and
=======
      19 relevant lines.
      19 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            RSpec.describe 'Login', type: :feature do
          
        2. 
        
        
      
        
        
          
      2. 
            3
            

            

              let(:user_second) { create(:user, email: 'test.rspec@rspec.ua') }
          
        3. 
        
        
      
        
        
          
      3. 
            
            

            

            
          
        4. 
        
        
      
        
        
          
      4. 
            1
            

            

              describe '#login' do
          
        5. 
        
        
      
        
        
          
      5. 
            1
            

            

                before do
          
        6. 
        
        
      
        
        
          
      6. 
            2
            

            

                  visit new_user_session_path
          
        7. 
        
        
      
        
        
          
      7. 
            
            

            

                end
          
        8. 
        
        
      
        
        
          
      8. 
            
            

            

            
          
        9. 
        
        
      
        
        
          
      9. 
            1
            

            

                context 'when successfully login' do
          
        10. 
        
        
      
        
        
          
      10. 
            1
            

            

                  it 'login' do
          
        11. 
        
        
      
        
        
          
      11. 
            1
            

            

                    within 'form', class: 'new_user', id: 'new_user' do
          
        12. 
        
        
      
        
        
          
      12. 
            1
            

            

                      fill_in 'user_email', with: user_second.email
          
        13. 
        
        
      
        
        
          
      13. 
            1
            

            

                      fill_in 'user_password', with: user_second.password
          
        14. 
        
        
      
        
        
          
      14. 
            
            

            

            
          
        15. 
        
        
      
        
        
          
      15. 
            1
            

            

                      click_on I18n.t('header.log_in')
          
        16. 
        
        
      
        
        
          
      16. 
            
            

            

                    end
          
        17. 
        
        
      
        
        
          
      17. 
            
            

            

            
          
        18. 
        
        
      
        
        
          
      18. 
            1
            

            

                    expect(page).to have_text I18n.t('devise.sessions.signed_in')
          
        19. 
        
        
      
        
        
          
      19. 
            
            

            

                  end
          
        20. 
        
        
      
        
        
          
      20. 
            
            

            

                end
          
        21. 
        
        
      
        
        
          
      21. 
            
            

            

            
          
        22. 
        
        
      
        
        
          
      22. 
            1
            

            

                context 'when unsuccessfully login' do
          
        23. 
        
        
      
        
        
          
      23. 
            1
            

            

                  it 'didn`t login' do
          
        24. 
        
        
      
        
        
          
      24. 
            1
            

            

                    within 'form', class: 'new_user', id: 'new_user' do
          
        25. 
        
        
      
        
        
          
      25. 
            1
            

            

                      fill_in 'user_email', with: user_second.email
          
        26. 
        
        
      
        
        
          
      26. 
            1
            

            

                      fill_in 'user_password', with: 'wrong_password'
          
        27. 
        
        
      
        
        
          
      27. 
            
            

            

            
          
        28. 
        
        
      
        
        
          
      28. 
            1
            

            

                      click_on I18n.t('header.log_in')
          
        29. 
        
        
      
        
        
          
      29. 
            
            

            

                    end
          
        30. 
        
        
      
        
        
          
      30. 
            
            

            

            
          
        31. 
        
        
      
        
        
          
      31. 
            1
            

            

                    expect(page).to have_text 'Invalid Email or password.'
          
        32. 
        
        
      
        
        
          
      32. 
            
            

            

                  end
          
        33. 
        
        
      
        
        
          
      33. 
            
            

            

                end
          
        34. 
        
        
      
        
        
          
      34. 
            
            

            

              end
          
        35. 
        
        
      
        
        
          
      35. 
            
            

            

            end
          
        36. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/feature/new_password_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      13 relevant lines.
      13 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            require_relative '../rails_helper'
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

            require_relative '../support/shared_context'
          
        3. 
        
        
      
        
        
          
      3. 
            
            

            

            
          
        4. 
        
        
      
        
        
          
      4. 
            1
            

            

            RSpec.describe 'New Password', type: :feature do
          
        5. 
        
        
      
        
        
          
      5. 
            3
            

            

              let(:user) { FactoryBot.create(:user) }
          
        6. 
        
        
      
        
        
          
      6. 
            
            

            

            
          
        7. 
        
        
      
        
        
          
      7. 
            1
            

            

              describe '#new_password' do
          
        8. 
        
        
      
        
        
          
      8. 
            1
            

            

                it 'change password' do
          
        9. 
        
        
      
        
        
          
      9. 
            1
            

            

                  user.reset_password('newPassword', 'newPassword')
          
        10. 
        
        
      
        
        
          
      10. 
            
            

            

            
          
        11. 
        
        
      
        
        
          
      11. 
            1
            

            

                  expect(user.password).to eq('newPassword')
          
        12. 
        
        
      
        
        
          
      12. 
            
            

            

                end
          
        13. 
        
        
      
        
        
          
      13. 
            
            

            

            
          
        14. 
        
        
      
        
        
          
      14. 
            1
            

            

                it 'not validate password' do
          
        15. 
        
        
      
        
        
          
      15. 
            1
            

            

                  visit new_user_password_path
          
        16. 
        
        
      
        
        
          
      16. 
            
            

            

            
          
        17. 
        
        
      
        
        
          
      17. 
            1
            

            

                  fill_in 'email', with: user.email
          
        18. 
        
        
      
        
        
          
      18. 
            
            

            

            
          
        19. 
        
        
      
        
        
          
      19. 
            1
            

            

                  click_on I18n.t('login.send_instructions')
          
        20. 
        
        
      
        
        
          
      20. 
            
            

            

            
          
        21. 
        
        
      
        
        
          
      21. 
            1
            

            

                  expect(page).to have_content(I18n.t('devise.passwords.send_instructions'))
          
        22. 
        
        
      
        
        
          
      22. 
            
            

            

                end
          
        23. 
        
        
      
        
        
          
      23. 
            
            

            

              end
          
        24. 
        
        
      
        
        
          
      24. 
            
            

            

            end
          
        25. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/feature/registration_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      29 relevant lines.
      29 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            RSpec.describe 'Registration', type: :feature do
          
        2. 
        
        
      
        
        
          
      2. 
            3
            

            

              let(:user) { create(:user, email: 'test.rspec@rspec.ua') }
          
        3. 
        
        
      
        
        
          
      3. 
            
            

            

            
          
        4. 
        
        
      
        
        
          
      4. 
            1
            

            

              describe '#sing_up' do
          
        5. 
        
        
      
        
        
          
      5. 
            1
            

            

                before do
          
        6. 
        
        
      
        
        
          
      6. 
            3
            

            

                  visit new_user_registration_path
          
        7. 
        
        
      
        
        
          
      7. 
            
            

            

                end
          
        8. 
        
        
      
        
        
          
      8. 
            
            

            

            
          
        9. 
        
        
      
        
        
          
      9. 
            1
            

            

                context 'when successfully sing_up' do
          
        10. 
        
        
      
        
        
          
      10. 
            1
            

            

                  it 'sing_up users' do
          
        11. 
        
        
      
        
        
          
      11. 
            1
            

            

                    within 'form', class: 'new_user', id: 'new_user' do
          
        12. 
        
        
      
        
        
          
      12. 
            1
            

            

                      fill_in 'user_email', with: 'email-test@rspec.com'
          
        13. 
        
        
      
        
        
          
      13. 
            1
            

            

                      fill_in 'user_password', with: user.password
          
        14. 
        
        
      
        
        
          
      14. 
            1
            

            

                      fill_in 'user_password_confirmation', with: user.password
          
        15. 
        
        
      
        
        
          
      15. 
            
            

            

            
          
        16. 
        
        
      
        
        
          
      16. 
            1
            

            

                      click_on I18n.t('header.sing_up')
          
        17. 
        
        
      
        
        
          
      17. 
            
            

            

                    end
          
        18. 
        
        
      
        
        
          
      18. 
            
            

            

            
          
        19. 
        
        
      
        
        
          
      19. 
            1
            

            

                    expect(page).to have_text I18n.t('devise.registrations.signed_up_but_unconfirmed')
          
        20. 
        
        
      
        
        
          
      20. 
            
            

            

                  end
          
        21. 
        
        
      
        
        
          
      21. 
            
            

            

                end
          
        22. 
        
        
      
        
        
          
      22. 
            
            

            

            
          
        23. 
        
        
      
        
        
          
      23. 
            1
            

            

                context 'when users is already exits' do
          
        24. 
        
        
      
        
        
          
      24. 
            1
            

            

                  it 'sing_up users' do
          
        25. 
        
        
      
        
        
          
      25. 
            1
            

            

                    within 'form', class: 'new_user', id: 'new_user' do
          
        26. 
        
        
      
        
        
          
      26. 
            1
            

            

                      fill_in 'user_email', with: user.email
          
        27. 
        
        
      
        
        
          
      27. 
            1
            

            

                      fill_in 'user_password', with: user.password
          
        28. 
        
        
      
        
        
          
      28. 
            1
            

            

                      fill_in 'user_password_confirmation', with: user.password
          
        29. 
        
        
      
        
        
          
      29. 
            
            

            

            
          
        30. 
        
        
      
        
        
          
      30. 
            1
            

            

                      click_on I18n.t('header.sing_up')
          
        31. 
        
        
      
        
        
          
      31. 
            
            

            

                    end
          
        32. 
        
        
      
        
        
          
      32. 
            
            

            

            
          
        33. 
        
        
      
        
        
          
      33. 
            1
            

            

                    expect(page).to have_text('Email has already been taken')
          
        34. 
        
        
      
        
        
          
      34. 
            
            

            

                  end
          
        35. 
        
        
      
        
        
          
      35. 
            
            

            

                end
          
        36. 
        
        
      
        
        
          
      36. 
            
            

            

            
          
        37. 
        
        
      
        
        
          
      37. 
            1
            

            

                context 'when unsuccessfully sing_up' do
          
        38. 
        
        
      
        
        
          
      38. 
            1
            

            

                  it 'didn`t sing_up' do
          
        39. 
        
        
      
        
        
          
      39. 
            1
            

            

                    within 'form', class: 'new_user', id: 'new_user' do
          
        40. 
        
        
      
        
        
          
      40. 
            1
            

            

                      fill_in 'user_email', with: FFaker::Internet.email
          
        41. 
        
        
      
        
        
          
      41. 
            1
            

            

                      fill_in 'user_password', with: 'password'
          
        42. 
        
        
      
        
        
          
      42. 
            1
            

            

                      fill_in 'user_password_confirmation', with: 'wrong'
          
        43. 
        
        
      
        
        
          
      43. 
            
            

            

            
          
        44. 
        
        
      
        
        
          
      44. 
            1
            

            

                      click_on I18n.t('header.sing_up')
          
        45. 
        
        
      
        
        
          
      45. 
            
            

            

                    end
          
        46. 
        
        
      
        
        
          
      46. 
            
            

            

            
          
        47. 
        
        
      
        
        
          
      47. 
            1
            

            

                    expect(page).to have_text '1 error prohibited this user from being saved'
          
        48. 
        
        
      
        
        
          
      48. 
            
            

            

                  end
          
        49. 
        
        
      
        
        
          
      49. 
            
            

            

                end
          
        50. 
        
        
      
        
        
          
      50. 
            
            

            

              end
          
        51. 
        
        
      
        
        
          
      51. 
            
            

            

            end
          
        52. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/feature/review_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      28 relevant lines.
      28 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            RSpec.describe 'Review', type: :feature do
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

              include_context 'with api request authentication helper methods'
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

              include_context 'with api request global before and after hooks'
          
        4. 
        
        
      
        
        
          
      4. 
            
            

            

            
          
        5. 
        
        
      
        
        
          
      5. 
            3
            

            

              let(:user) { create(:user).decorate }
          
        6. 
        
        
      
        
        
          
      6. 
            3
            

            

              let(:book) { create(:book).decorate }
          
        7. 
        
        
      
        
        
          
      7. 
            
            

            

            
          
        8. 
        
        
      
        
        
          
      8. 
            1
            

            

              before do
          
        9. 
        
        
      
        
        
          
      9. 
            2
            

            

                sign_in(user)
          
        10. 
        
        
      
        
        
          
      10. 
            
            

            

            
          
        11. 
        
        
      
        
        
          
      11. 
            2
            

            

                visit book_path(book)
          
        12. 
        
        
      
        
        
          
      12. 
            
            

            

              end
          
        13. 
        
        
      
        
        
          
      13. 
            
            

            

            
          
        14. 
        
        
      
        
        
          
      14. 
            1
            

            

              shared_examples 'review' do
          
        15. 
        
        
      
        
        
          
      15. 
            2
            

            

                it 'review' do
          
        16. 
        
        
      
        
        
          
      16. 
            2
            

            

                  find('i', id: rating).click
          
        17. 
        
        
      
        
        
          
      17. 
            
            

            

            
          
        18. 
        
        
      
        
        
          
      18. 
            2
            

            

                  fill_in :title, with: FFaker::Lorem.sentence(title_words)
          
        19. 
        
        
      
        
        
          
      19. 
            2
            

            

                  fill_in :body, with: FFaker::Lorem.sentence(body_words)
          
        20. 
        
        
      
        
        
          
      20. 
            
            

            

            
          
        21. 
        
        
      
        
        
          
      21. 
            2
            

            

                  click_on I18n.t('review.post')
          
        22. 
        
        
      
        
        
          
      22. 
            
            

            

            
          
        23. 
        
        
      
        
        
          
      23. 
            2
            

            

                  expect(page).to have_content(result)
          
        24. 
        
        
      
        
        
          
      24. 
            
            

            

                end
          
        25. 
        
        
      
        
        
          
      25. 
            
            

            

              end
          
        26. 
        
        
      
        
        
          
      26. 
            
            

            

            
          
        27. 
        
        
      
        
        
          
      27. 
            1
            

            

              describe '#post review', js: true do
          
        28. 
        
        
      
        
        
          
      28. 
            1
            

            

                context 'when review posted' do
          
        29. 
        
        
      
        
        
          
      29. 
            2
            

            

                  let(:rating) { "star#{rand(1..5)}" }
          
        30. 
        
        
      
        
        
          
      30. 
            2
            

            

                  let(:title_words) { 3 }
          
        31. 
        
        
      
        
        
          
      31. 
            2
            

            

                  let(:body_words) { 5 }
          
        32. 
        
        
      
        
        
          
      32. 
            2
            

            

                  let(:result) { user.name_or_email }
          
        33. 
        
        
      
        
        
          
      33. 
            
            

            

            
          
        34. 
        
        
      
        
        
          
      34. 
            1
            

            

                  include_examples 'review'
          
        35. 
        
        
      
        
        
          
      35. 
            
            

            

                end
          
        36. 
        
        
      
        
        
          
      36. 
            
            

            

            
          
        37. 
        
        
      
        
        
          
      37. 
            1
            

            

                context 'when review not been posted' do
          
        38. 
        
        
      
        
        
          
      38. 
            2
            

            

                  let(:rating) { "star#{rand(1..5)}" }
          
        39. 
        
        
      
        
        
          
      39. 
            2
            

            

                  let(:title_words) { 80 }
          
        40. 
        
        
      
        
        
          
      40. 
            2
            

            

                  let(:body_words) { 30 }
          
        41. 
        
        
      
        
        
          
      41. 
            2
            

            

                  let(:result) { 'Title is too long (maximum is 80 characters)' }
          
        42. 
        
        
      
        
        
          
      42. 
            
            

            

            
          
        43. 
        
        
      
        
        
          
      43. 
            1
            

            

                  include_examples 'review'
          
        44. 
        
        
      
        
        
          
      44. 
            
            

            

                end
          
        45. 
        
        
      
        
        
          
      45. 
            
            

            

              end
          
        46. 
        
        
      
        
        
          
      46. 
            
            

            

            end
          
        47. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/feature/settings_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      34 relevant lines.
      34 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            RSpec.describe 'Settings', type: :feature do
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

              include_context 'with api request authentication helper methods'
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

              include_context 'with api request global before and after hooks'
          
        4. 
        
        
      
        
        
          
      4. 
            
            

            

            
          
        5. 
        
        
      
        
        
          
      5. 
            4
            

            

              let(:user) { create(:user) }
          
        6. 
        
        
      
        
        
          
      6. 
            
            

            

            
          
        7. 
        
        
      
        
        
          
      7. 
            1
            

            

              before do
          
        8. 
        
        
      
        
        
          
      8. 
            3
            

            

                sign_in(user)
          
        9. 
        
        
      
        
        
          
      9. 
            
            

            

            
          
        10. 
        
        
      
        
        
          
      10. 
            3
            

            

                visit edit_user_path(user.id)
          
        11. 
        
        
      
        
        
          
      11. 
            
            

            

            
          
        12. 
        
        
      
        
        
          
      12. 
            3
            

            

                click_link I18n.t('settings.privacy')
          
        13. 
        
        
      
        
        
          
      13. 
            
            

            

              end
          
        14. 
        
        
      
        
        
          
      14. 
            
            

            

            
          
        15. 
        
        
      
        
        
          
      15. 
            1
            

            

              describe '#email_change' do
          
        16. 
        
        
      
        
        
          
      16. 
            1
            

            

                it 'change email' do
          
        17. 
        
        
      
        
        
          
      17. 
            1
            

            

                  within('div', id: 'email') do
          
        18. 
        
        
      
        
        
          
      18. 
            1
            

            

                    fill_in :email, with: FFaker::Internet.email
          
        19. 
        
        
      
        
        
          
      19. 
            
            

            

            
          
        20. 
        
        
      
        
        
          
      20. 
            1
            

            

                    click_on I18n.t('settings.save')
          
        21. 
        
        
      
        
        
          
      21. 
            
            

            

                  end
          
        22. 
        
        
      
        
        
          
      22. 
            
            

            

            
          
        23. 
        
        
      
        
        
          
      23. 
            1
            

            

                  user.confirm
          
        24. 
        
        
      
        
        
          
      24. 
            
            

            

            
          
        25. 
        
        
      
        
        
          
      25. 
            1
            

            

                  expect(page).to have_content(I18n.t('settings.message.update'))
          
        26. 
        
        
      
        
        
          
      26. 
            
            

            

                end
          
        27. 
        
        
      
        
        
          
      27. 
            
            

            

              end
          
        28. 
        
        
      
        
        
          
      28. 
            
            

            

            
          
        29. 
        
        
      
        
        
          
      29. 
            1
            

            

              describe '#password_change' do
          
        30. 
        
        
      
        
        
          
      30. 
            1
            

            

                context 'when error' do
          
        31. 
        
        
      
        
        
          
      31. 
            1
            

            

                  it 'didnt change password' do
          
        32. 
        
        
      
        
        
          
      32. 
            1
            

            

                    within('div', id: 'password') do
          
        33. 
        
        
      
        
        
          
      33. 
            1
            

            

                      fill_in :current_password, with: user.password
          
        34. 
        
        
      
        
        
          
      34. 
            1
            

            

                      fill_in :password, with: 'newPassword'
          
        35. 
        
        
      
        
        
          
      35. 
            1
            

            

                      fill_in :password_confirmation, with: 'incorrectPassword'
          
        36. 
        
        
      
        
        
          
      36. 
            
            

            

            
          
        37. 
        
        
      
        
        
          
      37. 
            1
            

            

                      click_on I18n.t('settings.save')
          
        38. 
        
        
      
        
        
          
      38. 
            
            

            

                    end
          
        39. 
        
        
      
        
        
          
      39. 
            
            

            

            
          
        40. 
        
        
      
        
        
          
      40. 
            1
            

            

                    user.confirm
          
        41. 
        
        
      
        
        
          
      41. 
            
            

            

            
          
        42. 
        
        
      
        
        
          
      42. 
            1
            

            

                    expect(page).to have_content(I18n.t('settings.error.error'))
          
        43. 
        
        
      
        
        
          
      43. 
            
            

            

                  end
          
        44. 
        
        
      
        
        
          
      44. 
            
            

            

                end
          
        45. 
        
        
      
        
        
          
      45. 
            
            

            

            
          
        46. 
        
        
      
        
        
          
      46. 
            1
            

            

                context 'when successful' do
          
        47. 
        
        
      
        
        
          
      47. 
            1
            

            

                  it 'didnt change password' do
          
        48. 
        
        
      
        
        
          
      48. 
            1
            

            

                    within('div', id: 'password') do
          
        49. 
        
        
      
        
        
          
      49. 
            1
            

            

                      fill_in :current_password, with: user.password
          
        50. 
        
        
      
        
        
          
      50. 
            1
            

            

                      fill_in :password, with: 'newPassword'
          
        51. 
        
        
      
        
        
          
      51. 
            1
            

            

                      fill_in :password_confirmation, with: 'newPassword'
          
        52. 
        
        
      
        
        
          
      52. 
            
            

            

            
          
        53. 
        
        
      
        
        
          
      53. 
            1
            

            

                      click_on I18n.t('settings.save')
          
        54. 
        
        
      
        
        
          
      54. 
            
            

            

                    end
          
        55. 
        
        
      
        
        
          
      55. 
            
            

            

            
          
        56. 
        
        
      
        
        
          
      56. 
            1
            

            

                    user.confirm
          
        57. 
        
        
      
        
        
          
      57. 
            
            

            

            
          
        58. 
        
        
      
        
        
          
      58. 
            1
            

            

                    expect(page).to have_content(I18n.t('devise.failure.unauthenticated'))
          
        59. 
        
        
      
        
        
          
      59. 
            
            

            

                  end
          
        60. 
        
        
      
        
        
          
      60. 
            
            

            

                end
          
        61. 
        
        
      
        
        
          
      61. 
            
            

            

              end
          
        62. 
        
        
      
        
        
          
      62. 
            
            

            

            end
          
        63. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/feature/shipping_spec.rb
      
    
      
      
  73.08%


      lines covered
    
      

    

    
      
      26 relevant lines.
      19 lines covered and
      7 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            RSpec.describe 'Shipping', type: :feature do
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

              include_context 'with api request authentication helper methods'
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

              include_context 'with api request global before and after hooks'
          
        4. 
        
        
      
        
        
          
      4. 
            
            

            

            
          
        5. 
        
        
      
        
        
          
      5. 
            2
            

            

              let(:user) { FactoryBot.create(:user) }
          
        6. 
        
        
      
        
        
          
      6. 
            1
            

            

              let(:attributes_for) { attributes_for(:shipping) }
          
        7. 
        
        
      
        
        
          
      7. 
            
            

            

            
          
        8. 
        
        
      
        
        
          
      8. 
            1
            

            

              describe '#fill_in', js: true do
          
        9. 
        
        
      
        
        
          
      9. 
            1
            

            

                it 'fill in shipping' do
          
        10. 
        
        
      
        
        
          
      10. 
            1
            

            

                  sign_in(user)
          
        11. 
        
        
      
        
        
          
      11. 
            
            

            

            
          
        12. 
        
        
      
        
        
          
      12. 
            1
            

            

                  visit edit_user_path(user.id)
          
        13. 
        
        
      
        
        
          
      13. 
            
            

            

            
          
        14. 
        
        
      
        
        
          
      14. 
            1
            

            

                  within('div#shipping.col-md-5.mb-40') do
          
        15. 
        
        
      
        
        
          
      15. 
            1
            

            

                    find_all('div', class: 'form-group')[0] do
          
        16. 
        
        
      
        
        
          
      16. 
            
            

            

                      fill_in :first_name, with: attributes_for[:first_name]
          
        17. 
        
        
      
        
        
          
      17. 
            
            

            

                    end
          
        18. 
        
        
      
        
        
          
      18. 
            1
            

            

                    find_all('div', class: 'form-group')[1] do
          
        19. 
        
        
      
        
        
          
      19. 
            
            

            

                      fill_in :last_name, with: attributes_for[:last_name]
          
        20. 
        
        
      
        
        
          
      20. 
            
            

            

                    end
          
        21. 
        
        
      
        
        
          
      21. 
            1
            

            

                    find_all('div', class: 'form-group')[2] do
          
        22. 
        
        
      
        
        
          
      22. 
            
            

            

                      fill_in :address, with: attributes_for[:address]
          
        23. 
        
        
      
        
        
          
      23. 
            
            

            

                    end
          
        24. 
        
        
      
        
        
          
      24. 
            1
            

            

                    find_all('div', class: 'form-group')[3] do
          
        25. 
        
        
      
        
        
          
      25. 
            
            

            

                      fill_in :city, with: attributes_for[:city]
          
        26. 
        
        
      
        
        
          
      26. 
            
            

            

                    end
          
        27. 
        
        
      
        
        
          
      27. 
            1
            

            

                    find_all('div', class: 'form-group')[4] do
          
        28. 
        
        
      
        
        
          
      28. 
            
            

            

                      fill_in :zip, with: attributes_for[:zip]
          
        29. 
        
        
      
        
        
          
      29. 
            
            

            

                    end
          
        30. 
        
        
      
        
        
          
      30. 
            1
            

            

                    find_all('div', class: 'form-group')[5] do
          
        31. 
        
        
      
        
        
          
      31. 
            
            

            

                      fill_in :country, with: attributes_for[:country]
          
        32. 
        
        
      
        
        
          
      32. 
            
            

            

                    end
          
        33. 
        
        
      
        
        
          
      33. 
            1
            

            

                    find_all('div', class: 'form-group')[6] do
          
        34. 
        
        
      
        
        
          
      34. 
            
            

            

                      fill_in :phone, with: attributes_for[:phone]
          
        35. 
        
        
      
        
        
          
      35. 
            
            

            

                    end
          
        36. 
        
        
      
        
        
          
      36. 
            1
            

            

                    click_on I18n.t('settings.save')
          
        37. 
        
        
      
        
        
          
      37. 
            
            

            

                  end
          
        38. 
        
        
      
        
        
          
      38. 
            
            

            

            
          
        39. 
        
        
      
        
        
          
      39. 
            1
            

            

                  expect(page).to have_content(I18n.t('settings.message.update'))
          
        40. 
        
        
      
        
        
          
      40. 
            
            

            

                end
          
        41. 
        
        
      
        
        
          
      41. 
            
            

            

              end
          
        42. 
        
        
      
        
        
          
      42. 
            
            

            

            end
          
        43. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/feature/user_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      42 relevant lines.
      42 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            RSpec.describe 'User', type: :feature do
          
        2. 
        
        
      
        
        
          
      2. 
            2
            

            

              let(:user) { build(:user, email: 'test.rspec@rspec.ua') }
          
        3. 
        
        
      
        
        
          
      3. 
            3
            

            

              let(:user_second) { create(:user, email: 'test.rspec-test@rspec.ua') }
          
        4. 
        
        
      
        
        
          
      4. 
            
            

            

            
          
        5. 
        
        
      
        
        
          
      5. 
            1
            

            

              describe '#sing_up' do
          
        6. 
        
        
      
        
        
          
      6. 
            1
            

            

                context 'when successfully sing_up' do
          
        7. 
        
        
      
        
        
          
      7. 
            1
            

            

                  before do
          
        8. 
        
        
      
        
        
          
      8. 
            1
            

            

                    visit new_user_registration_path
          
        9. 
        
        
      
        
        
          
      9. 
            
            

            

            
          
        10. 
        
        
      
        
        
          
      10. 
            1
            

            

                    within 'form', class: 'new_user', id: 'new_user' do
          
        11. 
        
        
      
        
        
          
      11. 
            1
            

            

                      fill_in 'user_email', with: user.email
          
        12. 
        
        
      
        
        
          
      12. 
            1
            

            

                      fill_in 'user_password', with: user.password
          
        13. 
        
        
      
        
        
          
      13. 
            1
            

            

                      fill_in 'user_password_confirmation', with: user.password
          
        14. 
        
        
      
        
        
          
      14. 
            
            

            

            
          
        15. 
        
        
      
        
        
          
      15. 
            1
            

            

                      click_on I18n.t('header.sing_up')
          
        16. 
        
        
      
        
        
          
      16. 
            
            

            

                    end
          
        17. 
        
        
      
        
        
          
      17. 
            
            

            

                  end
          
        18. 
        
        
      
        
        
          
      18. 
            
            

            

            
          
        19. 
        
        
      
        
        
          
      19. 
            1
            

            

                  it 'sing_up user' do
          
        20. 
        
        
      
        
        
          
      20. 
            1
            

            

                    expect(page).to have_text I18n.t('devise.registrations.signed_up_but_unconfirmed')
          
        21. 
        
        
      
        
        
          
      21. 
            
            

            

                  end
          
        22. 
        
        
      
        
        
          
      22. 
            
            

            

                end
          
        23. 
        
        
      
        
        
          
      23. 
            
            

            

            
          
        24. 
        
        
      
        
        
          
      24. 
            1
            

            

                context 'when unsuccessfully sing_up' do
          
        25. 
        
        
      
        
        
          
      25. 
            1
            

            

                  it 'didn`t sing_up' do
          
        26. 
        
        
      
        
        
          
      26. 
            1
            

            

                    visit new_user_registration_path
          
        27. 
        
        
      
        
        
          
      27. 
            
            

            

            
          
        28. 
        
        
      
        
        
          
      28. 
            1
            

            

                    within 'form', class: 'new_user', id: 'new_user' do
          
        29. 
        
        
      
        
        
          
      29. 
            1
            

            

                      fill_in 'user_email', with: FFaker::Internet.email
          
        30. 
        
        
      
        
        
          
      30. 
            1
            

            

                      fill_in 'user_password', with: 'wrong'
          
        31. 
        
        
      
        
        
          
      31. 
            1
            

            

                      fill_in 'user_password_confirmation', with: 'wrong'
          
        32. 
        
        
      
        
        
          
      32. 
            
            

            

            
          
        33. 
        
        
      
        
        
          
      33. 
            1
            

            

                      click_on I18n.t('header.sing_up')
          
        34. 
        
        
      
        
        
          
      34. 
            
            

            

                    end
          
        35. 
        
        
      
        
        
          
      35. 
            
            

            

            
          
        36. 
        
        
      
        
        
          
      36. 
            1
            

            

                    expect(page).to have_text '1 error prohibited this user from being saved'
          
        37. 
        
        
      
        
        
          
      37. 
            
            

            

                  end
          
        38. 
        
        
      
        
        
          
      38. 
            
            

            

                end
          
        39. 
        
        
      
        
        
          
      39. 
            
            

            

              end
          
        40. 
        
        
      
        
        
          
      40. 
            
            

            

            
          
        41. 
        
        
      
        
        
          
      41. 
            1
            

            

              describe '#login' do
          
        42. 
        
        
      
        
        
          
      42. 
            1
            

            

                before do
          
        43. 
        
        
      
        
        
          
      43. 
            2
            

            

                  user_second.confirm
          
        44. 
        
        
      
        
        
          
      44. 
            
            

            

                end
          
        45. 
        
        
      
        
        
          
      45. 
            
            

            

            
          
        46. 
        
        
      
        
        
          
      46. 
            1
            

            

                context 'when successfully login' do
          
        47. 
        
        
      
        
        
          
      47. 
            1
            

            

                  it 'login' do
          
        48. 
        
        
      
        
        
          
      48. 
            1
            

            

                    visit new_user_session_path
          
        49. 
        
        
      
        
        
          
      49. 
            
            

            

            
          
        50. 
        
        
      
        
        
          
      50. 
            1
            

            

                    within 'form', class: 'new_user', id: 'new_user' do
          
        51. 
        
        
      
        
        
          
      51. 
            1
            

            

                      fill_in 'user_email', with: user_second.email
          
        52. 
        
        
      
        
        
          
      52. 
            1
            

            

                      fill_in 'user_password', with: user_second.password
          
        53. 
        
        
      
        
        
          
      53. 
            
            

            

            
          
        54. 
        
        
      
        
        
          
      54. 
            1
            

            

                      click_on I18n.t('header.log_in')
          
        55. 
        
        
      
        
        
          
      55. 
            
            

            

                    end
          
        56. 
        
        
      
        
        
          
      56. 
            
            

            

            
          
        57. 
        
        
      
        
        
          
      57. 
            1
            

            

                    expect(page).to have_text I18n.t('devise.sessions.signed_in')
          
        58. 
        
        
      
        
        
          
      58. 
            
            

            

                  end
          
        59. 
        
        
      
        
        
          
      59. 
            
            

            

                end
          
        60. 
        
        
      
        
        
          
      60. 
            
            

            

            
          
        61. 
        
        
      
        
        
          
      61. 
            1
            

            

                context 'when unsuccessfully login' do
          
        62. 
        
        
      
        
        
          
      62. 
            1
            

            

                  it 'didn`t login' do
          
        63. 
        
        
      
        
        
          
      63. 
            1
            

            

                    visit new_user_session_path
          
        64. 
        
        
      
        
        
          
      64. 
            
            

            

            
          
        65. 
        
        
      
        
        
          
      65. 
            1
            

            

                    within 'form', class: 'new_user', id: 'new_user' do
          
        66. 
        
        
      
        
        
          
      66. 
            1
            

            

                      fill_in 'user_email', with: user_second.email
          
        67. 
        
        
      
        
        
          
      67. 
            1
            

            

                      fill_in 'user_password', with: 'wrong_password'
          
        68. 
        
        
      
        
        
          
      68. 
            
            

            

            
          
        69. 
        
        
      
        
        
          
      69. 
            1
            

            

                      click_on I18n.t('header.log_in')
          
        70. 
        
        
      
        
        
          
      70. 
            
            

            

                    end
          
        71. 
        
        
      
        
        
          
      71. 
            
            

            

            
          
        72. 
        
        
      
        
        
          
      72. 
            1
            

            

                    expect(page).to have_text 'Invalid Email or password.'
          
        73. 
        
        
      
        
        
          
      73. 
            
            

            

                  end
          
        74. 
        
        
      
        
        
          
      74. 
            
            

            

                end
          
        75. 
        
        
      
        
        
          
      75. 
            
            

            

              end
          
        76. 
        
        
      
        
        
          
      76. 
            
            

            

            end
          
        77. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/models/admin_user_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      5 relevant lines.
      5 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            require 'rails_helper'
          
        2. 
        
        
      
        
        
          
      2. 
            
            

            

            
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

            RSpec.describe AdminUser, type: :model do
          
        4. 
        
        
      
        
        
          
      4. 
            1
            

            

              context 'when validations' do
          
        5. 
        
        
      
        
        
          
      5. 
            2
            

            

                it { is_expected.to validate_presence_of(:email) }
          
        6. 
        
        
      
        
        
          
      6. 
            2
            

            

                it { is_expected.to validate_presence_of(:password) }
          
        7. 
        
        
      
        
        
          
      7. 
            
            

            

              end
          
        8. 
        
        
      
        
        
          
      8. 
            
            

            

            end
          
        9. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/models/author_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      8 relevant lines.
      8 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            RSpec.describe Author, type: :model do
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

              describe 'author' do
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

                context 'when validations' do
          
        4. 
        
        
      
        
        
          
      4. 
            2
            

            

                  it { is_expected.to validate_presence_of(:first_name) }
          
        5. 
        
        
      
        
        
          
      5. 
            2
            

            

                  it { is_expected.to validate_presence_of(:last_name) }
          
        6. 
        
        
      
        
        
          
      6. 
            
            

            

                end
          
        7. 
        
        
      
        
        
          
      7. 
            
            

            

            
          
        8. 
        
        
      
        
        
          
      8. 
            1
            

            

                context 'when associations' do
          
        9. 
        
        
      
        
        
          
      9. 
            2
            

            

                  it { is_expected.to have_many(:authors_books).dependent(:destroy) }
          
        10. 
        
        
      
        
        
          
      10. 
            2
            

            

                  it { is_expected.to have_many(:books).through(:authors_books) }
          
        11. 
        
        
      
        
        
          
      11. 
            
            

            

                end
          
        12. 
        
        
      
        
        
          
      12. 
            
            

            

              end
          
        13. 
        
        
      
        
        
          
      13. 
            
            

            

            end
          
        14. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/models/authors_book_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      8 relevant lines.
      8 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            RSpec.describe AuthorsBook, type: :model do
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

              describe 'authors_book' do
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

                context 'when validations' do
          
        4. 
        
        
      
        
        
          
      4. 
            2
            

            

                  it { is_expected.to validate_presence_of(:book) }
          
        5. 
        
        
      
        
        
          
      5. 
            2
            

            

                  it { is_expected.to validate_presence_of(:author) }
          
        6. 
        
        
      
        
        
          
      6. 
            
            

            

                end
          
        7. 
        
        
      
        
        
          
      7. 
            
            

            

            
          
        8. 
        
        
      
        
        
          
      8. 
            1
            

            

                context 'when associations' do
          
        9. 
        
        
      
        
        
          
      9. 
            2
            

            

                  it { is_expected.to belong_to(:author) }
          
        10. 
        
        
      
        
        
          
      10. 
            2
            

            

                  it { is_expected.to belong_to(:book) }
          
        11. 
        
        
      
        
        
          
      11. 
            
            

            

                end
          
        12. 
        
        
      
        
        
          
      12. 
            
            

            

              end
          
        13. 
        
        
      
        
        
          
      13. 
            
            

            

            end
          
        14. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/models/billing_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      20 relevant lines.
      20 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            RSpec.describe Billing, type: :model do
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

              describe 'billing' do
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

                context 'when validations' do
          
        4. 
        
        
      
        
        
          
      4. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::Name.first_name).for(:first_name) }
          
        5. 
        
        
      
        
        
          
      5. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::Name.first_name).for(:last_name) }
          
        6. 
        
        
      
        
        
          
      6. 
            2
            

            

                  it { is_expected.to allow_values('+919367788755', '8989829304', '+16308520397', '786-307-3615').for(:phone) }
          
        7. 
        
        
      
        
        
          
      7. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::AddressUK.country).for(:country) }
          
        8. 
        
        
      
        
        
          
      8. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::AddressUK.city).for(:city) }
          
        9. 
        
        
      
        
        
          
      9. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::AddressUA.zip_code).for(:zip) }
          
        10. 
        
        
      
        
        
          
      10. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::Address.street_address).for(:address) }
          
        11. 
        
        
      
        
        
          
      11. 
            
            

            

                end
          
        12. 
        
        
      
        
        
          
      12. 
            
            

            

            
          
        13. 
        
        
      
        
        
          
      13. 
            1
            

            

                context 'when not validations' do
          
        14. 
        
        
      
        
        
          
      14. 
            2
            

            

                  it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:first_name) }
          
        15. 
        
        
      
        
        
          
      15. 
            2
            

            

                  it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:last_name) }
          
        16. 
        
        
      
        
        
          
      16. 
            2
            

            

                  it { is_expected.not_to allow_values('789', '123765', '1-1-1', '+982').for(:phone) }
          
        17. 
        
        
      
        
        
          
      17. 
            2
            

            

                  it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:country) }
          
        18. 
        
        
      
        
        
          
      18. 
            2
            

            

                  it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:city) }
          
        19. 
        
        
      
        
        
          
      19. 
            2
            

            

                  it { is_expected.not_to allow_values('1' * Constants::VALIDATES_ZIP_LENGTH_MAX.next).for(:zip) }
          
        20. 
        
        
      
        
        
          
      20. 
            2
            

            

                  it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:address) }
          
        21. 
        
        
      
        
        
          
      21. 
            
            

            

                end
          
        22. 
        
        
      
        
        
          
      22. 
            
            

            

            
          
        23. 
        
        
      
        
        
          
      23. 
            1
            

            

                context 'when associations' do
          
        24. 
        
        
      
        
        
          
      24. 
            2
            

            

                  it { is_expected.to belong_to(:user) }
          
        25. 
        
        
      
        
        
          
      25. 
            
            

            

                end
          
        26. 
        
        
      
        
        
          
      26. 
            
            

            

              end
          
        27. 
        
        
      
        
        
          
      27. 
            
            

            

            end
          
        28. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/models/book_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      16 relevant lines.
      16 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            RSpec.describe Book, type: :model do
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

              describe 'books' do
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

                context 'when validations' do
          
        4. 
        
        
      
        
        
          
      4. 
            2
            

            

                  it { is_expected.to validate_presence_of(:title) }
          
        5. 
        
        
      
        
        
          
      5. 
            2
            

            

                  it { is_expected.to validate_presence_of(:description) }
          
        6. 
        
        
      
        
        
          
      6. 
            2
            

            

                  it { is_expected.to allow_values(Constants::MIN_PRICE_IN_CENTS, Constants::MAX_PRICE_IN_CENTS).for(:price_cents) }
          
        7. 
        
        
      
        
        
          
      7. 
            2
            

            

                  it { is_expected.to validate_presence_of(:year_of_publication) }
          
        8. 
        
        
      
        
        
          
      8. 
            2
            

            

                  it { is_expected.to validate_presence_of(:quantity) }
          
        9. 
        
        
      
        
        
          
      9. 
            2
            

            

                  it { is_expected.to validate_presence_of(:materials) }
          
        10. 
        
        
      
        
        
          
      10. 
            2
            

            

                  it { is_expected.to validate_presence_of(:dimensions) }
          
        11. 
        
        
      
        
        
          
      11. 
            
            

            

                end
          
        12. 
        
        
      
        
        
          
      12. 
            
            

            

            
          
        13. 
        
        
      
        
        
          
      13. 
            1
            

            

                context 'when associations' do
          
        14. 
        
        
      
        
        
          
      14. 
            2
            

            

                  it { is_expected.to have_many(:authors_books).dependent(:destroy) }
          
        15. 
        
        
      
        
        
          
      15. 
            2
            

            

                  it { is_expected.to have_many(:authors).through(:authors_books) }
          
        16. 
        
        
      
        
        
          
      16. 
            
            

            

            
          
        17. 
        
        
      
        
        
          
      17. 
            2
            

            

                  it { is_expected.to have_many(:books_categories).dependent(:destroy) }
          
        18. 
        
        
      
        
        
          
      18. 
            2
            

            

                  it { is_expected.to have_many(:categories).through(:books_categories) }
          
        19. 
        
        
      
        
        
          
      19. 
            
            

            

            
          
        20. 
        
        
      
        
        
          
      20. 
            2
            

            

                  it { is_expected.to have_many(:reviews).dependent(:destroy) }
          
        21. 
        
        
      
        
        
          
      21. 
            
            

            

                end
          
        22. 
        
        
      
        
        
          
      22. 
            
            

            

              end
          
        23. 
        
        
      
        
        
          
      23. 
            
            

            

            end
          
        24. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/models/books_category_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      8 relevant lines.
      8 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            RSpec.describe BooksCategory, type: :model do
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

              describe 'books_categories' do
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

                context 'when validations' do
          
        4. 
        
        
      
        
        
          
      4. 
            2
            

            

                  it { is_expected.to validate_presence_of(:book) }
          
        5. 
        
        
      
        
        
          
      5. 
            2
            

            

                  it { is_expected.to validate_presence_of(:category) }
          
        6. 
        
        
      
        
        
          
      6. 
            
            

            

                end
          
        7. 
        
        
      
        
        
          
      7. 
            
            

            

            
          
        8. 
        
        
      
        
        
          
      8. 
            1
            

            

                context 'when associations' do
          
        9. 
        
        
      
        
        
          
      9. 
            2
            

            

                  it { is_expected.to belong_to(:category) }
          
        10. 
        
        
      
        
        
          
      10. 
            2
            

            

                  it { is_expected.to belong_to(:book) }
          
        11. 
        
        
      
        
        
          
      11. 
            
            

            

                end
          
        12. 
        
        
      
        
        
          
      12. 
            
            

            

              end
          
        13. 
        
        
      
        
        
          
      13. 
            
            

            

            end
          
        14. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/models/category_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      7 relevant lines.
      7 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            RSpec.describe Category, type: :model do
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

              describe 'category' do
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

                context 'when validations' do
          
        4. 
        
        
      
        
        
          
      4. 
            2
            

            

                  it { is_expected.to validate_presence_of(:name) }
          
        5. 
        
        
      
        
        
          
      5. 
            
            

            

                end
          
        6. 
        
        
      
        
        
          
      6. 
            
            

            

            
          
        7. 
        
        
      
        
        
          
      7. 
            1
            

            

                context 'when associations' do
          
        8. 
        
        
      
        
        
          
      8. 
            2
            

            

                  it { is_expected.to have_many(:books_categories).dependent(:destroy) }
          
        9. 
        
        
      
        
        
          
      9. 
            2
            

            

                  it { is_expected.to have_many(:books).through(:books_categories) }
          
        10. 
        
        
      
        
        
          
      10. 
            
            

            

                end
          
        11. 
        
        
      
        
        
          
      11. 
            
            

            

              end
          
        12. 
        
        
      
        
        
          
      12. 
            
            

            

            end
          
        13. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/models/review_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      14 relevant lines.
      14 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            require 'rails_helper'
          
        2. 
        
        
      
        
        
          
      2. 
            
            

            

            
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

            RSpec.describe Review, type: :model do
          
        4. 
        
        
      
        
        
          
      4. 
            1
            

            

              describe 'review' do
          
        5. 
        
        
      
        
        
          
      5. 
            1
            

            

                context 'when validations' do
          
        6. 
        
        
      
        
        
          
      6. 
            2
            

            

                  it { is_expected.to validate_presence_of(:title) }
          
        7. 
        
        
      
        
        
          
      7. 
            2
            

            

                  it { is_expected.to validate_presence_of(:body) }
          
        8. 
        
        
      
        
        
          
      8. 
            2
            

            

                  it { is_expected.to validate_presence_of(:rating) }
          
        9. 
        
        
      
        
        
          
      9. 
            2
            

            

                  it { is_expected.to validate_presence_of(:verified) }
          
        10. 
        
        
      
        
        
          
      10. 
            2
            

            

                  it { is_expected.to allow_values('a' * Constants::VALIDATES_TITLE_LENGTH_MAX).for(:title) }
          
        11. 
        
        
      
        
        
          
      11. 
            2
            

            

                  it { is_expected.to allow_values('a' * Constants::VALIDATES_TEXT_LENGTH_MAX).for(:body) }
          
        12. 
        
        
      
        
        
          
      12. 
            2
            

            

                  it { is_expected.to allow_values(1, 2, 3, 4, 5).for(:rating) }
          
        13. 
        
        
      
        
        
          
      13. 
            
            

            

                end
          
        14. 
        
        
      
        
        
          
      14. 
            
            

            

            
          
        15. 
        
        
      
        
        
          
      15. 
            1
            

            

                context 'when associations' do
          
        16. 
        
        
      
        
        
          
      16. 
            2
            

            

                  it { is_expected.to belong_to(:book) }
          
        17. 
        
        
      
        
        
          
      17. 
            2
            

            

                  it { is_expected.to belong_to(:user) }
          
        18. 
        
        
      
        
        
          
      18. 
            
            

            

                end
          
        19. 
        
        
      
        
        
          
      19. 
            
            

            

              end
          
        20. 
        
        
      
        
        
          
      20. 
            
            

            

            end
          
        21. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/models/shipping_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      20 relevant lines.
      20 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            RSpec.describe Shipping, type: :model do
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

              describe 'shipping' do
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

                context 'when validations' do
          
        4. 
        
        
      
        
        
          
      4. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::Name.first_name).for(:first_name) }
          
        5. 
        
        
      
        
        
          
      5. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::Name.first_name).for(:last_name) }
          
        6. 
        
        
      
        
        
          
      6. 
            2
            

            

                  it { is_expected.to allow_values('+919367788755', '8989829304', '+16308520397', '786-307-3615').for(:phone) }
          
        7. 
        
        
      
        
        
          
      7. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::AddressUK.country).for(:country) }
          
        8. 
        
        
      
        
        
          
      8. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::AddressUK.city).for(:city) }
          
        9. 
        
        
      
        
        
          
      9. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::AddressUA.zip_code).for(:zip) }
          
        10. 
        
        
      
        
        
          
      10. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::Address.street_address).for(:address) }
          
        11. 
        
        
      
        
        
          
      11. 
            
            

            

                end
          
        12. 
        
        
      
        
        
          
      12. 
            
            

            

            
          
        13. 
        
        
      
        
        
          
      13. 
            1
            

            

                context 'when not validations' do
          
        14. 
        
        
      
        
        
          
      14. 
            2
            

            

                  it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:first_name) }
          
        15. 
        
        
      
        
        
          
      15. 
            2
            

            

                  it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:last_name) }
          
        16. 
        
        
      
        
        
          
      16. 
            2
            

            

                  it { is_expected.not_to allow_values('789', '123765', '1-1-1', '+982').for(:phone) }
          
        17. 
        
        
      
        
        
          
      17. 
            2
            

            

                  it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:country) }
          
        18. 
        
        
      
        
        
          
      18. 
            2
            

            

                  it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:city) }
          
        19. 
        
        
      
        
        
          
      19. 
            2
            

            

                  it { is_expected.not_to allow_values('1' * Constants::VALIDATES_ZIP_LENGTH_MAX.next).for(:zip) }
          
        20. 
        
        
      
        
        
          
      20. 
            2
            

            

                  it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:address) }
          
        21. 
        
        
      
        
        
          
      21. 
            
            

            

                end
          
        22. 
        
        
      
        
        
          
      22. 
            
            

            

            
          
        23. 
        
        
      
        
        
          
      23. 
            1
            

            

                context 'when associations' do
          
        24. 
        
        
      
        
        
          
      24. 
            2
            

            

                  it { is_expected.to belong_to(:user) }
          
        25. 
        
        
      
        
        
          
      25. 
            
            

            

                end
          
        26. 
        
        
      
        
        
          
      26. 
            
            

            

              end
          
        27. 
        
        
      
        
        
          
      27. 
            
            

            

            end
          
        28. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/models/user_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      9 relevant lines.
      9 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            RSpec.describe User, type: :model do
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

              let(:user) { FactoryBot.create(:user) }
          
        3. 
        
        
      
        
        
          
      3. 
            
            

            

            
          
        4. 
        
        
      
        
        
          
      4. 
            1
            

            

              describe 'author' do
          
        5. 
        
        
      
        
        
          
      5. 
            1
            

            

                context 'when validations' do
          
        6. 
        
        
      
        
        
          
      6. 
            2
            

            

                  it { is_expected.to validate_presence_of(:email) }
          
        7. 
        
        
      
        
        
          
      7. 
            2
            

            

                  it { is_expected.to validate_presence_of(:password) }
          
        8. 
        
        
      
        
        
          
      8. 
            
            

            

                end
          
        9. 
        
        
      
        
        
          
      9. 
            
            

            

            
          
        10. 
        
        
      
        
        
          
      10. 
            1
            

            

                context 'with associations' do
          
        11. 
        
        
      
        
        
          
      11. 
            2
            

            

                  it { is_expected.to have_one(:billing) }
          
        12. 
        
        
      
        
        
          
      12. 
            2
            

            

                  it { is_expected.to have_one(:shipping) }
          
        13. 
        
        
      
        
        
          
      13. 
            
            

            

                end
          
        14. 
        
        
      
        
        
          
      14. 
            
            

            

              end
          
        15. 
        
        
      
        
        
          
      15. 
            
            

            

            end
          
        16. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/queryes/book_query_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      45 relevant lines.
      45 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            require 'rails_helper'
          
        2. 
        
        
      
        
        
          
      2. 
            
            

            

            
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

            RSpec.describe BookQuery do
          
        4. 
        
        
      
        
        
          
      4. 
            1
            

            

              shared_examples 'sort test' do
          
        5. 
        
        
      
        
        
          
      5. 
            5
            

            

                it 'sort' do
          
        6. 
        
        
      
        
        
          
      6. 
            5
            

            

                  books
          
        7. 
        
        
      
        
        
          
      7. 
            5
            

            

                  expect(test).to eq(result)
          
        8. 
        
        
      
        
        
          
      8. 
            
            

            

                end
          
        9. 
        
        
      
        
        
          
      9. 
            
            

            

              end
          
        10. 
        
        
      
        
        
          
      10. 
            
            

            

            
          
        11. 
        
        
      
        
        
          
      11. 
            3
            

            

              let(:titles) { %w[Adam Zimbabwe] }
          
        12. 
        
        
      
        
        
          
      12. 
            1
            

            

              let(:books_dates) do
          
        13. 
        
        
      
        
        
          
      13. 
            1
            

            

                ['Thu, 25 Aug 2022 15:25:38.761014000 UTC +00:00', 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00']
          
        14. 
        
        
      
        
        
          
      14. 
            
            

            

              end
          
        15. 
        
        
      
        
        
          
      15. 
            
            

            

            
          
        16. 
        
        
      
        
        
          
      16. 
            1
            

            

              describe 'all books sort' do
          
        17. 
        
        
      
        
        
          
      17. 
            1
            

            

                context 'when sort by title A to Z' do
          
        18. 
        
        
      
        
        
          
      18. 
            1
            

            

                  let(:books) do
          
        19. 
        
        
      
        
        
          
      19. 
            1
            

            

                    create(:book, title: titles.first)
          
        20. 
        
        
      
        
        
          
      20. 
            1
            

            

                    create(:book, title: titles.second)
          
        21. 
        
        
      
        
        
          
      21. 
            
            

            

                  end
          
        22. 
        
        
      
        
        
          
      22. 
            
            

            

            
          
        23. 
        
        
      
        
        
          
      23. 
            2
            

            

                  let(:result) { titles.second }
          
        24. 
        
        
      
        
        
          
      24. 
            2
            

            

                  let(:test) { described_class.query({ sort: 'title DESC' }).first.title }
          
        25. 
        
        
      
        
        
          
      25. 
            
            

            

            
          
        26. 
        
        
      
        
        
          
      26. 
            1
            

            

                  include_examples 'sort test'
          
        27. 
        
        
      
        
        
          
      27. 
            
            

            

                end
          
        28. 
        
        
      
        
        
          
      28. 
            
            

            

            
          
        29. 
        
        
      
        
        
          
      29. 
            1
            

            

                context 'when sort title Z to A' do
          
        30. 
        
        
      
        
        
          
      30. 
            1
            

            

                  let(:books) do
          
        31. 
        
        
      
        
        
          
      31. 
            1
            

            

                    create(:book, title: titles.first)
          
        32. 
        
        
      
        
        
          
      32. 
            1
            

            

                    create(:book, title: titles.second)
          
        33. 
        
        
      
        
        
          
      33. 
            
            

            

                  end
          
        34. 
        
        
      
        
        
          
      34. 
            
            

            

            
          
        35. 
        
        
      
        
        
          
      35. 
            2
            

            

                  let(:result) { titles.first }
          
        36. 
        
        
      
        
        
          
      36. 
            2
            

            

                  let(:test) { described_class.query({ sort: 'title' }).first.title }
          
        37. 
        
        
      
        
        
          
      37. 
            
            

            

            
          
        38. 
        
        
      
        
        
          
      38. 
            1
            

            

                  include_examples 'sort test'
          
        39. 
        
        
      
        
        
          
      39. 
            
            

            

                end
          
        40. 
        
        
      
        
        
          
      40. 
            
            

            

            
          
        41. 
        
        
      
        
        
          
      41. 
            1
            

            

                context 'when sort by price High to Low' do
          
        42. 
        
        
      
        
        
          
      42. 
            1
            

            

                  let(:books) do
          
        43. 
        
        
      
        
        
          
      43. 
            1
            

            

                    create(:book, price_cents: 75)
          
        44. 
        
        
      
        
        
          
      44. 
            1
            

            

                    create(:book, price_cents: 23)
          
        45. 
        
        
      
        
        
          
      45. 
            
            

            

                  end
          
        46. 
        
        
      
        
        
          
      46. 
            
            

            

            
          
        47. 
        
        
      
        
        
          
      47. 
            2
            

            

                  let(:result) { 75 }
          
        48. 
        
        
      
        
        
          
      48. 
            2
            

            

                  let(:test) { described_class.query({ sort: 'price_cents DESC' }).first.price_cents }
          
        49. 
        
        
      
        
        
          
      49. 
            
            

            

            
          
        50. 
        
        
      
        
        
          
      50. 
            1
            

            

                  include_examples 'sort test'
          
        51. 
        
        
      
        
        
          
      51. 
            
            

            

                end
          
        52. 
        
        
      
        
        
          
      52. 
            
            

            

            
          
        53. 
        
        
      
        
        
          
      53. 
            1
            

            

                context 'when sort price Low to High' do
          
        54. 
        
        
      
        
        
          
      54. 
            1
            

            

                  let(:books) do
          
        55. 
        
        
      
        
        
          
      55. 
            1
            

            

                    create(:book, price_cents: 75)
          
        56. 
        
        
      
        
        
          
      56. 
            1
            

            

                    create(:book, price_cents: 23)
          
        57. 
        
        
      
        
        
          
      57. 
            
            

            

                  end
          
        58. 
        
        
      
        
        
          
      58. 
            
            

            

            
          
        59. 
        
        
      
        
        
          
      59. 
            2
            

            

                  let(:result) { 23 }
          
        60. 
        
        
      
        
        
          
      60. 
            2
            

            

                  let(:test) { described_class.query({ sort: 'price_cents' }).first.price_cents }
          
        61. 
        
        
      
        
        
          
      61. 
            
            

            

            
          
        62. 
        
        
      
        
        
          
      62. 
            1
            

            

                  include_examples 'sort test'
          
        63. 
        
        
      
        
        
          
      63. 
            
            

            

                end
          
        64. 
        
        
      
        
        
          
      64. 
            
            

            

            
          
        65. 
        
        
      
        
        
          
      65. 
            1
            

            

                context 'when sort by Newest' do
          
        66. 
        
        
      
        
        
          
      66. 
            1
            

            

                  let(:books) do
          
        67. 
        
        
      
        
        
          
      67. 
            1
            

            

                    create(:book, created_at: books_dates.first)
          
        68. 
        
        
      
        
        
          
      68. 
            1
            

            

                    create(:book, created_at: books_dates.second)
          
        69. 
        
        
      
        
        
          
      69. 
            
            

            

                  end
          
        70. 
        
        
      
        
        
          
      70. 
            
            

            

            
          
        71. 
        
        
      
        
        
          
      71. 
            2
            

            

                  let(:result) { books_dates.first }
          
        72. 
        
        
      
        
        
          
      72. 
            2
            

            

                  let(:test) { described_class.query({ sort: 'created_at DESC' }).first.created_at }
          
        73. 
        
        
      
        
        
          
      73. 
            
            

            

            
          
        74. 
        
        
      
        
        
          
      74. 
            1
            

            

                  include_examples 'sort test'
          
        75. 
        
        
      
        
        
          
      75. 
            
            

            

                end
          
        76. 
        
        
      
        
        
          
      76. 
            
            

            

              end
          
        77. 
        
        
      
        
        
          
      77. 
            
            

            

            end
          
        78. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/support/configs/capybara.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      19 relevant lines.
      19 lines covered and
>>>>>>> a5d032d (Fix)
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            RSpec.describe 'Author' do
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

              include_context 'with api request authentication helper methods'
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

              include_context 'with api request global before and after hooks'
          
        4. 
        
        
      
        
        
=======
>>>>>>> 824bb2b (Featire specs)
          
      4. 
            
            

            

            
          
        5. 
        
        
      
        
        
          
      5. 
            2
            

            

              let(:first_name) { FFaker::Name.first_name }
          
        6. 
        
        
      
        
        
          
      6. 
            2
            

            

              let(:last_name) { FFaker::Name.last_name }
          
        7. 
        
        
      
        
        
          
      7. 
            
            

            

            
          
        8. 
        
        
      
        
        
          
      8. 
            2
            

            

              let(:new_name) { FFaker::Name.first_name }
          
        9. 
        
        
      
        
        
          
      9. 
            2
            

            

              let(:old_name) { author.first_name }
          
        10. 
        
        
      
        
        
          
      10. 
            
            

            

            
          
        11. 
        
        
      
        
        
          
      11. 
            4
            

            

              let(:author) { create(:author) }
          
        12. 
        
        
      
        
        
          
      12. 
            
            

            

            
          
        13. 
        
        
      
        
        
          
      13. 
            1
            

            

              before do
          
        14. 
        
        
      
        
        
          
      14. 
            4
            

            

                sign_in(create(:admin_user), :admin_user)
          
        15. 
        
        
      
        
        
          
      15. 
            
            

            

              end
          
        16. 
        
        
      
        
        
          
      16. 
            
            

            

            
          
        17. 
        
        
      
        
        
          
      17. 
            1
            

            

              it 'can create an author' do
          
        18. 
        
        
      
        
        
          
      18. 
            1
            

            

                visit 'admin/authors'
          
        19. 
        
        
      
        
        
          
      19. 
            
            

            

            
          
        20. 
        
        
      
        
        
          
      20. 
            1
            

            

                click_link('New Author')
          
        21. 
        
        
      
        
        
          
      21. 
            
            

            

            
          
        22. 
        
        
      
        
        
          
      22. 
            1
            

            

                fill_in 'author[first_name]', with: first_name
          
        23. 
        
        
      
        
        
          
      23. 
            1
            

            

                fill_in 'author[last_name]', with: last_name
          
        24. 
        
        
      
        
        
          
      24. 
            
            

            

            
          
        25. 
        
        
      
        
        
          
      25. 
            2
            

            

                expect { click_button('Create Author') }.to change(Author, :count).from(0).to(1)
          
        26. 
        
        
      
        
        
          
      26. 
            
            

            

              end
          
        27. 
        
        
      
        
        
          
      27. 
            
            

            

            
          
        28. 
        
        
      
        
        
          
      28. 
            1
            

            

              it 'can delete an author' do
          
        29. 
        
        
      
        
        
          
      29. 
            1
            

            

                author
          
        30. 
        
        
      
        
        
          
      30. 
            
            

            

            
          
        31. 
        
        
      
        
        
          
      31. 
            1
            

            

                visit 'admin/authors'
          
        32. 
        
        
      
        
        
          
      32. 
            
            

            

            
          
        33. 
        
        
      
        
        
          
      33. 
            2
            

            

                expect { click_link('Delete') }.to change(Author, :count).from(1).to(0)
          
        34. 
        
        
      
        
        
          
      34. 
            
            

            

              end
          
        35. 
        
        
      
        
        
          
      35. 
            
            

            

            
          
        36. 
        
        
      
        
        
          
      36. 
            1
            

            

              it 'can view an author' do
          
        37. 
        
        
      
        
        
          
      37. 
            1
            

            

                author
          
        38. 
        
        
      
        
        
          
      38. 
            
            

            

            
          
        39. 
        
        
      
        
        
          
      39. 
            1
            

            

                visit 'admin/authors'
          
        40. 
        
        
      
        
        
          
      40. 
            
            

            

            
          
        41. 
        
        
      
        
        
          
      41. 
            1
            

            

                click_link('View')
          
        42. 
        
        
      
        
        
          
      42. 
            
            

            

            
          
        43. 
        
        
      
        
        
          
      43. 
            1
            

            

                expect(page).to have_content(author.first_name)
          
        44. 
        
        
      
        
        
          
      44. 
            
            

            

              end
          
        45. 
        
        
      
        
        
          
      45. 
            
            

            

            
          
        46. 
        
        
      
        
        
          
      46. 
            1
            

            

              it 'can edit an author' do
          
        47. 
        
        
      
        
        
          
      47. 
            1
            

            

                author
          
        48. 
        
        
      
        
        
          
      48. 
            
            

            

            
          
        49. 
        
        
      
        
        
          
      49. 
            1
            

            

                visit 'admin/authors'
          
        50. 
        
        
      
        
        
          
      50. 
            
            

            

            
          
        51. 
        
        
      
        
        
          
      51. 
            1
            

            

                click_link('Edit')
          
        52. 
        
        
      
        
        
          
      52. 
            
            

            

            
          
        53. 
        
        
      
        
        
          
      53. 
            1
            

            

                fill_in 'author[first_name]', with: new_name
          
        54. 
        
        
      
        
        
          
      54. 
            
            

            

            
          
        55. 
        
        
      
        
        
          
      55. 
            4
            

            

                expect { click_button('Update Author') }.to change { author.reload.first_name }.from(old_name).to(new_name)
          
        56. 
        
        
      
        
        
          
      56. 
            
            

            

              end
          
        57. 
        
        
      
        
        
          
      57. 
            
            

            

            end
          
        58. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/feature/admin/book_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      43 relevant lines.
      43 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            RSpec.describe 'Book' do
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

              include_context 'with api request authentication helper methods'
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

              include_context 'with api request global before and after hooks'
          
        4. 
        
        
      
        
        
          
      4. 
            
            

            

            
          
        5. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
          
      5. 
            7
=======
          
      6. 
=======
          
      7. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      8. 
>>>>>>> 752f0c0 (Featire specs)
            5
>>>>>>> 93bdda9 (Featire specs)
=======
          
      9. 
            7
>>>>>>> 872e675 (Fix)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              let(:book) { create(:book) }
=======
<<<<<<< HEAD
=======
>>>>>>> 752f0c0 (Featire specs)
              let(:category_one) { FactoryBot.create(:category) }
          
        10. 
        
        
      
        
        
          
      10. 
            3
            

            

              let(:category_two) { FactoryBot.create(:category) }
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
              let(:book) { create(:book) }
>>>>>>> 872e675 (Fix)
=======
              let(:category_two) { FactoryBot.create(:category) }
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
=======
              let(:category_two) { FactoryBot.create(:category) }
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
              let(:category_two) { FactoryBot.create(:category) }
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
          
        11. 
        
        
      
        
        
          
      11. 
            1
            

            

              let(:params) do
          
        12. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
          
      12. 
            1
=======
          
      13. 
            4
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> af057e3 (Featire specs)
=======
          
      14. 
            4
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      15. 
            1
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
=======
          
      16. 
            4
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
            

            

                { title: FFaker::Book.title,
          
        17. 
        
        
      
        
        
          
      17. 
            
            

            

                  description: FFaker::Book.description,
          
        18. 
        
        
      
        
        
          
      18. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
                  price_cents: FFaker::Number.rand(1..100),
=======
                  price: FFaker::Number.rand(1..100),
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                  price: FFaker::Number.rand(1..100),
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
                  price_cents: FFaker::Number.rand(1..100),
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
                  price: FFaker::Number.rand(1..100),
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
                  price: FFaker::Number.rand(1..100),
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
          
        19. 
        
        
      
        
        
          
      19. 
            
            

            

                  dimensions: FFaker::Book.cover,
          
        20. 
        
        
      
        
        
          
      20. 
            
            

            

                  year_of_publication: FFaker::Number.rand(1900..2022),
          
        21. 
        
        
      
        
        
          
      21. 
            
            

            

                  materials: 'Soft cover',
          
        22. 
        
        
      
        
        
          
      22. 
            
            

            

                  quantity: FFaker::Number.rand(2..5) }
          
        23. 
        
        
      
        
        
          
      23. 
            
            

            

              end
          
        24. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
          
      24. 
            
            

            

            
          
        25. 
        
        
      
        
        
          
      25. 
            1
            

            

              before do
          
        26. 
        
        
      
        
        
          
      26. 
            6
            

            

                sign_in(create(:admin_user), :admin_user)
          
        27. 
        
        
      
        
        
          
      27. 
            
            

            

            
          
        28. 
        
        
      
        
        
          
      28. 
            6
            

            

                book
          
        29. 
        
        
      
        
        
          
      29. 
            
            

            

            
          
        30. 
        
        
      
        
        
          
      30. 
            6
            

            

                visit 'admin/books'
          
        31. 
        
        
      
        
        
          
      31. 
            
            

            

              end
          
        32. 
        
        
      
        
        
          
      32. 
            
            

            

            
          
        33. 
        
        
      
        
        
          
      33. 
            1
            

            

              it 'can create an category' do
          
        34. 
        
        
      
        
        
          
      34. 
            1
            

            

                click_link('New Book')
          
        35. 
        
        
      
        
        
          
      35. 
            
            

            

            
          
        36. 
        
        
      
        
        
          
      36. 
            1
            

            

                fill_in 'book[title]', with: params[:title]
          
        37. 
        
        
      
        
        
          
      37. 
            1
            

            

                fill_in 'book[description]', with: params[:description]
          
        38. 
        
        
      
        
        
          
      38. 
            1
            

            

                fill_in 'book[year_of_publication]', with: params[:year_of_publication]
          
        39. 
        
        
      
        
        
          
      39. 
            1
            

            

                fill_in 'book[price_cents]', with: params[:price_cents]
          
        40. 
        
        
      
        
        
          
      40. 
            1
            

            

                fill_in 'book[materials]', with: params[:materials]
          
        41. 
        
        
      
        
        
          
      41. 
            1
            

            

                fill_in 'book[dimensions]', with: params[:dimensions]
          
        42. 
        
        
      
        
        
          
      42. 
            1
            

            

                fill_in 'book[quantity]', with: params[:quantity]
          
        43. 
        
        
      
        
        
          
      43. 
            
            

            

            
          
        44. 
        
        
      
        
        
          
      44. 
            1
            

            

                click_button('Create Book')
          
        45. 
        
        
      
        
        
          
      45. 
            
            

            

            
          
        46. 
        
        
      
        
        
          
      46. 
            1
            

            

                expect(page).to have_content(params[:title])
          
        47. 
        
        
      
        
        
          
      47. 
            
            

            

              end
          
        48. 
        
        
      
        
        
          
      48. 
            
            

            

            
          
        49. 
        
        
      
        
        
          
      49. 
            1
            

            

              it 'can delete an book' do
          
        50. 
        
        
      
        
        
          
      50. 
            1
            

            

                click_link('Delete')
          
        51. 
        
        
      
        
        
          
      51. 
            
            

            

            
          
        52. 
        
        
      
        
        
          
      52. 
            1
            

            

                expect(page).not_to have_content(book.title)
          
        53. 
        
        
      
        
        
          
      53. 
            
            

            

              end
          
        54. 
        
        
      
        
        
          
      54. 
            
            

            

            
          
        55. 
        
        
      
        
        
          
      55. 
            1
            

            

              it 'can view an book' do
          
        56. 
        
        
      
        
        
          
      56. 
            1
            

            

                click_link('View')
          
        57. 
        
        
      
        
        
          
      57. 
            
            

            

            
          
        58. 
        
        
      
        
        
          
      58. 
            1
            

            

                expect(page).to have_content(book.title)
          
        59. 
        
        
      
        
        
          
      59. 
            
            

            

              end
          
        60. 
        
        
      
        
        
          
      60. 
            
            

            

            
          
        61. 
        
        
      
        
        
          
      61. 
            1
            

            

              it 'can edit an book' do
          
        62. 
        
        
      
        
        
          
      62. 
            1
            

            

                click_link('Edit')
          
        63. 
        
        
      
        
        
          
      63. 
            
            

            

            
          
        64. 
        
        
      
        
        
          
      64. 
            1
            

            

                fill_in 'book[title]', with: 'New title'
          
        65. 
        
        
      
        
        
          
      65. 
            
            

            

            
          
        66. 
        
        
      
        
        
          
      66. 
            1
            

            

                click_button('Update Book')
          
        67. 
        
        
      
        
        
          
      67. 
            
            

            

            
          
        68. 
        
        
      
        
        
          
      68. 
            1
            

            

                expect(page).to have_content('New title')
          
        69. 
        
        
      
        
        
          
      69. 
            
            

            

              end
          
        70. 
        
        
      
        
        
          
      70. 
            
            

            

            
          
        71. 
        
        
      
        
        
          
      71. 
            1
            

            

              context 'when image' do
          
        72. 
        
        
      
        
        
          
      72. 
            1
            

            

                before do
          
        73. 
        
        
      
        
        
          
      73. 
            2
            

            

                  click_link('Edit')
          
        74. 
        
        
      
        
        
          
      74. 
            
            

            

            
          
        75. 
        
        
      
        
        
          
      75. 
            2
            

            

                  page.attach_file('book[images][]', './app/assets/images/Web-Book-Cover.png')
          
        76. 
        
        
      
        
        
          
      76. 
            
            

            

            
          
        77. 
        
        
      
        
        
          
      77. 
            2
            

            

                  click_on 'Update Book'
          
        78. 
        
        
      
        
        
          
      78. 
            
            

            

                end
          
        79. 
        
        
      
        
        
          
      79. 
            
            

            

            
          
        80. 
        
        
      
        
        
          
      80. 
            1
            

            

                it 'can add images to book' do
          
        81. 
        
        
      
        
        
          
      81. 
            1
            

            

                  expect(book.reload.images.count).to eq(1)
          
        82. 
        
        
      
        
        
          
      82. 
            
            

            

                end
          
        83. 
        
        
      
        
        
          
      83. 
            
            

            

            
          
        84. 
        
        
      
        
        
          
      84. 
            1
            

            

                it 'can delete images from book' do
          
        85. 
        
        
      
        
        
          
      85. 
            1
            

            

                  click_link('Edit')
          
        86. 
        
        
      
        
        
          
      86. 
            
            

            

            
          
        87. 
        
        
      
        
        
          
      87. 
            1
            

            

                  click_link('Delete')
          
        88. 
        
        
      
        
        
          
      88. 
            
            

            

            
          
        89. 
        
        
      
        
        
          
      89. 
            1
            

            

                  expect(book.reload.images.count).to eq(0)
          
        90. 
        
        
      
        
        
          
      90. 
            
            

            

                end
          
        91. 
        
        
      
        
        
          
      91. 
            
            

            

              end
          
        92. 
        
        
      
        
        
          
      92. 
            
            

            

            end
          
        93. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/feature/admin/category_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      25 relevant lines.
      25 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            RSpec.describe 'Category' do
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

              include_context 'with api request authentication helper methods'
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

              include_context 'with api request global before and after hooks'
          
        4. 
        
        
      
        
        
          
      4. 
            
            

            

            
          
        5. 
        
        
      
        
        
          
      5. 
            2
            

            

              let(:category_name) { FFaker::Book.genre }
          
        6. 
        
        
      
        
        
          
      6. 
            
            

            

            
          
        7. 
        
        
      
        
        
          
      7. 
            5
            

            

              let(:category) { create(:category) }
          
        8. 
        
        
      
        
        
          
      8. 
            
            

            

            
          
        9. 
        
        
      
        
        
          
      9. 
            1
            

            

              before do
          
        10. 
        
        
      
        
        
          
      10. 
            4
            

            

                sign_in(create(:admin_user), :admin_user)
          
        11. 
        
        
      
        
        
          
      11. 
            
            

            

            
          
        12. 
        
        
      
        
        
          
      12. 
            4
            

            

                category
          
        13. 
        
        
      
        
        
          
      13. 
            
            

            

            
          
        14. 
        
        
      
        
        
          
      14. 
            4
            

            

                visit 'admin/categories'
          
        15. 
        
        
      
        
        
          
      15. 
            
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
          
      16. 
            7
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> af057e3 (Featire specs)
=======
          
      17. 
            7
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
=======
          
      18. 
            7
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
              end
=======
              let(:book) { FactoryBot.create(:book) }
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
              let(:book) { FactoryBot.create(:book) }
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
              end
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
              let(:book) { FactoryBot.create(:book) }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
              let(:book) { FactoryBot.create(:book) }
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
          
        19. 
        
        
      
        
        
          
      19. 
            
            

            

            
          
        20. 
        
        
      
        
        
          
      20. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
              it 'can create an category' do
=======
              describe '#show book' do
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
              describe '#show book' do
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
              it 'can create an category' do
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
              describe '#show book' do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
              describe '#show book' do
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
          
        21. 
        
        
      
        
        
          
      21. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
                click_link('New Category')
=======
                it 'show books info' do
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                it 'show books info' do
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
                click_link('New Category')
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
                it 'show books info' do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
                it 'show books info' do
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
          
        22. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
          
      22. 
=======
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      23. 
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
          
      24. 
            1
            

            

                  visit "books/#{book.id}"
          
        25. 
        
        
      
        
        
          
      25. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
          
      26. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
            
            

            

            
          
        27. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
          
      27. 
=======
          
      28. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      29. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
          
      30. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      31. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      32. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
                fill_in 'category[name]', with: category_name
=======
                  expect(page).to have_content(book.title)
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                  expect(page).to have_content(book.title)
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
                fill_in 'category[name]', with: category_name
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
                  expect(page).to have_content(book.title)
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
                  expect(page).to have_content(book.title)
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
          
        33. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
          
      33. 
=======
          
      34. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      35. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
          
      36. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      37. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      38. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
            
          
        39. 
        
        
      
        
        
          
      39. 
            1
            

            

                click_button('Create Category')
<<<<<<< HEAD
<<<<<<< HEAD
=======
                end
>>>>>>> d0dc1f1 (Featire specs)
=======
                end
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
=======
                end
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
=======
                end
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
          
        40. 
        
        
      
        
        
          
      40. 
            
            

            

            
          
        41. 
        
        
      
        
        
          
      41. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
                expect(page).to have_content(category_name)
=======
                it 'clicked Beck to results' do
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                it 'clicked Beck to results' do
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
                expect(page).to have_content(category_name)
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
                it 'clicked Beck to results' do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
                it 'clicked Beck to results' do
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
          
        42. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
          
      42. 
            
=======
          
      43. 
            1
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> af057e3 (Featire specs)
=======
          
      44. 
            1
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      45. 
            
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
=======
          
      46. 
            1
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
              end
=======
                  visit "books/#{book.id}"
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                  visit "books/#{book.id}"
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
              end
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
                  visit "books/#{book.id}"
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
                  visit "books/#{book.id}"
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
          
        47. 
        
        
      
        
        
          
      47. 
            
            

            

            
          
        48. 
        
        
      
        
        
          
      48. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
              it 'can delete an category' do
=======
                  find('a', class: 'general-back-link').click
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                  find('a', class: 'general-back-link').click
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
              it 'can delete an category' do
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
                  find('a', class: 'general-back-link').click
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
                  find('a', class: 'general-back-link').click
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
          
        49. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
          
      49. 
            1
            

            

                click_link('Delete')
          
        50. 
        
        
      
        
        
          
      50. 
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      51. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      52. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
=======
          
      53. 
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
=======
          
      54. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
            
            

            

            
          
        55. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
          
      55. 
=======
          
      56. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      57. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
          
      58. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      59. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      60. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
                expect(page).not_to have_content(category.name)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                expect(page).not_to have_content(category.name)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
                  expect(page).to have_content('Catalog')
          
        61. 
        
        
      
        
        
          
      61. 
            
            

            

                end
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
                expect(page).not_to have_content(category.name)
>>>>>>> 872e675 (Fix)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
          
        62. 
        
        
      
        
        
          
      62. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
              end
=======
            
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
            
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
              end
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
            
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
            
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
          
        63. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
          
      63. 
            
=======
          
      64. 
            1
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> af057e3 (Featire specs)
=======
          
      65. 
            1
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      66. 
            
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
=======
          
      67. 
            1
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
            
=======
                context 'when test read more' do
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                context 'when test read more' do
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
            
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
                context 'when test read more' do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
                context 'when test read more' do
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
          
        68. 
        
        
      
        
        
          
      68. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
              it 'can view an category' do
=======
                  it 'show read more' do
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                  it 'show read more' do
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
              it 'can view an category' do
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
                  it 'show read more' do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
                  it 'show read more' do
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
          
        69. 
        
        
      
        
        
          
      69. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
                click_link('View')
=======
                    visit "books/#{book.id}"
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                    visit "books/#{book.id}"
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
                click_link('View')
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
                    visit "books/#{book.id}"
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
                    visit "books/#{book.id}"
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
          
        70. 
        
        
      
        
        
          
      70. 
            
            

            

            
          
        71. 
        
        
      
        
        
          
      71. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
                expect(page).to have_content(category.name)
=======
                    expect(page).to have_content('Read More')
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                    expect(page).to have_content('Read More')
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
                expect(page).to have_content(category.name)
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
                    expect(page).to have_content('Read More')
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
                    expect(page).to have_content('Read More')
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
          
        72. 
        
        
      
        
        
          
      72. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
              end
=======
                  end
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                  end
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
              end
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
                  end
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
                  end
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
          
        73. 
        
        
      
        
        
          
      73. 
            
            

            

            
          
        74. 
        
        
      
        
        
          
      74. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
              it 'can edit an category' do
=======
                  it 'clicked read more', js: true do
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                  it 'clicked read more', js: true do
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
              it 'can edit an category' do
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
                  it 'clicked read more', js: true do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
                  it 'clicked read more', js: true do
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
          
        75. 
        
        
      
        
        
          
      75. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
                click_link('Edit')
=======
                    visit "books/#{book.id}"
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                    visit "books/#{book.id}"
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
                click_link('Edit')
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
                    visit "books/#{book.id}"
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
                    visit "books/#{book.id}"
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
          
        76. 
        
        
      
        
        
          
      76. 
            
            

            

            
          
        77. 
        
        
      
        
        
          
      77. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
                fill_in 'category[name]', with: 'New Genre'
=======
                    click_link 'Read More'
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                    click_link 'Read More'
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
                fill_in 'category[name]', with: 'New Genre'
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
                    click_link 'Read More'
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
                    click_link 'Read More'
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
          
        78. 
        
        
      
        
        
          
      78. 
            
            

            

            
          
        79. 
        
        
      
        
        
          
      79. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
                click_button('Update Category')
=======
                    expect(page).not_to have_content('Read More')
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                    expect(page).not_to have_content('Read More')
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
                click_button('Update Category')
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
                    expect(page).not_to have_content('Read More')
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
                    expect(page).not_to have_content('Read More')
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
          
        80. 
        
        
      
        
        
          
      80. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
            
=======
                  end
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                  end
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
            
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
                  end
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
                  end
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
          
        81. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
          
      81. 
            1
=======
          
      82. 
            
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> af057e3 (Featire specs)
=======
          
      83. 
            
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      84. 
            1
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
=======
          
      85. 
            
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
                expect(page).to have_content('New Genre')
=======
                end
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                end
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
                expect(page).to have_content('New Genre')
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
                end
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
                end
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
          
        86. 
        
        
      
        
        
          
      86. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
              end
          
        87. 
        
        
      
        
        
          
      87. 
            
            

            

            end
          
        88. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/feature/billing_spec.rb
      
    
      
      
  73.08%


      lines covered
    
      

    

    
      
      26 relevant lines.
      19 lines covered and
      7 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            RSpec.describe 'Billing', type: :feature do
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

              include_context 'with api request authentication helper methods'
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

              include_context 'with api request global before and after hooks'
          
        4. 
        
        
      
        
        
          
      4. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
            
          
        5. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
          
      5. 
            2
            

            

              let(:user) { create(:user) }
          
        6. 
        
        
      
        
        
          
      6. 
            1
            

            

              let(:attributes_for) { attributes_for(:billing) }
          
        7. 
        
        
      
        
        
          
      7. 
            
            

            

            
          
        8. 
        
        
      
        
        
          
      8. 
            1
            

            

              describe '#fill_in', js: true do
          
        9. 
        
        
      
        
        
          
      9. 
            1
            

            

                it 'fill in billing' do
          
        10. 
        
        
      
        
        
          
      10. 
            1
            

            

                  sign_in(user)
          
        11. 
        
        
      
        
        
          
      11. 
            
            

            

            
          
        12. 
        
        
      
        
        
          
      12. 
            1
            

            

                  visit edit_user_path(user.id)
          
        13. 
        
        
      
        
        
          
      13. 
            
            

            

            
          
        14. 
        
        
      
        
        
          
      14. 
            1
            

            

                  within('div#billing.col-md-5.mb-40') do
          
        15. 
        
        
      
        
        
          
      15. 
            1
            

            

                    find_all('div', class: 'form-group')[0] do
          
        16. 
        
        
      
        
        
          
      16. 
            
            

            

                      fill_in :first_name, with: attributes_for[:first_name]
          
        17. 
        
        
      
        
        
          
      17. 
            
            

            

                    end
          
        18. 
        
        
      
        
        
          
      18. 
            1
            

            

                    find_all('div', class: 'form-group')[1] do
          
        19. 
        
        
      
        
        
          
      19. 
            
            

            

                      fill_in :last_name, with: attributes_for[:last_name]
          
        20. 
        
        
      
        
        
          
      20. 
            
            

            

                    end
          
        21. 
        
        
      
        
        
          
      21. 
            1
            

            

                    find_all('div', class: 'form-group')[2] do
          
        22. 
        
        
      
        
        
          
      22. 
            
            

            

                      fill_in :address, with: attributes_for[:address]
          
        23. 
        
        
      
        
        
          
      23. 
            
            

            

                    end
          
        24. 
        
        
      
        
        
          
      24. 
            1
            

            

                    find_all('div', class: 'form-group')[3] do
          
        25. 
        
        
      
        
        
          
      25. 
            
            

            

                      fill_in :city, with: attributes_for[:city]
          
        26. 
        
        
      
        
        
          
      26. 
            
            

            

                    end
          
        27. 
        
        
      
        
        
          
      27. 
            1
            

            

                    find_all('div', class: 'form-group')[4] do
          
        28. 
        
        
      
        
        
          
      28. 
            
            

            

                      fill_in :zip, with: attributes_for[:zip]
          
        29. 
        
        
      
        
        
          
      29. 
            
            

            

                    end
          
        30. 
        
        
      
        
        
          
      30. 
            1
            

            

                    find_all('div', class: 'form-group')[5] do
          
        31. 
        
        
      
        
        
          
      31. 
            
            

            

                      fill_in :country, with: attributes_for[:country]
          
        32. 
        
        
      
        
        
          
      32. 
            
            

            

                    end
          
        33. 
        
        
      
        
        
          
      33. 
            1
            

            

                    find_all('div', class: 'form-group')[6] do
          
        34. 
        
        
      
        
        
          
      34. 
            
            

            

                      fill_in :phone, with: attributes_for[:phone]
          
        35. 
        
        
      
        
        
          
      35. 
            
            

            

                    end
          
        36. 
        
        
      
        
        
          
      36. 
            1
            

            

                    click_on I18n.t('settings.save')
          
        37. 
        
        
      
        
        
          
      37. 
            
            

            

                  end
          
        38. 
        
        
      
        
        
          
      38. 
            
            

            

            
          
        39. 
        
        
      
        
        
          
      39. 
            1
            

            

                  expect(page).to have_content(I18n.t('settings.message.update'))
          
        40. 
        
        
      
        
        
          
      40. 
            
            

            

                end
          
        41. 
        
        
      
        
        
          
      41. 
            
            

            

              end
          
        42. 
        
        
      
        
        
          
      42. 
            
            

            

            end
          
        43. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/feature/book_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      104 relevant lines.
      104 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            RSpec.describe 'Book', type: :feature do
          
        2. 
        
        
      
        
        
          
      2. 
            5
            

            

              let(:category_one) { create(:category) }
          
        3. 
        
        
      
        
        
          
      3. 
            3
            

            

              let(:category_two) { create(:category) }
          
        4. 
        
        
      
        
        
          
      4. 
            1
            

            

              let(:params) do
          
        5. 
        
        
      
        
        
          
      5. 
            4
            

            

                { title: FFaker::Book.title,
          
        6. 
        
        
      
        
        
          
      6. 
            
            

            

                  description: FFaker::Book.description,
          
        7. 
        
        
      
        
        
          
      7. 
            
            

            

                  price_cents: FFaker::Number.rand(1..100),
          
        8. 
        
        
      
        
        
          
      8. 
            
            

            

                  dimensions: FFaker::Book.cover,
          
        9. 
        
        
      
        
        
          
      9. 
            
            

            

                  year_of_publication: FFaker::Number.rand(1900..2022),
          
        10. 
        
        
      
        
        
          
      10. 
            
            

            

                  materials: 'Soft cover',
          
        11. 
        
        
      
        
        
          
      11. 
            
            

            

                  quantity: FFaker::Number.rand(2..5) }
          
        12. 
        
        
      
        
        
          
      12. 
            
            

            

              end
          
        13. 
        
        
      
        
        
          
      13. 
            7
            

            

              let(:book) { create(:book).decorate }
          
        14. 
        
        
      
        
        
          
      14. 
            
            

            

            
          
        15. 
        
        
      
        
        
          
      15. 
            1
            

            

              describe '#show book' do
          
        16. 
        
        
      
        
        
          
      16. 
            1
            

            

                it 'show books info' do
          
        17. 
        
        
      
        
        
          
      17. 
            1
            

            

                  visit "books/#{book.id}"
          
        18. 
        
        
      
        
        
          
      18. 
            
            

            

            
          
        19. 
        
        
      
        
        
          
      19. 
            1
            

            

                  expect(page).to have_content(book.title)
          
        20. 
        
        
      
        
        
          
      20. 
            
            

            

                end
          
        21. 
        
        
      
        
        
          
      21. 
            
            

            

            
          
        22. 
        
        
      
        
        
          
      22. 
            1
            

            

                it 'clicked Beck to results' do
          
        23. 
        
        
      
        
        
          
      23. 
            1
            

            

                  visit "books/#{book.id}"
          
        24. 
        
        
      
        
        
          
      24. 
            
            

            

            
          
        25. 
        
        
      
        
        
          
      25. 
            1
            

            

                  find('a', class: 'general-back-link').click
          
        26. 
        
        
      
        
        
          
      26. 
            
            

            

            
          
        27. 
        
        
      
        
        
          
      27. 
            1
            

            

                  expect(page).to have_content(I18n.t('catalog_page.title'))
          
        28. 
        
        
      
        
        
          
      28. 
            
            

            

                end
          
        29. 
        
        
      
        
        
          
      29. 
            
            

            

            
          
        30. 
        
        
      
        
        
          
      30. 
            1
            

            

                context 'when test read more' do
          
        31. 
        
        
      
        
        
          
      31. 
            1
            

            

                  it 'show read more' do
          
        32. 
        
        
      
        
        
          
      32. 
            1
            

            

                    visit "books/#{book.id}"
          
        33. 
        
        
      
        
        
          
      33. 
            
            

            

            
          
        34. 
        
        
      
        
        
          
      34. 
            1
            

            

                    expect(page).to have_content(I18n.t('book_page.read_more'))
          
        35. 
        
        
      
        
        
          
      35. 
            
            

            

                  end
          
        36. 
        
        
      
        
        
          
      36. 
            
            

            

            
          
        37. 
        
        
      
        
        
          
      37. 
            1
            

            

                  it 'clicked read more', js: true do
          
        38. 
        
        
      
        
        
          
      38. 
            1
            

            

                    visit "books/#{book.id}"
          
        39. 
        
        
      
        
        
          
      39. 
            
            

            

            
          
        40. 
        
        
      
        
        
          
      40. 
            1
            

            

                    click_link I18n.t('book_page.read_more')
          
        41. 
        
        
      
        
        
          
      41. 
            
            

            

            
          
        42. 
        
        
      
        
        
          
      42. 
            1
            

            

                    expect(page).not_to have_content(I18n.t('book_page.read_more'))
          
        43. 
        
        
      
        
        
          
      43. 
            
            

            

                  end
          
        44. 
        
        
      
        
        
          
      44. 
            
            

            

                end
          
        45. 
        
        
      
        
        
          
      45. 
            
            

            

            
          
        46. 
        
        
      
        
        
          
      46. 
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
          
      47. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      48. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
=======
          
      49. 
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
=======
          
      50. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
          
      51. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      52. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      53. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
            1
            

            

                context 'when quantity changes', js: true do
          
        54. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
          
      54. 
=======
          
      55. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      56. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      57. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      58. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      59. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
          
      60. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      61. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      62. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      63. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
            1
            

            

                  before do
          
        64. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
          
      64. 
            2
            

            

                    visit "books/#{book.id}"
          
        65. 
        
        
      
        
        
          
      65. 
            
            

            

            
          
        66. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
          
      66. 
            2
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
                    find('a', class: 'inc').click
=======
                    visit "books/#{book.id}"
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
                    visit "books/#{book.id}"
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                    find('a', class: 'inc').click
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
                    visit "books/#{book.id}"
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
                    visit "books/#{book.id}"
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
                    visit "books/#{book.id}"
>>>>>>> 4e81ea2 (Featire specs)
=======
                    visit "books/#{book.id}"
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                    visit "books/#{book.id}"
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
                    visit "books/#{book.id}"
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                    visit "books/#{book.id}"
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                    visit "books/#{book.id}"
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
                    visit "books/#{book.id}"
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
                    visit "books/#{book.id}"
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
                    find('a', class: 'inc').click
>>>>>>> 5b7749a (Fix)
          
        67. 
        
        
      
        
        
          
      67. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
                  end
          
        68. 
        
        
      
        
        
          
      68. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
            
          
        69. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      69. 
            1
=======
          
      70. 
            2
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      71. 
            2
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      72. 
            1
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      73. 
            2
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      74. 
            2
>>>>>>> 08edf50 (Featire specs)
=======
<<<<<<< HEAD
          
      75. 
            2
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4552227 (Featire specs)
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
          
      76. 
            2
>>>>>>> e3e66f3 (Featire specs)
=======
          
      77. 
            1
>>>>>>> 5b7749a (Fix)
            

            

                  it 'increase quantity' do
          
        78. 
        
        
      
        
        
<<<<<<< HEAD
          
      78. 
            
            

            

                  end
          
        79. 
        
        
      
        
        
          
      79. 
            
            

            

            
          
        80. 
        
        
      
        
        
          
      80. 
            1
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
                  it 'increase quantity' do
>>>>>>> 563720e (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
                  it 'increase quantity' do
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                  it 'increase quantity' do
=======
                  it 'increase quantity', js: true do
>>>>>>> 752f0c0 (Featire specs)
=======
                  it 'increase quantity', js: true do
>>>>>>> 4e81ea2 (Featire specs)
=======
                  it 'increase quantity', js: true do
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
=======
=======
=======
                  it 'increase quantity' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
                  it 'increase quantity' do
>>>>>>> c033601 (Rebased)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
=======
          
      81. 
            2
>>>>>>> 08edf50 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
                  it 'increase quantity' do
=======
                    find('a', class: 'inc').click
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
=======
=======
                    find('a', class: 'inc').click
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
                  it 'increase quantity' do
>>>>>>> 872e675 (Fix)
=======
                  it 'increase quantity' do
=======
                    find('a', class: 'inc').click
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
=======
=======
                    find('a', class: 'inc').click
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
=======
                    find('a', class: 'inc').click
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
                    find('a', class: 'inc').click
>>>>>>> 752f0c0 (Featire specs)
=======
                    find('a', class: 'inc').click
>>>>>>> 4e81ea2 (Featire specs)
=======
                    find('a', class: 'inc').click
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                  it 'increase quantity' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
                  it 'increase quantity' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it 'increase quantity', js: true do
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                  it 'increase quantity' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
                  it 'increase quantity', js: true do
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
                  it 'increase quantity' do
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
        82. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      82. 
=======
          
      83. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
=======
          
      84. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      85. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      86. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      87. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      88. 
>>>>>>> 5b7749a (Fix)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
                    expect(page).to have_content("€#{Money.new(book.price_cents * 2)}")
          
        89. 
        
        
      
        
        
          
      89. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      90. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      91. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
=======
          
      92. 
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
=======
          
      93. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      94. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      95. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 5b7749a (Fix)
            
            

            

                  end
          
        96. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
          
      96. 
=======
          
      97. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      98. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      99. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      100. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      101. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
          
      102. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      103. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      104. 
>>>>>>> 5b7749a (Fix)
            
            

            

            
          
        105. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
          
      105. 
=======
          
      106. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      107. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      108. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      109. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      110. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
          
      111. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      112. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      113. 
>>>>>>> 5b7749a (Fix)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
                  it 'decrease quantity' do
>>>>>>> 563720e (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
                  it 'decrease quantity' do
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                  it 'decrease quantity' do
=======
                  it 'decrease quantity', js: true do
>>>>>>> 752f0c0 (Featire specs)
=======
                  it 'decrease quantity', js: true do
>>>>>>> 4e81ea2 (Featire specs)
=======
                  it 'decrease quantity', js: true do
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
=======
=======
=======
                  it 'decrease quantity' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
                  it 'decrease quantity' do
>>>>>>> c033601 (Rebased)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
                  it 'decrease quantity' do
=======
                  it 'increase quantity', js: true do
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
=======
=======
                  it 'increase quantity', js: true do
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
                  it 'decrease quantity' do
>>>>>>> 872e675 (Fix)
=======
                  it 'decrease quantity' do
=======
                  it 'increase quantity', js: true do
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
=======
=======
                  it 'increase quantity', js: true do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
=======
                  it 'increase quantity', js: true do
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
                  it 'decrease quantity' do
=======
                  it 'increase quantity', js: true do
>>>>>>> d0dc1f1 (Featire specs)
=======
                  it 'increase quantity', js: true do
>>>>>>> 752f0c0 (Featire specs)
=======
                  it 'increase quantity', js: true do
>>>>>>> 4e81ea2 (Featire specs)
=======
                  it 'increase quantity', js: true do
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
                  it 'decrease quantity' do
>>>>>>> 5b7749a (Fix)
          
        114. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
          
      114. 
=======
          
      115. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      116. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      117. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      118. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      119. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
          
      120. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      121. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      122. 
>>>>>>> 5b7749a (Fix)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
                    find('a', class: 'dec').click
=======
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
                    find('a', class: 'dec').click
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
                    expect(page).to have_content("€#{book.price * 2}")
          
        123. 
        
        
      
        
        
          
      123. 
            
            

            

                  end
          
        124. 
        
        
      
        
        
          
      124. 
            
            

            

            
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                    find('a', class: 'dec').click
>>>>>>> 872e675 (Fix)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
                    find('a', class: 'dec').click
>>>>>>> 5b7749a (Fix)
          
        125. 
        
        
      
        
        
          
      125. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
                  it 'decrease quantity', js: true do
=======
                  it 'decrease quantity' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
=======
                  it 'decrease quantity', js: true do
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                  it 'decrease quantity' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
                  it 'decrease quantity', js: true do
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
                  it 'decrease quantity' do
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
        126. 
        
        
      
        
        
          
      126. 
            1
            

            

                    find('a', class: 'dec').click
          
        127. 
        
        
      
        
        
          
      127. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 872e675 (Fix)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
                    expect(page).to have_content("€#{book.price}")
          
        128. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
          
      128. 
            
            

            

                  end
          
        129. 
        
        
      
        
        
          
      129. 
            
            

            

                end
          
        130. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
          
      130. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
              end
=======
                  end
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
                  end
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              end
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
                  end
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
                  end
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
                  end
>>>>>>> 4e81ea2 (Featire specs)
=======
                  end
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                  end
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
                  end
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  end
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                  end
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
                  end
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
                  end
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
              end
>>>>>>> 5b7749a (Fix)
          
        131. 
        
        
      
        
        
          
      131. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
                end
          
        132. 
        
        
      
        
        
          
      132. 
            
            

            

              end
          
        133. 
        
        
      
        
        
          
      133. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 872e675 (Fix)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
            
          
        134. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
          
      134. 
            1
            

            

              describe '#catalog' do
          
        135. 
        
        
      
        
        
          
      135. 
            1
            

            

                describe 'filter by category' do
          
        136. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
          
      136. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
              describe '#catalog' do
          
        137. 
        
        
      
        
        
          
      137. 
            1
            

            

                describe 'filter by category' do
          
        138. 
        
        
      
        
        
          
      138. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 872e675 (Fix)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
                  before do
          
        139. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      139. 
=======
          
      140. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      141. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      142. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      143. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      144. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
          
      145. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      146. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      147. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      148. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      149. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      150. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      151. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      152. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      153. 
>>>>>>> 5b7749a (Fix)
            2
            

            

                    category_one.books.create(params)
          
        154. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      154. 
=======
          
      155. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      156. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      157. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      158. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      159. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
          
      160. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      161. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      162. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      163. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      164. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      165. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      166. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      167. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      168. 
>>>>>>> 5b7749a (Fix)
            2
            

            

                    visit books_path
          
        169. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      169. 
=======
          
      170. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      171. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      172. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      173. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      174. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
          
      175. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      176. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      177. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      178. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      179. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      180. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      181. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      182. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      183. 
>>>>>>> 5b7749a (Fix)
            
            

            

                  end
          
        184. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      184. 
=======
          
      185. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      186. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      187. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      188. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      189. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
          
      190. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      191. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      192. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      193. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      194. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      195. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      196. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      197. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      198. 
>>>>>>> 5b7749a (Fix)
            
            

            

            
          
        199. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      199. 
=======
          
      200. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      201. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      202. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      203. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      204. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
          
      205. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      206. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      207. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      208. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      209. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      210. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      211. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      212. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      213. 
>>>>>>> 5b7749a (Fix)
            1
            

            

                  after do
          
        214. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      214. 
=======
          
      215. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      216. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      217. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      218. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      219. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
          
      220. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      221. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      222. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      223. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      224. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      225. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      226. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      227. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      228. 
>>>>>>> 5b7749a (Fix)
            2
            

            

                    category_one.destroy
          
        229. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      229. 
=======
          
      230. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      231. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      232. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      233. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      234. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
          
      235. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      236. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      237. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      238. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      239. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      240. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      241. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      242. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      243. 
>>>>>>> 5b7749a (Fix)
            
            

            

                  end
          
        244. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      244. 
=======
          
      245. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      246. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      247. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      248. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      249. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
          
      250. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      251. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      252. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      253. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      254. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      255. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      256. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      257. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      258. 
>>>>>>> 5b7749a (Fix)
            
            

            

            
          
        259. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      259. 
=======
          
      260. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      261. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      262. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      263. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      264. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
          
      265. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      266. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      267. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      268. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      269. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      270. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      271. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      272. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      273. 
>>>>>>> 5b7749a (Fix)
            1
            

            

                  it 'show book count for category' do
          
        274. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      274. 
=======
          
      275. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      276. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      277. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      278. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      279. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
          
      280. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      281. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      282. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      283. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      284. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      285. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      286. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      287. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      288. 
>>>>>>> 5b7749a (Fix)
            1
            

            

                    expect(page).to have_content(category_one.books.size)
          
        289. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      289. 
=======
          
      290. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      291. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      292. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      293. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      294. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
          
      295. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      296. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      297. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      298. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      299. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      300. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      301. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      302. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      303. 
>>>>>>> 5b7749a (Fix)
            
            

            

                  end
          
        304. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      304. 
=======
          
      305. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      306. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      307. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      308. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      309. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
          
      310. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      311. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      312. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      313. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      314. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      315. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      316. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      317. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      318. 
>>>>>>> 5b7749a (Fix)
            
            

            

            
          
        319. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
          
      319. 
            1
            

            

                  it 'filter book by category' do
          
        320. 
        
        
      
        
        
          
      320. 
            1
            

            

                    within 'ul', class: 'list-inline pt-10 mb-25 mr-240', id: 'filter' do
          
        321. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
          
      321. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
                  it 'filter book by category' do
          
        322. 
        
        
      
        
        
          
      322. 
            1
            

            

                    within 'ul', class: 'list-inline pt-10 mb-25 mr-240', id: 'filter' do
          
        323. 
        
        
      
        
        
          
      323. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 872e675 (Fix)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
                      click_on category_one.name
          
        324. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      324. 
=======
          
      325. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      326. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      327. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      328. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      329. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
          
      330. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      331. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      332. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      333. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      334. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      335. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      336. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      337. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      338. 
>>>>>>> 5b7749a (Fix)
            
            

            

                    end
          
        339. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      339. 
=======
          
      340. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      341. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      342. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      343. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      344. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
          
      345. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      346. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      347. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      348. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      349. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      350. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      351. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      352. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      353. 
>>>>>>> 5b7749a (Fix)
            
            

            

            
          
        354. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      354. 
=======
          
      355. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      356. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      357. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      358. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      359. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
          
      360. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      361. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      362. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      363. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      364. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      365. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      366. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      367. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      368. 
>>>>>>> 5b7749a (Fix)
            1
            

            

                    expect(page).to have_content(category_one.books.first.title)
          
        369. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      369. 
=======
          
      370. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      371. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      372. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      373. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      374. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
          
      375. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      376. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      377. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      378. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      379. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      380. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      381. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      382. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      383. 
>>>>>>> 5b7749a (Fix)
            
            

            

                  end
          
        384. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      384. 
=======
          
      385. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      386. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      387. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      388. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      389. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
          
      390. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      391. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      392. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      393. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      394. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      395. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      396. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      397. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      398. 
>>>>>>> 5b7749a (Fix)
            
            

            

                end
          
        399. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      399. 
=======
          
      400. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      401. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      402. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      403. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      404. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
          
      405. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      406. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      407. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      408. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      409. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      410. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      411. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      412. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      413. 
>>>>>>> 5b7749a (Fix)
            
            

            

            
          
        414. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      414. 
=======
          
      415. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      416. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      417. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      418. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      419. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
          
      420. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      421. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      422. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      423. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      424. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      425. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      426. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      427. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      428. 
>>>>>>> 5b7749a (Fix)
            1
            

            

                describe 'filter by all books' do
          
        429. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      429. 
=======
          
      430. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      431. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      432. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      433. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      434. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
          
      435. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      436. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      437. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      438. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      439. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      440. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      441. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      442. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      443. 
>>>>>>> 5b7749a (Fix)
            1
            

            

                  before do
          
        444. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      444. 
=======
          
      445. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      446. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      447. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      448. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      449. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
          
      450. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      451. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      452. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      453. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      454. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      455. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      456. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      457. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      458. 
>>>>>>> 5b7749a (Fix)
            2
            

            

                    category_one.books.create(params)
          
        459. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
          
      459. 
            2
            

            

                    category_two.books.create(params)
          
        460. 
        
        
      
        
        
          
      460. 
            
            

            

            
          
        461. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
          
      461. 
            2
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
                    visit books_path
=======
                    category_two.books.create(params)
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
                    category_two.books.create(params)
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                    visit books_path
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
                    category_two.books.create(params)
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
                    category_two.books.create(params)
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
                    category_two.books.create(params)
>>>>>>> 4e81ea2 (Featire specs)
=======
                    category_two.books.create(params)
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                    category_two.books.create(params)
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
                    category_two.books.create(params)
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                    category_two.books.create(params)
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                    category_two.books.create(params)
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
                    category_two.books.create(params)
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
                    category_two.books.create(params)
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
                    visit books_path
>>>>>>> 5b7749a (Fix)
          
        462. 
        
        
      
        
        
          
      462. 
            
            

            

            
          
        463. 
        
        
      
        
        
          
      463. 
            2
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
                    click_on I18n.t('catalog_page.all')
=======
                    visit books_path
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
                    visit books_path
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                    click_on I18n.t('catalog_page.all')
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
                    visit books_path
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
                    visit books_path
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
                    visit books_path
>>>>>>> 4e81ea2 (Featire specs)
=======
                    visit books_path
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                    visit books_path
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
                    visit books_path
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                    visit books_path
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                    visit books_path
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
                    visit books_path
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
                    visit books_path
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
                    click_on I18n.t('catalog_page.all')
>>>>>>> 5b7749a (Fix)
          
        464. 
        
        
      
        
        
          
      464. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
            
          
        465. 
        
        
      
        
        
          
      465. 
            2
            

            

                    click_on 'All'
          
        466. 
        
        
      
        
        
          
      466. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 872e675 (Fix)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
                  end
          
        467. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      467. 
=======
          
      468. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      469. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      470. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      471. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      472. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
          
      473. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      474. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      475. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      476. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      477. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      478. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      479. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      480. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      481. 
>>>>>>> 5b7749a (Fix)
            
            

            

            
          
        482. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      482. 
=======
          
      483. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      484. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      485. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      486. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      487. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
          
      488. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      489. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      490. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      491. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      492. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      493. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      494. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      495. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      496. 
>>>>>>> 5b7749a (Fix)
            1
            

            

                  after do
          
        497. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      497. 
=======
          
      498. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      499. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      500. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      501. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      502. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
          
      503. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      504. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      505. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      506. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      507. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      508. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      509. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      510. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      511. 
>>>>>>> 5b7749a (Fix)
            2
            

            

                    category_one.destroy
          
        512. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      512. 
=======
          
      513. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      514. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      515. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      516. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      517. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
          
      518. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      519. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      520. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      521. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      522. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      523. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      524. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      525. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      526. 
>>>>>>> 5b7749a (Fix)
            2
            

            

                    category_two.destroy
          
        527. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      527. 
=======
          
      528. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      529. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      530. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      531. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      532. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
          
      533. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      534. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      535. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      536. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      537. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      538. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      539. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      540. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      541. 
>>>>>>> 5b7749a (Fix)
            
            

            

                  end
          
        542. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      542. 
=======
          
      543. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      544. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      545. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      546. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      547. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
          
      548. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      549. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      550. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      551. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      552. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      553. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      554. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      555. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      556. 
>>>>>>> 5b7749a (Fix)
            
            

            

            
          
        557. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      557. 
=======
          
      558. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      559. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      560. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      561. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      562. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
          
      563. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      564. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      565. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      566. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      567. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      568. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      569. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      570. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      571. 
>>>>>>> 5b7749a (Fix)
            1
            

            

                  it 'shown books for first category' do
          
        572. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      572. 
=======
          
      573. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      574. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      575. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      576. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      577. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
          
      578. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      579. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      580. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      581. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      582. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      583. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      584. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      585. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      586. 
>>>>>>> 5b7749a (Fix)
            1
            

            

                    expect(page).to have_content(category_one.books.first.title)
          
        587. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      587. 
=======
          
      588. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      589. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      590. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      591. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      592. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
          
      593. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      594. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      595. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      596. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      597. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      598. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      599. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      600. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      601. 
>>>>>>> 5b7749a (Fix)
            
            

            

                  end
          
        602. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      602. 
=======
          
      603. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      604. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      605. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      606. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      607. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
          
      608. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      609. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      610. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      611. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      612. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      613. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      614. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      615. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      616. 
>>>>>>> 5b7749a (Fix)
            
            

            

            
          
        617. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      617. 
=======
          
      618. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      619. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      620. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      621. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      622. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
          
      623. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      624. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      625. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      626. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      627. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      628. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      629. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      630. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      631. 
>>>>>>> 5b7749a (Fix)
            1
            

            

                  it 'shown books for second category' do
          
        632. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      632. 
=======
          
      633. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      634. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      635. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      636. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      637. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
          
      638. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      639. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      640. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      641. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      642. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      643. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      644. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      645. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      646. 
>>>>>>> 5b7749a (Fix)
            1
            

            

                    expect(page).to have_content(category_two.books.first.title)
          
        647. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
          
      647. 
            
            

            

                  end
          
        648. 
        
        
      
        
        
          
      648. 
            
            

            

                end
          
        649. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
          
      649. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
              end
=======
                  end
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
                  end
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              end
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
                  end
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
                  end
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
                  end
>>>>>>> 4e81ea2 (Featire specs)
=======
                  end
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                  end
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
                  end
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  end
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                  end
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
                  end
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
                  end
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
              end
>>>>>>> 5b7749a (Fix)
          
        650. 
        
        
      
        
        
          
      650. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
                end
          
        651. 
        
        
      
        
        
          
      651. 
            
            

            

              end
          
        652. 
        
        
      
        
        
          
      652. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 872e675 (Fix)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
            
          
        653. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      653. 
=======
          
      654. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      655. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      656. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      657. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      658. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
          
      659. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      660. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      661. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      662. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      663. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      664. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      665. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      666. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      667. 
>>>>>>> 5b7749a (Fix)
            1
            

            

              describe 'load_more' do
          
        668. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      668. 
=======
          
      669. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      670. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      671. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      672. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      673. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
          
      674. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      675. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      676. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      677. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      678. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      679. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      680. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      681. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      682. 
>>>>>>> 5b7749a (Fix)
            1
            

            

                before do
          
        683. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      683. 
=======
          
      684. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      685. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      686. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      687. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      688. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
          
      689. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      690. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      691. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      692. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      693. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      694. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      695. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      696. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      697. 
>>>>>>> 5b7749a (Fix)
            3
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                  24.times do
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                  (BooksController::PAGINATION_PER_PAGE * 2).times do
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                  (BooksController::PAGINATION_PER_PAGE * 2).times do
=======
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
                  24.times do
=======
                  (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
                  (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do
>>>>>>> 752f0c0 (Featire specs)
=======
                  (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do
>>>>>>> 4e81ea2 (Featire specs)
=======
                  (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> df37394 (Featire specs)
=======
=======
=======
                  (BooksController::PAGINATION_PER_PAGE * 2).times do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
                  24.times do
>>>>>>> c033601 (Rebased)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
                  24.times do
=======
                  (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
=======
=======
                  (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
                  24.times do
>>>>>>> 872e675 (Fix)
=======
                  24.times do
=======
                  (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
=======
=======
                  (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
=======
                  (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                  (BooksController::PAGINATION_PER_PAGE * 2).times do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
                  (BooksController::PAGINATION_PER_PAGE * 2).times do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                  (BooksController::PAGINATION_PER_PAGE * 2).times do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
                  (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
                  (BooksController::PAGINATION_PER_PAGE * 2).times do
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
                  24.times do
>>>>>>> 5b7749a (Fix)
          
        698. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      698. 
=======
          
      699. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      700. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      701. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      702. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      703. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
          
      704. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      705. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      706. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      707. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      708. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      709. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      710. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      711. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      712. 
>>>>>>> 5b7749a (Fix)
            72
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
                    books << create(:book)
          
        713. 
        
        
      
        
        
          
      713. 
            
            

            

                  end
          
        714. 
        
        
      
        
        
          
      714. 
            
            

            

                end
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
                    books << FactoryBot.create(:book)
>>>>>>> d0dc1f1 (Featire specs)
=======
                    books << FactoryBot.create(:book)
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
=======
                    books << FactoryBot.create(:book)
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
=======
                    books << FactoryBot.create(:book)
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
                    books << FactoryBot.create(:book)
>>>>>>> 4e81ea2 (Featire specs)
=======
                    books << FactoryBot.create(:book)
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                    books << FactoryBot.create(:book)
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
                    books << FactoryBot.create(:book)
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                    books << FactoryBot.create(:book)
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                    books << FactoryBot.create(:book)
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
                    books << FactoryBot.create(:book)
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
                    books << FactoryBot.create(:book)
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
          
        715. 
        
        
      
        
        
          
      715. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
            
=======
                  end
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
                  end
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
            
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
                  end
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
                  end
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
                  end
>>>>>>> 4e81ea2 (Featire specs)
=======
                  end
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                  end
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
                  end
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  end
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                  end
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
                  end
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
                  end
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
            
>>>>>>> 5b7749a (Fix)
          
        716. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      716. 
            4
=======
          
      717. 
            
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      718. 
            
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      719. 
            4
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      720. 
            
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      721. 
            
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      722. 
            
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      723. 
            
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      724. 
            
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      725. 
            
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      726. 
            
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      727. 
            4
>>>>>>> 5b7749a (Fix)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
                let(:books) { [] }
=======
                end
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
                end
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                let(:books) { [] }
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
                end
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
                end
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
                end
>>>>>>> 4e81ea2 (Featire specs)
=======
                end
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                end
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
                end
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                end
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                end
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
                end
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
                end
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
                let(:books) { [] }
>>>>>>> 5b7749a (Fix)
          
        728. 
        
        
      
        
        
          
      728. 
            
            

            

            
          
        729. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      729. 
            1
=======
          
      730. 
            4
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      731. 
            4
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      732. 
            1
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      733. 
            4
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      734. 
            4
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      735. 
            4
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      736. 
            4
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      737. 
            4
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      738. 
            4
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      739. 
            4
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      740. 
            1
>>>>>>> 5b7749a (Fix)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
                it 'show books without view more button' do
=======
                let(:books) { [] }
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
                let(:books) { [] }
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                it 'show books without view more button' do
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
                let(:books) { [] }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
                let(:books) { [] }
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
                let(:books) { [] }
>>>>>>> 4e81ea2 (Featire specs)
=======
                let(:books) { [] }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                let(:books) { [] }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
                let(:books) { [] }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                let(:books) { [] }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                let(:books) { [] }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
                let(:books) { [] }
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
                let(:books) { [] }
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
                it 'show books without view more button' do
>>>>>>> 5b7749a (Fix)
          
        741. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
          
      741. 
            1
            

            

                  visit books_path
          
        742. 
        
        
      
        
        
          
      742. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      743. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      744. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
=======
          
      745. 
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
=======
          
      746. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      747. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      748. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      749. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      750. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      751. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      752. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      753. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      754. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
            
            

            

            
          
        755. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      755. 
            1
            

            

                it 'show books without view more button' do
          
        756. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 872e675 (Fix)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
          
      756. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
                  find('a', id: 'view_more', class: 'view_more').click
=======
                  visit books_path
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
                  visit books_path
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                  find('a', id: 'view_more', class: 'view_more').click
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
                  visit books_path
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
                  visit books_path
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
                  visit books_path
>>>>>>> 4e81ea2 (Featire specs)
=======
                  visit books_path
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                  visit books_path
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
                  visit books_path
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  visit books_path
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                  visit books_path
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
                  visit books_path
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
                  visit books_path
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
                  find('a', id: 'view_more', class: 'view_more').click
>>>>>>> 5b7749a (Fix)
          
        757. 
        
        
      
        
        
          
      757. 
            
            

            

            
          
        758. 
        
        
      
        
        
          
      758. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
                  expect(page).not_to have_css('a', class: 'view_more hidden', id: 'view_more')
=======
                  find('a', id: 'view_more', class: 'view_more').click
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
                  find('a', id: 'view_more', class: 'view_more').click
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                  expect(page).not_to have_css('a', class: 'view_more hidden', id: 'view_more')
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
                  find('a', id: 'view_more', class: 'view_more').click
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
                  find('a', id: 'view_more', class: 'view_more').click
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
                  find('a', id: 'view_more', class: 'view_more').click
>>>>>>> 4e81ea2 (Featire specs)
=======
                  find('a', id: 'view_more', class: 'view_more').click
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                  find('a', id: 'view_more', class: 'view_more').click
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
                  find('a', id: 'view_more', class: 'view_more').click
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  find('a', id: 'view_more', class: 'view_more').click
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                  find('a', id: 'view_more', class: 'view_more').click
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
                  find('a', id: 'view_more', class: 'view_more').click
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
                  find('a', id: 'view_more', class: 'view_more').click
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
                  expect(page).not_to have_css('a', class: 'view_more hidden', id: 'view_more')
>>>>>>> 5b7749a (Fix)
          
        759. 
        
        
      
        
        
          
      759. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
            
          
        760. 
        
        
      
        
        
          
      760. 
            1
            

            

                  expect(page).not_to have_css('a', class: 'view_more hidden', id: 'view_more')
          
        761. 
        
        
      
        
        
          
      761. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 872e675 (Fix)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
                end
          
        762. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      762. 
=======
          
      763. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      764. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      765. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      766. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      767. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
          
      768. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      769. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      770. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      771. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      772. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      773. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      774. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      775. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      776. 
>>>>>>> 5b7749a (Fix)
            
            

            

            
          
        777. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
          
      777. 
            1
            

            

                context 'when view more' do
          
        778. 
        
        
      
        
        
          
      778. 
            1
            

            

                  it 'show books with view more button' do
          
        779. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
          
      779. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
                    visit books_path
=======
                context 'when view more' do
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
                context 'when view more' do
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                    visit books_path
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
                context 'when view more' do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
                context 'when view more' do
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
                context 'when view more' do
>>>>>>> 4e81ea2 (Featire specs)
=======
                context 'when view more' do
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                context 'when view more' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
                context 'when view more' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                context 'when view more' do
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                context 'when view more' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
                context 'when view more' do
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
                context 'when view more' do
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
                    visit books_path
>>>>>>> 5b7749a (Fix)
          
        780. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      780. 
            
=======
          
      781. 
            1
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      782. 
            1
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      783. 
            
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      784. 
            1
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      785. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      786. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      787. 
            1
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      788. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      789. 
            1
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      790. 
            1
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      791. 
            
>>>>>>> 5b7749a (Fix)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
            
=======
                  it 'show books with view more button' do
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
                  it 'show books with view more button' do
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
            
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
                  it 'show books with view more button' do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
                  it 'show books with view more button' do
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
                  it 'show books with view more button' do
>>>>>>> 4e81ea2 (Featire specs)
=======
                  it 'show books with view more button' do
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                  it 'show books with view more button' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
                  it 'show books with view more button' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it 'show books with view more button' do
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                  it 'show books with view more button' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
                  it 'show books with view more button' do
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
                  it 'show books with view more button' do
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
            
>>>>>>> 5b7749a (Fix)
          
        792. 
        
        
      
        
        
          
      792. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
                    expect(page).to have_css('a', class: 'view_more')
=======
                    visit books_path
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
                    visit books_path
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                    expect(page).to have_css('a', class: 'view_more')
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
                    visit books_path
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
                    visit books_path
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
                    visit books_path
>>>>>>> 4e81ea2 (Featire specs)
=======
                    visit books_path
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                    visit books_path
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
                    visit books_path
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                    visit books_path
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                    visit books_path
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
                    visit books_path
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
                    visit books_path
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
                    expect(page).to have_css('a', class: 'view_more')
>>>>>>> 5b7749a (Fix)
          
        793. 
        
        
      
        
        
          
      793. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
            
          
        794. 
        
        
      
        
        
          
      794. 
            1
            

            

                    expect(page).to have_css('a', class: 'view_more')
          
        795. 
        
        
      
        
        
          
      795. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 872e675 (Fix)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
                  end
          
        796. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      796. 
=======
          
      797. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      798. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      799. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      800. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      801. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
          
      802. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      803. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      804. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      805. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      806. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      807. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      808. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      809. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      810. 
>>>>>>> 5b7749a (Fix)
            
            

            

            
          
        811. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      811. 
=======
          
      812. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      813. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      814. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      815. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      816. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
          
      817. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      818. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      819. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      820. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      821. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      822. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      823. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      824. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      825. 
>>>>>>> 5b7749a (Fix)
            1
            

            

                  it 'show loaded books', js: true do
          
        826. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
          
      826. 
            1
            

            

                    visit books_path
          
        827. 
        
        
      
        
        
          
      827. 
            
            

            

            
          
        828. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
          
      828. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
                    find('a', class: 'view_more').click
=======
                    visit books_path
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
                    visit books_path
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                    find('a', class: 'view_more').click
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
                    visit books_path
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
                    visit books_path
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
                    visit books_path
>>>>>>> 4e81ea2 (Featire specs)
=======
                    visit books_path
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                    visit books_path
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
                    visit books_path
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                    visit books_path
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                    visit books_path
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
                    visit books_path
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
                    visit books_path
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
                    find('a', class: 'view_more').click
>>>>>>> 5b7749a (Fix)
          
        829. 
        
        
      
        
        
          
      829. 
            
            

            

            
          
        830. 
        
        
      
        
        
          
      830. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
                    expect(page).to have_content(books.last.title)
=======
                    find('a', id: 'view_more', class: 'view_more').click
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
                    find('a', id: 'view_more', class: 'view_more').click
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                    expect(page).to have_content(books.last.title)
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
                    find('a', id: 'view_more', class: 'view_more').click
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
                    find('a', id: 'view_more', class: 'view_more').click
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
                    find('a', id: 'view_more', class: 'view_more').click
>>>>>>> 4e81ea2 (Featire specs)
=======
                    find('a', id: 'view_more', class: 'view_more').click
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                    find('a', id: 'view_more', class: 'view_more').click
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
                    find('a', id: 'view_more', class: 'view_more').click
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                    find('a', id: 'view_more', class: 'view_more').click
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                    find('a', id: 'view_more', class: 'view_more').click
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
                    find('a', id: 'view_more', class: 'view_more').click
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
                    find('a', id: 'view_more', class: 'view_more').click
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
                    expect(page).to have_content(books.last.title)
>>>>>>> 5b7749a (Fix)
          
        831. 
        
        
      
        
        
          
      831. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
                  end
=======
            
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
            
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                  end
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
            
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
            
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
            
>>>>>>> 4e81ea2 (Featire specs)
=======
            
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
            
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
            
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
            
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
            
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
            
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
            
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
                  end
>>>>>>> 5b7749a (Fix)
          
        832. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      832. 
            
=======
          
      833. 
            1
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      834. 
            1
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      835. 
            
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      836. 
            1
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      837. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      838. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      839. 
            1
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      840. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      841. 
            1
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      842. 
            1
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      843. 
            
>>>>>>> 5b7749a (Fix)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
                end
=======
                    expect(page).to have_content(books.last.title)
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
                    expect(page).to have_content(books.last.title)
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                end
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
                    expect(page).to have_content(books.last.title)
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
                    expect(page).to have_content(books.last.title)
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
                    expect(page).to have_content(books.last.title)
>>>>>>> 4e81ea2 (Featire specs)
=======
                    expect(page).to have_content(books.last.title)
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                    expect(page).to have_content(books.last.title)
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
                    expect(page).to have_content(books.last.title)
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                    expect(page).to have_content(books.last.title)
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                    expect(page).to have_content(books.last.title)
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
                    expect(page).to have_content(books.last.title)
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
                    expect(page).to have_content(books.last.title)
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
                end
>>>>>>> 5b7749a (Fix)
          
        844. 
        
        
      
        
        
          
      844. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
              end
=======
                  end
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
                  end
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              end
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
                  end
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
                  end
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
                  end
>>>>>>> 4e81ea2 (Featire specs)
=======
                  end
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                  end
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
                  end
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  end
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                  end
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
                  end
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
                  end
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
              end
>>>>>>> 5b7749a (Fix)
          
        845. 
        
        
      
        
        
          
      845. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
                end
          
        846. 
        
        
      
        
        
          
      846. 
            
            

            

              end
          
        847. 
        
        
      
        
        
          
      847. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 872e675 (Fix)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
            
          
        848. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      848. 
=======
          
      849. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      850. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      851. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      852. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      853. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
          
      854. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      855. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      856. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      857. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      858. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      859. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      860. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      861. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      862. 
>>>>>>> 5b7749a (Fix)
            1
            

            

              describe 'sort' do
          
        863. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      863. 
=======
          
      864. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      865. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      866. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      867. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      868. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
          
      869. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      870. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      871. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      872. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      873. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      874. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      875. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      876. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      877. 
>>>>>>> 5b7749a (Fix)
            1
            

            

                shared_examples 'sort test' do
          
        878. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      878. 
=======
          
      879. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      880. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      881. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      882. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      883. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
          
      884. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      885. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      886. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      887. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      888. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      889. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      890. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      891. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      892. 
>>>>>>> 5b7749a (Fix)
            5
            

            

                  it 'sort books' do
          
        893. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
          
      893. 
            5
            

            

                    create(:book, title: 'Zimbabwe', price_cents: 75,
          
        894. 
        
        
      
        
        
          
      894. 
            
            

            

                                  created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
          
        895. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
          
      895. 
            5
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
                    create(:book, title: 'Anna', price_cents: 23,
=======
                    FactoryBot.create(:book, title: 'Zimbabwe', price: 75,
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
                    FactoryBot.create(:book, title: 'Zimbabwe', price: 75,
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                    create(:book, title: 'Anna', price_cents: 23,
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
                    FactoryBot.create(:book, title: 'Zimbabwe', price: 75,
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
                    FactoryBot.create(:book, title: 'Zimbabwe', price: 75,
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
                    FactoryBot.create(:book, title: 'Zimbabwe', price: 75,
>>>>>>> 4e81ea2 (Featire specs)
=======
                    FactoryBot.create(:book, title: 'Zimbabwe', price: 75,
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                    FactoryBot.create(:book, title: 'Zimbabwe', price: 75,
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
                    FactoryBot.create(:book, title: 'Zimbabwe', price: 75,
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                    FactoryBot.create(:book, title: 'Zimbabwe', price: 75,
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                    FactoryBot.create(:book, title: 'Zimbabwe', price: 75,
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
                    FactoryBot.create(:book, title: 'Zimbabwe', price: 75,
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
                    FactoryBot.create(:book, title: 'Zimbabwe', price: 75,
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
                    create(:book, title: 'Anna', price_cents: 23,
>>>>>>> 5b7749a (Fix)
          
        896. 
        
        
      
        
        
          
      896. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                                  created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00')
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                                             created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                                             created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
=======
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
                                  created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00')
=======
                                      created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
                                      created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
>>>>>>> 752f0c0 (Featire specs)
=======
                                      created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
>>>>>>> 4e81ea2 (Featire specs)
=======
                                      created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> df37394 (Featire specs)
=======
=======
=======
                                             created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
                                  created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00')
>>>>>>> c033601 (Rebased)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
                                  created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00')
=======
                                      created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
=======
=======
                                      created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
                                  created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00')
>>>>>>> 872e675 (Fix)
=======
                                  created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00')
=======
                                      created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
=======
=======
                                      created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
=======
                                      created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                                             created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
                                             created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                                      created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                                             created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
                                      created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
                                             created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
                                  created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00')
>>>>>>> 5b7749a (Fix)
          
        897. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      897. 
=======
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      898. 
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      899. 
            5
            

            

                    FactoryBot.create(:book, title: 'Anna', price: 23, created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00')
          
        900. 
        
        
      
        
        
          
      900. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      901. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      902. 
>>>>>>> 5b7749a (Fix)
            
            

            

            
          
        903. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      903. 
=======
          
      904. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      905. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      906. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      907. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      908. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
          
      909. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      910. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      911. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      912. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      913. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      914. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      915. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      916. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      917. 
>>>>>>> 5b7749a (Fix)
            5
            

            

                    visit books_path
          
        918. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      918. 
=======
          
      919. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      920. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      921. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      922. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      923. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
          
      924. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      925. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      926. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      927. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      928. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      929. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      930. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      931. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      932. 
>>>>>>> 5b7749a (Fix)
            
            

            

            
          
        933. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      933. 
=======
          
      934. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      935. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      936. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      937. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      938. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
          
      939. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      940. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      941. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      942. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      943. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      944. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      945. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      946. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      947. 
>>>>>>> 5b7749a (Fix)
            5
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
                    find('a', class: 'dropdown-toggle lead small', text: I18n.t('catalog_page.sorting.newer_first'),
          
        948. 
        
        
      
        
        
          
      948. 
            
            

            

                              id: 'menu').click
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
                    find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click
>>>>>>> d0dc1f1 (Featire specs)
=======
                    find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
=======
                    find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
=======
                    find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
                    find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click
>>>>>>> 4e81ea2 (Featire specs)
=======
                    find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                    find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
                    find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                    find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                    find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
                    find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
                    find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
          
        949. 
        
        
      
        
        
          
      949. 
            
            

            

            
          
        950. 
        
        
      
        
        
          
      950. 
            5
            

            

                    within 'ul', class: 'dropdown-menu', id: 'sort' do
          
        951. 
        
        
      
        
        
          
      951. 
            5
            

            

                      click_link button
          
        952. 
        
        
      
        
        
          
      952. 
            
            

            

                    end
          
        953. 
        
        
      
        
        
          
      953. 
            5
            

            

                    expect(find('.col-xs-6.col-sm-3', match: :first)).to have_content(book_title)
          
        954. 
        
        
      
        
        
          
      954. 
            
            

            

                  end
          
        955. 
        
        
      
        
        
          
      955. 
            
            

            

                end
          
        956. 
        
        
      
        
        
          
      956. 
            
            

            

            
          
        957. 
        
        
      
        
        
          
      957. 
            1
            

            

                context 'when sort by title A to Z' do
          
        958. 
        
        
      
        
        
          
      958. 
            2
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
                  let(:button) { I18n.t('catalog_page.sorting.title.asc') }
=======
                  let(:button) { 'Title: A to Z' }
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
                  let(:button) { 'Title: A to Z' }
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                  let(:button) { I18n.t('catalog_page.sorting.title.asc') }
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
                  let(:button) { 'Title: A to Z' }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
                  let(:button) { 'Title: A to Z' }
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
                  let(:button) { 'Title: A to Z' }
>>>>>>> 4e81ea2 (Featire specs)
=======
                  let(:button) { 'Title: A to Z' }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                  let(:button) { 'Title: A to Z' }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
                  let(:button) { 'Title: A to Z' }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  let(:button) { 'Title: A to Z' }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                  let(:button) { 'Title: A to Z' }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
                  let(:button) { 'Title: A to Z' }
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
                  let(:button) { 'Title: A to Z' }
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
                  let(:button) { I18n.t('catalog_page.sorting.title.asc') }
>>>>>>> 5b7749a (Fix)
          
        959. 
        
        
      
        
        
          
      959. 
            2
            

            

                  let(:book_title) { 'Anna' }
          
        960. 
        
        
      
        
        
          
      960. 
            
            

            

            
          
        961. 
        
        
      
        
        
          
      961. 
            1
            

            

                  include_examples 'sort test'
          
        962. 
        
        
      
        
        
          
      962. 
            
            

            

                end
          
        963. 
        
        
      
        
        
          
      963. 
            
            

            

            
          
        964. 
        
        
      
        
        
          
      964. 
            1
            

            

                context 'when sort by title Z to A' do
          
        965. 
        
        
      
        
        
          
      965. 
            2
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
                  let(:button) { I18n.t('catalog_page.sorting.title.desc') }
=======
                  let(:button) { 'Title: Z to A' }
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
                  let(:button) { 'Title: Z to A' }
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                  let(:button) { I18n.t('catalog_page.sorting.title.desc') }
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
                  let(:button) { 'Title: Z to A' }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
                  let(:button) { 'Title: Z to A' }
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
                  let(:button) { 'Title: Z to A' }
>>>>>>> 4e81ea2 (Featire specs)
=======
                  let(:button) { 'Title: Z to A' }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                  let(:button) { 'Title: Z to A' }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
                  let(:button) { 'Title: Z to A' }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  let(:button) { 'Title: Z to A' }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                  let(:button) { 'Title: Z to A' }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
                  let(:button) { 'Title: Z to A' }
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
                  let(:button) { 'Title: Z to A' }
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
                  let(:button) { I18n.t('catalog_page.sorting.title.desc') }
>>>>>>> 5b7749a (Fix)
          
        966. 
        
        
      
        
        
          
      966. 
            2
            

            

                  let(:book_title) { 'Zimbabwe' }
          
        967. 
        
        
      
        
        
          
      967. 
            
            

            

            
          
        968. 
        
        
      
        
        
          
      968. 
            1
            

            

                  include_examples 'sort test'
          
        969. 
        
        
      
        
        
          
      969. 
            
            

            

                end
          
        970. 
        
        
      
        
        
          
      970. 
            
            

            

            
          
        971. 
        
        
      
        
        
          
      971. 
            1
            

            

                context 'when sort by price High to Low' do
          
        972. 
        
        
      
        
        
          
      972. 
            2
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
                  let(:button) { I18n.t('catalog_page.sorting.price.desc') }
=======
                  let(:button) { 'Price: High to Low' }
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
                  let(:button) { 'Price: High to Low' }
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                  let(:button) { I18n.t('catalog_page.sorting.price.desc') }
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
                  let(:button) { 'Price: High to Low' }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
                  let(:button) { 'Price: High to Low' }
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
                  let(:button) { 'Price: High to Low' }
>>>>>>> 4e81ea2 (Featire specs)
=======
                  let(:button) { 'Price: High to Low' }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                  let(:button) { 'Price: High to Low' }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
                  let(:button) { 'Price: High to Low' }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  let(:button) { 'Price: High to Low' }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                  let(:button) { 'Price: High to Low' }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
                  let(:button) { 'Price: High to Low' }
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
                  let(:button) { 'Price: High to Low' }
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
                  let(:button) { I18n.t('catalog_page.sorting.price.desc') }
>>>>>>> 5b7749a (Fix)
          
        973. 
        
        
      
        
        
          
      973. 
            2
            

            

                  let(:book_title) { 'Zimbabwe' }
          
        974. 
        
        
      
        
        
          
      974. 
            
            

            

            
          
        975. 
        
        
      
        
        
          
      975. 
            1
            

            

                  include_examples 'sort test'
          
        976. 
        
        
      
        
        
          
      976. 
            
            

            

                end
          
        977. 
        
        
      
        
        
          
      977. 
            
            

            

            
          
        978. 
        
        
      
        
        
          
      978. 
            1
            

            

                context 'when sort by price Low to High' do
          
        979. 
        
        
      
        
        
          
      979. 
            2
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
                  let(:button) { I18n.t('catalog_page.sorting.price.asc') }
=======
                  let(:button) { 'Price: Low to High' }
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
                  let(:button) { 'Price: Low to High' }
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                  let(:button) { I18n.t('catalog_page.sorting.price.asc') }
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
                  let(:button) { 'Price: Low to High' }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
                  let(:button) { 'Price: Low to High' }
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
                  let(:button) { 'Price: Low to High' }
>>>>>>> 4e81ea2 (Featire specs)
=======
                  let(:button) { 'Price: Low to High' }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                  let(:button) { 'Price: Low to High' }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
                  let(:button) { 'Price: Low to High' }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  let(:button) { 'Price: Low to High' }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                  let(:button) { 'Price: Low to High' }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
                  let(:button) { 'Price: Low to High' }
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
                  let(:button) { 'Price: Low to High' }
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
                  let(:button) { I18n.t('catalog_page.sorting.price.asc') }
>>>>>>> 5b7749a (Fix)
          
        980. 
        
        
      
        
        
          
      980. 
            2
            

            

                  let(:book_title) { 'Anna' }
          
        981. 
        
        
      
        
        
          
      981. 
            
            

            

            
          
        982. 
        
        
      
        
        
          
      982. 
            1
            

            

                  include_examples 'sort test'
          
        983. 
        
        
      
        
        
          
      983. 
            
            

            

                end
          
        984. 
        
        
      
        
        
          
      984. 
            
            

            

            
          
        985. 
        
        
      
        
        
          
      985. 
            1
            

            

                context 'when sort by newest' do
          
        986. 
        
        
      
        
        
          
      986. 
            2
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
                  let(:button) { I18n.t('catalog_page.sorting.newer_first') }
=======
                  let(:button) { 'Newest first' }
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
                  let(:button) { 'Newest first' }
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                  let(:button) { I18n.t('catalog_page.sorting.newer_first') }
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
                  let(:button) { 'Newest first' }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
                  let(:button) { 'Newest first' }
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
                  let(:button) { 'Newest first' }
>>>>>>> 4e81ea2 (Featire specs)
=======
                  let(:button) { 'Newest first' }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                  let(:button) { 'Newest first' }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
                  let(:button) { 'Newest first' }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  let(:button) { 'Newest first' }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                  let(:button) { 'Newest first' }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
                  let(:button) { 'Newest first' }
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
                  let(:button) { 'Newest first' }
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
                  let(:button) { I18n.t('catalog_page.sorting.newer_first') }
>>>>>>> 5b7749a (Fix)
          
        987. 
        
        
      
        
        
          
      987. 
            2
            

            

                  let(:book_title) { 'Zimbabwe' }
          
        988. 
        
        
      
        
        
          
      988. 
            
            

            

            
          
        989. 
        
        
      
        
        
          
      989. 
            1
            

            

                  include_examples 'sort test'
          
        990. 
        
        
      
        
        
          
      990. 
            
            

            

                end
          
        991. 
        
        
      
        
        
          
      991. 
            
            

            

              end
          
        992. 
        
        
      
        
        
          
      992. 
            
            

            

            end
          
        993. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/feature/cart_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      29 relevant lines.
      29 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            require 'rails_helper'
          
        2. 
        
        
      
        
        
          
      2. 
            
            

            

            
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

            RSpec.describe 'Cart', type: :feature, js: true do
          
        4. 
        
        
      
        
        
          
      4. 
            5
            

            

              let(:book) { FactoryBot.create(:book) }
          
        5. 
        
        
      
        
        
          
      5. 
            
            

            

            
          
        6. 
        
        
      
        
        
          
      6. 
            1
            

            

              before do
          
        7. 
        
        
      
        
        
          
      7. 
            4
            

            

                book
          
        8. 
        
        
      
        
        
          
      8. 
            4
            

            

                visit book_path(book.id)
          
        9. 
        
        
      
        
        
          
      9. 
            
            

            

            
          
        10. 
        
        
      
        
        
          
      10. 
            4
            

            

                click_button I18n.t('book_page.add_to_card')
          
        11. 
        
        
      
        
        
          
      11. 
            
            

            

              end
          
        12. 
        
        
      
        
        
          
      12. 
            
            

            

            
          
        13. 
        
        
      
        
        
          
      13. 
            1
            

            

              describe '#add_book_to_order' do
          
        14. 
        
        
      
        
        
          
      14. 
            1
            

            

                it 'add book to order' do
          
        15. 
        
        
      
        
        
          
      15. 
            1
            

            

                  within('span', class: 'shop-icon') do
          
        16. 
        
        
      
        
        
          
      16. 
            1
            

            

                    expect(page).to have_content(1)
          
        17. 
        
        
      
        
        
          
      17. 
            
            

            

                  end
          
        18. 
        
        
      
        
        
          
      18. 
            
            

            

                end
          
        19. 
        
        
      
        
        
          
      19. 
            
            

            

              end
          
        20. 
        
        
      
        
        
          
      20. 
            
            

            

            
          
        21. 
        
        
      
        
        
          
      21. 
            1
            

            

              describe '#quantity_change' do
          
        22. 
        
        
      
        
        
          
      22. 
            1
            

            

                it 'book quantity inc' do
          
        23. 
        
        
      
        
        
          
      23. 
            1
            

            

                  visit orders_path
          
        24. 
        
        
      
        
        
          
      24. 
            
            

            

            
          
        25. 
        
        
      
        
        
          
      25. 
            1
            

            

                  within("a#inc#{book.id}.input-link") do
          
        26. 
        
        
      
        
        
          
      26. 
            1
            

            

                    find('i.fa.fa-plus.line-heaght-40').click
          
        27. 
        
        
      
        
        
          
      27. 
            
            

            

                  end
          
        28. 
        
        
      
        
        
          
      28. 
            
            

            

            
          
        29. 
        
        
      
        
        
          
      29. 
            1
            

            

                  sleep(2)
          
        30. 
        
        
      
        
        
          
      30. 
            
            

            

            
          
        31. 
        
        
      
        
        
          
      31. 
            1
            

            

                  expect(find_field("counter#{book.id}").value).to eq('2')
          
        32. 
        
        
      
        
        
          
      32. 
            
            

            

                end
          
        33. 
        
        
      
        
        
          
      33. 
            
            

            

            
          
        34. 
        
        
      
        
        
          
      34. 
            1
            

            

                it 'book quantity dec' do
          
        35. 
        
        
      
        
        
          
      35. 
            1
            

            

                  visit orders_path
          
        36. 
        
        
      
        
        
          
      36. 
            
            

            

            
          
        37. 
        
        
      
        
        
          
      37. 
            1
            

            

                  within("a#dec#{book.id}.input-link") do
          
        38. 
        
        
      
        
        
          
      38. 
            1
            

            

                    find('i.fa.fa-minus.line-heaght-40').click
          
        39. 
        
        
      
        
        
          
      39. 
            
            

            

                  end
          
        40. 
        
        
      
        
        
          
      40. 
            
            

            

            
          
        41. 
        
        
      
        
        
          
      41. 
            1
            

            

                  sleep(2)
          
        42. 
        
        
      
        
        
          
      42. 
            
            

            

            
          
        43. 
        
        
      
        
        
          
      43. 
            1
            

            

                  expect(find_field("counter#{book.id}").value).to eq('0')
          
        44. 
        
        
      
        
        
          
      44. 
            
            

            

                end
          
        45. 
        
        
      
        
        
          
      45. 
            
            

            

              end
          
        46. 
        
        
      
        
        
          
      46. 
            
            

            

            
          
        47. 
        
        
      
        
        
          
      47. 
            1
            

            

              describe '#remove_book_from_cart' do
          
        48. 
        
        
      
        
        
          
      48. 
            1
            

            

                it 'book quantity change' do
          
        49. 
        
        
      
        
        
          
      49. 
            1
            

            

                  visit orders_path
          
        50. 
        
        
      
        
        
          
      50. 
            
            

            

            
          
        51. 
        
        
      
        
        
          
      51. 
            1
            

            

                  find('button.close.general-cart-close').click
          
        52. 
        
        
      
        
        
          
      52. 
            
            

            

            
          
        53. 
        
        
      
        
        
          
      53. 
            1
            

            

                  expect(page).to have_content(I18n.t('order.messages.delete'))
          
        54. 
        
        
      
        
        
          
      54. 
            
            

            

                end
          
        55. 
        
        
      
        
        
          
      55. 
            
            

            

              end
          
        56. 
        
        
      
        
        
          
      56. 
            
            

            

            end
          
        57. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/feature/coupon_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      30 relevant lines.
      30 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            require 'rails_helper'
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

            require_relative '../support/shared_context'
          
        3. 
        
        
      
        
        
          
      3. 
            
            

            

            
          
        4. 
        
        
      
        
        
          
      4. 
            1
            

            

            RSpec.describe 'Coupon', type: :feature, js: true do
          
        5. 
        
        
      
        
        
          
      5. 
            1
            

            

              include_context 'with api request authentication helper methods'
          
        6. 
        
        
      
        
        
          
      6. 
            1
            

            

              include_context 'with api request global before and after hooks'
          
        7. 
        
        
      
        
        
          
      7. 
            
            

            

            
          
        8. 
        
        
      
        
        
          
      8. 
            5
            

            

              let(:user) { FactoryBot.create(:user) }
          
        9. 
        
        
      
        
        
          
      9. 
            4
            

            

              let(:coupon) { FactoryBot.create(:coupon, discount: 0.15) }
          
        10. 
        
        
      
        
        
          
      10. 
            5
            

            

              let(:order) { FactoryBot.create(:order, user_id: user.id, books_count: 0) }
          
        11. 
        
        
      
        
        
          
      11. 
            5
            

            

              let(:book) { FactoryBot.create(:book, price_cents: 1234) }
          
        12. 
        
        
      
        
        
          
      12. 
            5
            

            

              let(:order_book) { FactoryBot.create(:order_book, order: order, book: book) }
          
        13. 
        
        
      
        
        
          
      13. 
            
            

            

            
          
        14. 
        
        
      
        
        
          
      14. 
            1
            

            

              before do
          
        15. 
        
        
      
        
        
          
      15. 
            4
            

            

                sign_in(user)
          
        16. 
        
        
      
        
        
          
      16. 
            4
            

            

                order
          
        17. 
        
        
      
        
        
          
      17. 
            4
            

            

                order_book
          
        18. 
        
        
      
        
        
          
      18. 
            4
            

            

                visit orders_path
          
        19. 
        
        
      
        
        
          
      19. 
            
            

            

              end
          
        20. 
        
        
      
        
        
          
      20. 
            
            

            

            
          
        21. 
        
        
      
        
        
          
      21. 
            1
            

            

              describe '#valid coupon' do
          
        22. 
        
        
      
        
        
          
      22. 
            1
            

            

                before do
          
        23. 
        
        
      
        
        
          
      23. 
            3
            

            

                  fill_in 'input', with: coupon.code
          
        24. 
        
        
      
        
        
          
      24. 
            
            

            

            
          
        25. 
        
        
      
        
        
          
      25. 
            3
            

            

                  click_button I18n.t('order.apply')
          
        26. 
        
        
      
        
        
          
      26. 
            
            

            

                end
          
        27. 
        
        
      
        
        
          
      27. 
            
            

            

            
          
        28. 
        
        
      
        
        
          
      28. 
            1
            

            

                it 'sub price' do
          
        29. 
        
        
      
        
        
          
      29. 
            1
            

            

                  expect(page).to have_content("SubTotal:\n€ 12.34")
          
        30. 
        
        
      
        
        
          
      30. 
            
            

            

                end
          
        31. 
        
        
      
        
        
          
      31. 
            
            

            

            
          
        32. 
        
        
      
        
        
          
      32. 
            1
            

            

                it 'use coupon' do
          
        33. 
        
        
      
        
        
          
      33. 
            1
            

            

                  expect(page).to have_content("Coupon:\n€ 1.85")
          
        34. 
        
        
      
        
        
          
      34. 
            
            

            

                end
          
        35. 
        
        
      
        
        
          
      35. 
            
            

            

            
          
        36. 
        
        
      
        
        
          
      36. 
            1
            

            

                it 'count price with coupon' do
          
        37. 
        
        
      
        
        
          
      37. 
            1
            

            

                  expect(page).to have_content('Order Total: € 10.49')
          
        38. 
        
        
      
        
        
          
      38. 
            
            

            

                end
          
        39. 
        
        
      
        
        
          
      39. 
            
            

            

              end
          
        40. 
        
        
      
        
        
          
      40. 
            
            

            

            
          
        41. 
        
        
      
        
        
          
      41. 
            1
            

            

              describe '#invalid coupon' do
          
        42. 
        
        
      
        
        
          
      42. 
            1
            

            

                it 'show error message' do
          
        43. 
        
        
      
        
        
          
      43. 
            1
            

            

                  fill_in 'input', with: 'dasdasdqe1243wasad'
          
        44. 
        
        
      
        
        
          
      44. 
            
            

            

            
          
        45. 
        
        
      
        
        
          
      45. 
            1
            

            

                  click_button I18n.t('order.apply')
          
        46. 
        
        
      
        
        
          
      46. 
            
            

            

            
          
        47. 
        
        
      
        
        
          
      47. 
            1
            

            

                  expect(page).to have_content(I18n.t('order.coupon.error'))
          
        48. 
        
        
      
        
        
          
      48. 
            
            

            

                end
          
        49. 
        
        
      
        
        
          
      49. 
            
            

            

              end
          
        50. 
        
        
      
        
        
          
      50. 
            
            

            

            end
          
        51. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/feature/home_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
      49 relevant lines.
      49 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            RSpec.describe 'Home', type: :feature do
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

              include_context 'with api request authentication helper methods'
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

              include_context 'with api request global before and after hooks'
          
        4. 
        
        
      
        
        
          
      4. 
            
            

            

            
          
        5. 
        
        
      
        
        
          
      5. 
            1
            

            

              describe 'Get Started' do
          
        6. 
        
        
      
        
        
          
      6. 
            1
            

            

                it 'on click move to catalog page' do
          
        7. 
        
        
      
        
        
          
      7. 
            1
            

            

                  visit root_path
          
        8. 
        
        
      
        
        
          
      8. 
            
            

            

            
          
        9. 
        
        
      
        
        
          
      9. 
            1
            

            

                  click_on 'Get Started'
          
        10. 
        
        
      
        
        
          
      10. 
            
            

            

            
          
        11. 
        
        
      
        
        
          
      11. 
            1
            

            

                  expect(page).to have_content('Catalog')
          
        12. 
        
        
      
        
        
          
      12. 
            
            

            

                end
          
        13. 
        
        
      
        
        
          
      13. 
            
            

            

              end
          
        14. 
        
        
      
        
        
          
      14. 
            
            

            

            
          
        15. 
        
        
      
        
        
          
      15. 
            1
            

            

              describe 'navbar' do
          
        16. 
        
        
      
        
        
          
      16. 
            2
            

            

                let(:books_category) { create(:books_category) }
          
        17. 
        
        
      
        
        
          
      17. 
            
            

            

            
          
        18. 
        
        
      
        
        
          
      18. 
            1
            

            

                it 'on click home move to root-path' do
          
        19. 
        
        
      
        
        
          
      19. 
            1
            

            

                  visit books_path
          
        20. 
        
        
      
        
        
          
      20. 
            
            

            

            
          
        21. 
        
        
      
        
        
          
      21. 
            1
            

            

                  find('a', id: 'root').click
          
        22. 
        
        
      
        
        
          
      22. 
            
            

            

            
          
        23. 
        
        
      
        
        
          
      23. 
            1
            

            

                  expect(page).to have_content('Get Started')
          
        24. 
        
        
      
        
        
          
      24. 
            
            

            

                end
          
        25. 
        
        
      
        
        
          
      25. 
            
            

            

            
          
        26. 
        
        
      
        
        
          
      26. 
            1
            

            

                it 'on click category name move to root-path with books that belong to this category' do
          
        27. 
        
        
      
        
        
          
      27. 
            1
            

            

                  books_category
          
        28. 
        
        
      
        
        
          
      28. 
            
            

            

            
          
        29. 
        
        
      
        
        
          
      29. 
            1
            

            

                  visit root_path
          
        30. 
        
        
      
        
        
          
      30. 
            
            

            

            
          
        31. 
        
        
      
        
        
          
      31. 
            1
            

            

                  find('a', class: 'dropdown-toggle', text: 'Shop').click
          
        32. 
        
        
      
        
        
          
      32. 
            
            

            

            
          
        33. 
        
        
      
        
        
          
      33. 
            1
            

            

                  within('ul', id: 'nav') do
          
        34. 
        
        
      
        
        
          
      34. 
            1
            

            

                    find('a', class: 'collapse-link', text: books_category.category.name).click
          
        35. 
        
        
      
        
        
          
      35. 
            
            

            

                  end
          
        36. 
        
        
      
        
        
          
      36. 
            
            

            

            
          
        37. 
        
        
      
        
        
          
      37. 
            1
            

            

                  expect(page).to have_content(books_category.category.books.first.title)
          
        38. 
        
        
      
        
        
          
      38. 
            
            

            

                end
          
        39. 
        
        
      
        
        
          
      39. 
            
            

            

            
          
        40. 
        
        
      
        
        
          
      40. 
            1
            

            

                context 'when guest' do
          
        41. 
        
        
      
        
        
          
      41. 
            1
            

            

                  it 'on click login go to login page' do
          
        42. 
        
        
      
        
        
          
      42. 
            1
            

            

                    visit root_path
          
        43. 
        
        
      
        
        
          
      43. 
            
            

            

            
          
        44. 
        
        
      
        
        
          
      44. 
            1
            

            

                    within 'div', class: 'visible-xs' do
          
        45. 
        
        
      
        
        
          
      45. 
            1
            

            

                      click_link I18n.t('header.log_in')
          
        46. 
        
        
      
        
        
          
      46. 
            
            

            

                    end
          
        47. 
        
        
      
        
        
          
      47. 
            
            

            

            
          
        48. 
        
        
      
        
        
          
      48. 
            1
            

            

                    expect(page).to have_content(I18n.t('header.log_in'))
          
        49. 
        
        
      
        
        
          
      49. 
            
            

            

                  end
          
        50. 
        
        
      
        
        
          
      50. 
            
            

            

            
          
        51. 
        
        
      
        
        
          
      51. 
            1
            

            

                  it 'on click sing up go to sing up page' do
          
        52. 
        
        
      
        
        
          
      52. 
            1
            

            

                    visit root_path
          
        53. 
        
        
      
        
        
          
      53. 
            
            

            

            
          
        54. 
        
        
      
        
        
          
      54. 
            1
            

            

                    within 'div', class: 'visible-xs' do
          
        55. 
        
        
      
        
        
          
      55. 
            1
            

            

                      click_link I18n.t('header.sing_up')
          
        56. 
        
        
      
        
        
          
      56. 
            
            

            

                    end
          
        57. 
        
        
      
        
        
          
      57. 
            
            

            

            
          
        58. 
        
        
      
        
        
          
      58. 
            1
            

            

                    expect(page).to have_content(I18n.t('header.sing_up'))
          
        59. 
        
        
      
        
        
          
      59. 
            
            

            

                  end
          
        60. 
        
        
      
        
        
          
      60. 
            
            

            

                end
          
        61. 
        
        
      
        
        
          
      61. 
            
            

            

            
          
        62. 
        
        
      
        
        
          
      62. 
            1
            

            

                context 'when user', js: true do
          
        63. 
        
        
      
        
        
          
      63. 
            4
            

            

                  let(:user) { create(:user) }
          
        64. 
        
        
      
        
        
          
      64. 
            
            

            

            
          
        65. 
        
        
      
        
        
          
      65. 
            1
            

            

                  before do
          
        66. 
        
        
      
        
        
          
      66. 
            3
            

            

                    sign_in(user)
          
        67. 
        
        
      
        
        
          
      67. 
            
            

            

                  end
          
        68. 
        
        
      
        
        
          
      68. 
            
            

            

            
          
        69. 
        
        
      
        
        
          
      69. 
            1
            

            

                  it 'on click account show settings' do
          
        70. 
        
        
      
        
        
          
      70. 
            1
            

            

                    visit root_path
          
        71. 
        
        
      
        
        
          
      71. 
            
            

            

            
          
        72. 
        
        
      
        
        
          
      72. 
            1
            

            

                    click_on I18n.t('header.account')
          
        73. 
        
        
      
        
        
          
      73. 
            
            

            

            
          
        74. 
        
        
      
        
        
          
      74. 
            1
            

            

                    expect(page).to have_content(I18n.t('header.settings'))
          
        75. 
        
        
      
        
        
          
      75. 
            
            

            

                  end
          
        76. 
        
        
      
        
        
          
      76. 
            
            

            

            
          
        77. 
        
        
      
        
        
          
      77. 
            1
            

            

                  it 'on click account show log_out' do
          
        78. 
        
        
      
        
        
          
      78. 
            1
            

            

                    visit root_path
          
        79. 
        
        
      
        
        
          
      79. 
            
            

            

            
          
        80. 
        
        
      
        
        
          
      80. 
            1
            

            

                    click_on I18n.t('header.account')
          
        81. 
        
        
      
        
        
          
      81. 
            
            

            

            
          
        82. 
        
        
      
        
        
          
      82. 
            1
            

            

                    expect(page).to have_content(I18n.t('header.log_out'))
          
        83. 
        
        
      
        
        
          
      83. 
            
            

            

                  end
          
        84. 
        
        
      
        
        
          
      84. 
            
            

            

            
          
        85. 
        
        
      
        
        
          
      85. 
            1
            

            

                  it 'log_out' do
          
        86. 
        
        
      
        
        
          
      86. 
            1
            

            

                    visit root_path
          
        87. 
        
        
      
        
        
          
      87. 
            
            

            

            
          
        88. 
        
        
      
        
        
          
      88. 
            1
            

            

                    click_on I18n.t('header.account')
          
        89. 
        
        
      
        
        
          
      89. 
            
            

            

            
          
        90. 
        
        
      
        
        
          
      90. 
            1
            

            

                    click_on(I18n.t('header.log_out'), match: :first)
          
        91. 
        
        
      
        
        
          
      91. 
            
            

            

            
          
        92. 
        
        
      
        
        
          
      92. 
            1
            

            

                    expect(page).to have_content(I18n.t('devise.sessions.signed_out'))
          
        93. 
        
        
      
        
        
          
      93. 
            
            

            

                  end
          
        94. 
        
        
      
        
        
          
      94. 
            
            

            

                end
          
        95. 
        
        
      
        
        
          
      95. 
            
            

            

              end
          
        96. 
        
        
      
        
        
          
      96. 
            
            

            

            end
          
        97. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/feature/login_spec.rb
      
    
      
>>>>>>> a5d032d (Fix)
      
  100.0%


      lines covered
    
      

    

    
      
<<<<<<< HEAD
      31 relevant lines.
      31 lines covered and
=======
      19 relevant lines.
      19 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            RSpec.describe 'Login', type: :feature do
          
        2. 
        
        
      
        
        
          
      2. 
            3
            

            

              let(:user_second) { create(:user, email: 'test.rspec@rspec.ua') }
          
        3. 
        
        
      
        
        
          
      3. 
            
            

            

            
          
        4. 
        
        
      
        
        
          
      4. 
            1
            

            

              describe '#login' do
          
        5. 
        
        
      
        
        
          
      5. 
            1
            

            

                before do
          
        6. 
        
        
      
        
        
          
      6. 
            2
            

            

                  visit new_user_session_path
          
        7. 
        
        
      
        
        
          
      7. 
            
            

            

                end
          
        8. 
        
        
      
        
        
          
      8. 
            
            

            

            
          
        9. 
        
        
      
        
        
          
      9. 
            1
            

            

                context 'when successfully login' do
          
        10. 
        
        
      
        
        
          
      10. 
            1
            

            

                  it 'login' do
          
        11. 
        
        
      
        
        
          
      11. 
            1
            

            

                    within 'form', class: 'new_user', id: 'new_user' do
          
        12. 
        
        
      
        
        
          
      12. 
            1
            

            

                      fill_in 'user_email', with: user_second.email
          
        13. 
        
        
      
        
        
          
      13. 
            1
            

            

                      fill_in 'user_password', with: user_second.password
          
        14. 
        
        
      
        
        
          
      14. 
            
            

            

            
          
        15. 
        
        
      
        
        
          
      15. 
            1
            

            

                      click_on I18n.t('header.log_in')
          
        16. 
        
        
      
        
        
          
      16. 
            
            

            

                    end
          
        17. 
        
        
      
        
        
          
      17. 
            
            

            

            
          
        18. 
        
        
      
        
        
          
      18. 
            1
            

            

                    expect(page).to have_text I18n.t('devise.sessions.signed_in')
          
        19. 
        
        
      
        
        
          
      19. 
            
            

            

                  end
          
        20. 
        
        
      
        
        
          
      20. 
            
            

            

                end
          
        21. 
        
        
      
        
        
          
      21. 
            
            

            

            
          
        22. 
        
        
      
        
        
          
      22. 
            1
            

            

                context 'when unsuccessfully login' do
          
        23. 
        
        
      
        
        
          
      23. 
            1
            

            

                  it 'didn`t login' do
          
        24. 
        
        
      
        
        
          
      24. 
            1
            

            

                    within 'form', class: 'new_user', id: 'new_user' do
          
        25. 
        
        
      
        
        
          
      25. 
            1
            

            

                      fill_in 'user_email', with: user_second.email
          
        26. 
        
        
      
        
        
          
      26. 
            1
            

            

                      fill_in 'user_password', with: 'wrong_password'
          
        27. 
        
        
      
        
        
          
      27. 
            
            

            

            
          
        28. 
        
        
      
        
        
          
      28. 
            1
            

            

                      click_on I18n.t('header.log_in')
          
        29. 
        
        
      
        
        
          
      29. 
            
            

            

                    end
          
        30. 
        
        
      
        
        
          
      30. 
            
            

            

            
          
        31. 
        
        
      
        
        
          
      31. 
            1
            

            

                    expect(page).to have_text 'Invalid Email or password.'
          
        32. 
        
        
      
        
        
          
      32. 
            
            

            

                  end
          
        33. 
        
        
      
        
        
          
      33. 
            
            

            

                end
          
        34. 
        
        
      
        
        
          
      34. 
            
            

            

              end
          
        35. 
        
        
      
        
        
          
      35. 
            
            

            

            end
          
        36. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/feature/new_password_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      13 relevant lines.
      13 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            require_relative '../rails_helper'
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

            require_relative '../support/shared_context'
          
        3. 
        
        
      
        
        
          
      3. 
            
            

            

            
          
        4. 
        
        
      
        
        
          
      4. 
            1
            

            

            RSpec.describe 'New Password', type: :feature do
          
        5. 
        
        
      
        
        
          
      5. 
            3
            

            

              let(:user) { FactoryBot.create(:user) }
          
        6. 
        
        
      
        
        
          
      6. 
            
            

            

            
          
        7. 
        
        
      
        
        
          
      7. 
            1
            

            

              describe '#new_password' do
          
        8. 
        
        
      
        
        
          
      8. 
            1
            

            

                it 'change password' do
          
        9. 
        
        
      
        
        
          
      9. 
            1
            

            

                  user.reset_password('newPassword', 'newPassword')
          
        10. 
        
        
      
        
        
          
      10. 
            
            

            

            
          
        11. 
        
        
      
        
        
          
      11. 
            1
            

            

                  expect(user.password).to eq('newPassword')
          
        12. 
        
        
      
        
        
          
      12. 
            
            

            

                end
          
        13. 
        
        
      
        
        
          
      13. 
            
            

            

            
          
        14. 
        
        
      
        
        
          
      14. 
            1
            

            

                it 'not validate password' do
          
        15. 
        
        
      
        
        
          
      15. 
            1
            

            

                  visit new_user_password_path
          
        16. 
        
        
      
        
        
          
      16. 
            
            

            

            
          
        17. 
        
        
      
        
        
          
      17. 
            1
            

            

                  fill_in 'email', with: user.email
          
        18. 
        
        
      
        
        
          
      18. 
            
            

            

            
          
        19. 
        
        
      
        
        
          
      19. 
            1
            

            

                  click_on I18n.t('login.send_instructions')
          
        20. 
        
        
      
        
        
          
      20. 
            
            

            

            
          
        21. 
        
        
      
        
        
          
      21. 
            1
            

            

                  expect(page).to have_content(I18n.t('devise.passwords.send_instructions'))
          
        22. 
        
        
      
        
        
          
      22. 
            
            

            

                end
          
        23. 
        
        
      
        
        
          
      23. 
            
            

            

              end
          
        24. 
        
        
      
        
        
          
      24. 
            
            

            

            end
          
        25. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/feature/registration_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      29 relevant lines.
      29 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            RSpec.describe 'Registration', type: :feature do
          
        2. 
        
        
      
        
        
          
      2. 
            3
            

            

              let(:user) { create(:user, email: 'test.rspec@rspec.ua') }
          
        3. 
        
        
      
        
        
          
      3. 
            
            

            

            
          
        4. 
        
        
      
        
        
          
      4. 
            1
            

            

              describe '#sing_up' do
          
        5. 
        
        
      
        
        
          
      5. 
            1
            

            

                before do
          
        6. 
        
        
      
        
        
          
      6. 
            3
            

            

                  visit new_user_registration_path
          
        7. 
        
        
      
        
        
          
      7. 
            
            

            

                end
          
        8. 
        
        
      
        
        
          
      8. 
            
            

            

            
          
        9. 
        
        
      
        
        
          
      9. 
            1
            

            

                context 'when successfully sing_up' do
          
        10. 
        
        
      
        
        
          
      10. 
            1
            

            

                  it 'sing_up users' do
          
        11. 
        
        
      
        
        
          
      11. 
            1
            

            

                    within 'form', class: 'new_user', id: 'new_user' do
          
        12. 
        
        
      
        
        
          
      12. 
            1
            

            

                      fill_in 'user_email', with: 'email-test@rspec.com'
          
        13. 
        
        
      
        
        
          
      13. 
            1
            

            

                      fill_in 'user_password', with: user.password
          
        14. 
        
        
      
        
        
          
      14. 
            1
            

            

                      fill_in 'user_password_confirmation', with: user.password
          
        15. 
        
        
      
        
        
          
      15. 
            
            

            

            
          
        16. 
        
        
      
        
        
          
      16. 
            1
            

            

                      click_on I18n.t('header.sing_up')
          
        17. 
        
        
      
        
        
          
      17. 
            
            

            

                    end
          
        18. 
        
        
      
        
        
          
      18. 
            
            

            

            
          
        19. 
        
        
      
        
        
          
      19. 
            1
            

            

                    expect(page).to have_text I18n.t('devise.registrations.signed_up_but_unconfirmed')
          
        20. 
        
        
      
        
        
          
      20. 
            
            

            

                  end
          
        21. 
        
        
      
        
        
          
      21. 
            
            

            

                end
          
        22. 
        
        
      
        
        
          
      22. 
            
            

            

            
          
        23. 
        
        
      
        
        
          
      23. 
            1
            

            

                context 'when users is already exits' do
          
        24. 
        
        
      
        
        
          
      24. 
            1
            

            

                  it 'sing_up users' do
          
        25. 
        
        
      
        
        
          
      25. 
            1
            

            

                    within 'form', class: 'new_user', id: 'new_user' do
          
        26. 
        
        
      
        
        
          
      26. 
            1
            

            

                      fill_in 'user_email', with: user.email
          
        27. 
        
        
      
        
        
          
      27. 
            1
            

            

                      fill_in 'user_password', with: user.password
          
        28. 
        
        
      
        
        
          
      28. 
            1
            

            

                      fill_in 'user_password_confirmation', with: user.password
          
        29. 
        
        
      
        
        
          
      29. 
            
            

            

            
          
        30. 
        
        
      
        
        
          
      30. 
            1
            

            

                      click_on I18n.t('header.sing_up')
          
        31. 
        
        
      
        
        
          
      31. 
            
            

            

                    end
          
        32. 
        
        
      
        
        
          
      32. 
            
            

            

            
          
        33. 
        
        
      
        
        
          
      33. 
            1
            

            

                    expect(page).to have_text('Email has already been taken')
          
        34. 
        
        
      
        
        
          
      34. 
            
            

            

                  end
          
        35. 
        
        
      
        
        
          
      35. 
            
            

            

                end
          
        36. 
        
        
      
        
        
          
      36. 
            
            

            

            
          
        37. 
        
        
      
        
        
          
      37. 
            1
            

            

                context 'when unsuccessfully sing_up' do
          
        38. 
        
        
      
        
        
          
      38. 
            1
            

            

                  it 'didn`t sing_up' do
          
        39. 
        
        
      
        
        
          
      39. 
            1
            

            

                    within 'form', class: 'new_user', id: 'new_user' do
          
        40. 
        
        
      
        
        
          
      40. 
            1
            

            

                      fill_in 'user_email', with: FFaker::Internet.email
          
        41. 
        
        
      
        
        
          
      41. 
            1
            

            

                      fill_in 'user_password', with: 'password'
          
        42. 
        
        
      
        
        
          
      42. 
            1
            

            

                      fill_in 'user_password_confirmation', with: 'wrong'
          
        43. 
        
        
      
        
        
          
      43. 
            
            

            

            
          
        44. 
        
        
      
        
        
          
      44. 
            1
            

            

                      click_on I18n.t('header.sing_up')
          
        45. 
        
        
      
        
        
          
      45. 
            
            

            

                    end
          
        46. 
        
        
      
        
        
          
      46. 
            
            

            

            
          
        47. 
        
        
      
        
        
          
      47. 
            1
            

            

                    expect(page).to have_text '1 error prohibited this user from being saved'
          
        48. 
        
        
      
        
        
          
      48. 
            
            

            

                  end
          
        49. 
        
        
      
        
        
          
      49. 
            
            

            

                end
          
        50. 
        
        
      
        
        
          
      50. 
            
            

            

              end
          
        51. 
        
        
      
        
        
          
      51. 
            
            

            

            end
          
        52. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/feature/review_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      28 relevant lines.
      28 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            RSpec.describe 'Review', type: :feature do
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

              include_context 'with api request authentication helper methods'
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

              include_context 'with api request global before and after hooks'
          
        4. 
        
        
      
        
        
          
      4. 
            
            

            

            
          
        5. 
        
        
      
        
        
          
      5. 
            3
            

            

              let(:user) { create(:user).decorate }
          
        6. 
        
        
      
        
        
          
      6. 
            3
            

            

              let(:book) { create(:book).decorate }
          
        7. 
        
        
      
        
        
          
      7. 
            
            

            

            
          
        8. 
        
        
      
        
        
          
      8. 
            1
            

            

              before do
          
        9. 
        
        
      
        
        
          
      9. 
            2
            

            

                sign_in(user)
          
        10. 
        
        
      
        
        
          
      10. 
            
            

            

            
          
        11. 
        
        
      
        
        
          
      11. 
            2
            

            

                visit book_path(book)
          
        12. 
        
        
      
        
        
          
      12. 
            
            

            

              end
          
        13. 
        
        
      
        
        
          
      13. 
            
            

            

            
          
        14. 
        
        
      
        
        
          
      14. 
            1
            

            

              shared_examples 'review' do
          
        15. 
        
        
      
        
        
          
      15. 
            2
            

            

                it 'review' do
          
        16. 
        
        
      
        
        
          
      16. 
            2
            

            

                  find('i', id: rating).click
          
        17. 
        
        
      
        
        
          
      17. 
            
            

            

            
          
        18. 
        
        
      
        
        
          
      18. 
            2
            

            

                  fill_in :title, with: FFaker::Lorem.sentence(title_words)
          
        19. 
        
        
      
        
        
          
      19. 
            2
            

            

                  fill_in :body, with: FFaker::Lorem.sentence(body_words)
          
        20. 
        
        
      
        
        
          
      20. 
            
            

            

            
          
        21. 
        
        
      
        
        
          
      21. 
            2
            

            

                  click_on I18n.t('review.post')
          
        22. 
        
        
      
        
        
          
      22. 
            
            

            

            
          
        23. 
        
        
      
        
        
          
      23. 
            2
            

            

                  expect(page).to have_content(result)
          
        24. 
        
        
      
        
        
          
      24. 
            
            

            

                end
          
        25. 
        
        
      
        
        
          
      25. 
            
            

            

              end
          
        26. 
        
        
      
        
        
          
      26. 
            
            

            

            
          
        27. 
        
        
      
        
        
          
      27. 
            1
            

            

              describe '#post review', js: true do
          
        28. 
        
        
      
        
        
          
      28. 
            1
            

            

                context 'when review posted' do
          
        29. 
        
        
      
        
        
          
      29. 
            2
            

            

                  let(:rating) { "star#{rand(1..5)}" }
          
        30. 
        
        
      
        
        
          
      30. 
            2
            

            

                  let(:title_words) { 3 }
          
        31. 
        
        
      
        
        
          
      31. 
            2
            

            

                  let(:body_words) { 5 }
          
        32. 
        
        
      
        
        
          
      32. 
            2
            

            

                  let(:result) { user.name_or_email }
          
        33. 
        
        
      
        
        
          
      33. 
            
            

            

            
          
        34. 
        
        
      
        
        
          
      34. 
            1
            

            

                  include_examples 'review'
          
        35. 
        
        
      
        
        
          
      35. 
            
            

            

                end
          
        36. 
        
        
      
        
        
          
      36. 
            
            

            

            
          
        37. 
        
        
      
        
        
          
      37. 
            1
            

            

                context 'when review not been posted' do
          
        38. 
        
        
      
        
        
          
      38. 
            2
            

            

                  let(:rating) { "star#{rand(1..5)}" }
          
        39. 
        
        
      
        
        
          
      39. 
            2
            

            

                  let(:title_words) { 80 }
          
        40. 
        
        
      
        
        
          
      40. 
            2
            

            

                  let(:body_words) { 30 }
          
        41. 
        
        
      
        
        
          
      41. 
            2
            

            

                  let(:result) { 'Title is too long (maximum is 80 characters)' }
          
        42. 
        
        
      
        
        
          
      42. 
            
            

            

            
          
        43. 
        
        
      
        
        
          
      43. 
            1
            

            

                  include_examples 'review'
          
        44. 
        
        
      
        
        
          
      44. 
            
            

            

                end
          
        45. 
        
        
      
        
        
          
      45. 
            
            

            

              end
          
        46. 
        
        
      
        
        
          
      46. 
            
            

            

            end
          
        47. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/feature/settings_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      34 relevant lines.
      34 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            RSpec.describe 'Settings', type: :feature do
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

              include_context 'with api request authentication helper methods'
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

              include_context 'with api request global before and after hooks'
          
        4. 
        
        
      
        
        
          
      4. 
            
            

            

            
          
        5. 
        
        
      
        
        
          
      5. 
            4
            

            

              let(:user) { create(:user) }
          
        6. 
        
        
      
        
        
          
      6. 
            
            

            

            
          
        7. 
        
        
      
        
        
          
      7. 
            1
            

            

              before do
          
        8. 
        
        
      
        
        
          
      8. 
            3
            

            

                sign_in(user)
          
        9. 
        
        
      
        
        
          
      9. 
            
            

            

            
          
        10. 
        
        
      
        
        
          
      10. 
            3
            

            

                visit edit_user_path(user.id)
          
        11. 
        
        
      
        
        
          
      11. 
            
            

            

            
          
        12. 
        
        
      
        
        
          
      12. 
            3
            

            

                click_link I18n.t('settings.privacy')
          
        13. 
        
        
      
        
        
          
      13. 
            
            

            

              end
          
        14. 
        
        
      
        
        
          
      14. 
            
            

            

            
          
        15. 
        
        
      
        
        
          
      15. 
            1
            

            

              describe '#email_change' do
          
        16. 
        
        
      
        
        
          
      16. 
            1
            

            

                it 'change email' do
          
        17. 
        
        
      
        
        
          
      17. 
            1
            

            

                  within('div', id: 'email') do
          
        18. 
        
        
      
        
        
          
      18. 
            1
            

            

                    fill_in :email, with: FFaker::Internet.email
          
        19. 
        
        
      
        
        
          
      19. 
            
            

            

            
          
        20. 
        
        
      
        
        
          
      20. 
            1
            

            

                    click_on I18n.t('settings.save')
          
        21. 
        
        
      
        
        
          
      21. 
            
            

            

                  end
          
        22. 
        
        
      
        
        
          
      22. 
            
            

            

            
          
        23. 
        
        
      
        
        
          
      23. 
            1
            

            

                  user.confirm
          
        24. 
        
        
      
        
        
          
      24. 
            
            

            

            
          
        25. 
        
        
      
        
        
          
      25. 
            1
            

            

                  expect(page).to have_content(I18n.t('settings.message.update'))
          
        26. 
        
        
      
        
        
          
      26. 
            
            

            

                end
          
        27. 
        
        
      
        
        
          
      27. 
            
            

            

              end
          
        28. 
        
        
      
        
        
          
      28. 
            
            

            

            
          
        29. 
        
        
      
        
        
          
      29. 
            1
            

            

              describe '#password_change' do
          
        30. 
        
        
      
        
        
          
      30. 
            1
            

            

                context 'when error' do
          
        31. 
        
        
      
        
        
          
      31. 
            1
            

            

                  it 'didnt change password' do
          
        32. 
        
        
      
        
        
          
      32. 
            1
            

            

                    within('div', id: 'password') do
          
        33. 
        
        
      
        
        
          
      33. 
            1
            

            

                      fill_in :current_password, with: user.password
          
        34. 
        
        
      
        
        
          
      34. 
            1
            

            

                      fill_in :password, with: 'newPassword'
          
        35. 
        
        
      
        
        
          
      35. 
            1
            

            

                      fill_in :password_confirmation, with: 'incorrectPassword'
          
        36. 
        
        
      
        
        
          
      36. 
            
            

            

            
          
        37. 
        
        
      
        
        
          
      37. 
            1
            

            

                      click_on I18n.t('settings.save')
          
        38. 
        
        
      
        
        
          
      38. 
            
            

            

                    end
          
        39. 
        
        
      
        
        
          
      39. 
            
            

            

            
          
        40. 
        
        
      
        
        
          
      40. 
            1
            

            

                    user.confirm
          
        41. 
        
        
      
        
        
          
      41. 
            
            

            

            
          
        42. 
        
        
      
        
        
          
      42. 
            1
            

            

                    expect(page).to have_content(I18n.t('settings.error.error'))
          
        43. 
        
        
      
        
        
          
      43. 
            
            

            

                  end
          
        44. 
        
        
      
        
        
          
      44. 
            
            

            

                end
          
        45. 
        
        
      
        
        
          
      45. 
            
            

            

            
          
        46. 
        
        
      
        
        
          
      46. 
            1
            

            

                context 'when successful' do
          
        47. 
        
        
      
        
        
          
      47. 
            1
            

            

                  it 'didnt change password' do
          
        48. 
        
        
      
        
        
          
      48. 
            1
            

            

                    within('div', id: 'password') do
          
        49. 
        
        
      
        
        
          
      49. 
            1
            

            

                      fill_in :current_password, with: user.password
          
        50. 
        
        
      
        
        
          
      50. 
            1
            

            

                      fill_in :password, with: 'newPassword'
          
        51. 
        
        
      
        
        
          
      51. 
            1
            

            

                      fill_in :password_confirmation, with: 'newPassword'
          
        52. 
        
        
      
        
        
          
      52. 
            
            

            

            
          
        53. 
        
        
      
        
        
          
      53. 
            1
            

            

                      click_on I18n.t('settings.save')
          
        54. 
        
        
      
        
        
          
      54. 
            
            

            

                    end
          
        55. 
        
        
      
        
        
          
      55. 
            
            

            

            
          
        56. 
        
        
      
        
        
          
      56. 
            1
            

            

                    user.confirm
          
        57. 
        
        
      
        
        
          
      57. 
            
            

            

            
          
        58. 
        
        
      
        
        
          
      58. 
            1
            

            

                    expect(page).to have_content(I18n.t('devise.failure.unauthenticated'))
          
        59. 
        
        
      
        
        
          
      59. 
            
            

            

                  end
          
        60. 
        
        
      
        
        
          
      60. 
            
            

            

                end
          
        61. 
        
        
      
        
        
          
      61. 
            
            

            

              end
          
        62. 
        
        
      
        
        
          
      62. 
            
            

            

            end
          
        63. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/feature/shipping_spec.rb
      
    
      
      
  73.08%


      lines covered
    
      

    

    
      
      26 relevant lines.
      19 lines covered and
      7 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            RSpec.describe 'Shipping', type: :feature do
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

              include_context 'with api request authentication helper methods'
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

              include_context 'with api request global before and after hooks'
          
        4. 
        
        
      
        
        
          
      4. 
            
            

            

            
          
        5. 
        
        
      
        
        
          
      5. 
            2
            

            

              let(:user) { FactoryBot.create(:user) }
          
        6. 
        
        
      
        
        
          
      6. 
            1
            

            

              let(:attributes_for) { attributes_for(:shipping) }
          
        7. 
        
        
      
        
        
          
      7. 
            
            

            

            
          
        8. 
        
        
      
        
        
          
      8. 
            1
            

            

              describe '#fill_in', js: true do
          
        9. 
        
        
      
        
        
          
      9. 
            1
            

            

                it 'fill in shipping' do
          
        10. 
        
        
      
        
        
          
      10. 
            1
            

            

                  sign_in(user)
          
        11. 
        
        
      
        
        
          
      11. 
            
            

            

            
          
        12. 
        
        
      
        
        
          
      12. 
            1
            

            

                  visit edit_user_path(user.id)
          
        13. 
        
        
      
        
        
          
      13. 
            
            

            

            
          
        14. 
        
        
      
        
        
          
      14. 
            1
            

            

                  within('div#shipping.col-md-5.mb-40') do
          
        15. 
        
        
      
        
        
          
      15. 
            1
            

            

                    find_all('div', class: 'form-group')[0] do
          
        16. 
        
        
      
        
        
          
      16. 
            
            

            

                      fill_in :first_name, with: attributes_for[:first_name]
          
        17. 
        
        
      
        
        
          
      17. 
            
            

            

                    end
          
        18. 
        
        
      
        
        
          
      18. 
            1
            

            

                    find_all('div', class: 'form-group')[1] do
          
        19. 
        
        
      
        
        
          
      19. 
            
            

            

                      fill_in :last_name, with: attributes_for[:last_name]
          
        20. 
        
        
      
        
        
          
      20. 
            
            

            

                    end
          
        21. 
        
        
      
        
        
          
      21. 
            1
            

            

                    find_all('div', class: 'form-group')[2] do
          
        22. 
        
        
      
        
        
          
      22. 
            
            

            

                      fill_in :address, with: attributes_for[:address]
          
        23. 
        
        
      
        
        
          
      23. 
            
            

            

                    end
          
        24. 
        
        
      
        
        
          
      24. 
            1
            

            

                    find_all('div', class: 'form-group')[3] do
          
        25. 
        
        
      
        
        
          
      25. 
            
            

            

                      fill_in :city, with: attributes_for[:city]
          
        26. 
        
        
      
        
        
          
      26. 
            
            

            

                    end
          
        27. 
        
        
      
        
        
          
      27. 
            1
            

            

                    find_all('div', class: 'form-group')[4] do
          
        28. 
        
        
      
        
        
          
      28. 
            
            

            

                      fill_in :zip, with: attributes_for[:zip]
          
        29. 
        
        
      
        
        
          
      29. 
            
            

            

                    end
          
        30. 
        
        
      
        
        
          
      30. 
            1
            

            

                    find_all('div', class: 'form-group')[5] do
          
        31. 
        
        
      
        
        
          
      31. 
            
            

            

                      fill_in :country, with: attributes_for[:country]
          
        32. 
        
        
      
        
        
          
      32. 
            
            

            

                    end
          
        33. 
        
        
      
        
        
          
      33. 
            1
            

            

                    find_all('div', class: 'form-group')[6] do
          
        34. 
        
        
      
        
        
          
      34. 
            
            

            

                      fill_in :phone, with: attributes_for[:phone]
          
        35. 
        
        
      
        
        
          
      35. 
            
            

            

                    end
          
        36. 
        
        
      
        
        
          
      36. 
            1
            

            

                    click_on I18n.t('settings.save')
          
        37. 
        
        
      
        
        
          
      37. 
            
            

            

                  end
          
        38. 
        
        
      
        
        
          
      38. 
            
            

            

            
          
        39. 
        
        
      
        
        
          
      39. 
            1
            

            

                  expect(page).to have_content(I18n.t('settings.message.update'))
          
        40. 
        
        
      
        
        
          
      40. 
            
            

            

                end
          
        41. 
        
        
      
        
        
          
      41. 
            
            

            

              end
          
        42. 
        
        
      
        
        
          
      42. 
            
            

            

            end
          
        43. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/feature/user_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      42 relevant lines.
      42 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            RSpec.describe 'User', type: :feature do
          
        2. 
        
        
      
        
        
          
      2. 
            2
            

            

              let(:user) { build(:user, email: 'test.rspec@rspec.ua') }
          
        3. 
        
        
      
        
        
          
      3. 
            3
            

            

              let(:user_second) { create(:user, email: 'test.rspec-test@rspec.ua') }
          
        4. 
        
        
      
        
        
          
      4. 
            
            

            

            
          
        5. 
        
        
      
        
        
          
      5. 
            1
            

            

              describe '#sing_up' do
          
        6. 
        
        
      
        
        
          
      6. 
            1
            

            

                context 'when successfully sing_up' do
          
        7. 
        
        
      
        
        
          
      7. 
            1
            

            

                  before do
          
        8. 
        
        
      
        
        
          
      8. 
            1
            

            

                    visit new_user_registration_path
          
        9. 
        
        
      
        
        
          
      9. 
            
            

            

            
          
        10. 
        
        
      
        
        
          
      10. 
            1
            

            

                    within 'form', class: 'new_user', id: 'new_user' do
          
        11. 
        
        
      
        
        
          
      11. 
            1
            

            

                      fill_in 'user_email', with: user.email
          
        12. 
        
        
      
        
        
          
      12. 
            1
            

            

                      fill_in 'user_password', with: user.password
          
        13. 
        
        
      
        
        
          
      13. 
            1
            

            

                      fill_in 'user_password_confirmation', with: user.password
          
        14. 
        
        
      
        
        
          
      14. 
            
            

            

            
          
        15. 
        
        
      
        
        
          
      15. 
            1
            

            

                      click_on I18n.t('header.sing_up')
          
        16. 
        
        
      
        
        
          
      16. 
            
            

            

                    end
          
        17. 
        
        
      
        
        
          
      17. 
            
            

            

                  end
          
        18. 
        
        
      
        
        
          
      18. 
            
            

            

            
          
        19. 
        
        
      
        
        
          
      19. 
            1
            

            

                  it 'sing_up user' do
          
        20. 
        
        
      
        
        
          
      20. 
            1
            

            

                    expect(page).to have_text I18n.t('devise.registrations.signed_up_but_unconfirmed')
          
        21. 
        
        
      
        
        
          
      21. 
            
            

            

                  end
          
        22. 
        
        
      
        
        
          
      22. 
            
            

            

                end
          
        23. 
        
        
      
        
        
          
      23. 
            
            

            

            
          
        24. 
        
        
      
        
        
          
      24. 
            1
            

            

                context 'when unsuccessfully sing_up' do
          
        25. 
        
        
      
        
        
          
      25. 
            1
            

            

                  it 'didn`t sing_up' do
          
        26. 
        
        
      
        
        
          
      26. 
            1
            

            

                    visit new_user_registration_path
          
        27. 
        
        
      
        
        
          
      27. 
            
            

            

            
          
        28. 
        
        
      
        
        
          
      28. 
            1
            

            

                    within 'form', class: 'new_user', id: 'new_user' do
          
        29. 
        
        
      
        
        
          
      29. 
            1
            

            

                      fill_in 'user_email', with: FFaker::Internet.email
          
        30. 
        
        
      
        
        
          
      30. 
            1
            

            

                      fill_in 'user_password', with: 'wrong'
          
        31. 
        
        
      
        
        
          
      31. 
            1
            

            

                      fill_in 'user_password_confirmation', with: 'wrong'
          
        32. 
        
        
      
        
        
          
      32. 
            
            

            

            
          
        33. 
        
        
      
        
        
          
      33. 
            1
            

            

                      click_on I18n.t('header.sing_up')
          
        34. 
        
        
      
        
        
          
      34. 
            
            

            

                    end
          
        35. 
        
        
      
        
        
          
      35. 
            
            

            

            
          
        36. 
        
        
      
        
        
          
      36. 
            1
            

            

                    expect(page).to have_text '1 error prohibited this user from being saved'
          
        37. 
        
        
      
        
        
          
      37. 
            
            

            

                  end
          
        38. 
        
        
      
        
        
          
      38. 
            
            

            

                end
          
        39. 
        
        
      
        
        
          
      39. 
            
            

            

              end
          
        40. 
        
        
      
        
        
          
      40. 
            
            

            

            
          
        41. 
        
        
      
        
        
          
      41. 
            1
            

            

              describe '#login' do
          
        42. 
        
        
      
        
        
          
      42. 
            1
            

            

                before do
          
        43. 
        
        
      
        
        
          
      43. 
            2
            

            

                  user_second.confirm
          
        44. 
        
        
      
        
        
          
      44. 
            
            

            

                end
          
        45. 
        
        
      
        
        
          
      45. 
            
            

            

            
          
        46. 
        
        
      
        
        
          
      46. 
            1
            

            

                context 'when successfully login' do
          
        47. 
        
        
      
        
        
          
      47. 
            1
            

            

                  it 'login' do
          
        48. 
        
        
      
        
        
          
      48. 
            1
            

            

                    visit new_user_session_path
          
        49. 
        
        
      
        
        
          
      49. 
            
            

            

            
          
        50. 
        
        
      
        
        
          
      50. 
            1
            

            

                    within 'form', class: 'new_user', id: 'new_user' do
          
        51. 
        
        
      
        
        
          
      51. 
            1
            

            

                      fill_in 'user_email', with: user_second.email
          
        52. 
        
        
      
        
        
          
      52. 
            1
            

            

                      fill_in 'user_password', with: user_second.password
          
        53. 
        
        
      
        
        
          
      53. 
            
            

            

            
          
        54. 
        
        
      
        
        
          
      54. 
            1
            

            

                      click_on I18n.t('header.log_in')
          
        55. 
        
        
      
        
        
          
      55. 
            
            

            

                    end
          
        56. 
        
        
      
        
        
          
      56. 
            
            

            

            
          
        57. 
        
        
      
        
        
          
      57. 
            1
            

            

                    expect(page).to have_text I18n.t('devise.sessions.signed_in')
          
        58. 
        
        
      
        
        
          
      58. 
            
            

            

                  end
          
        59. 
        
        
      
        
        
          
      59. 
            
            

            

                end
          
        60. 
        
        
      
        
        
          
      60. 
            
            

            

            
          
        61. 
        
        
      
        
        
          
      61. 
            1
            

            

                context 'when unsuccessfully login' do
          
        62. 
        
        
      
        
        
          
      62. 
            1
            

            

                  it 'didn`t login' do
          
        63. 
        
        
      
        
        
          
      63. 
            1
            

            

                    visit new_user_session_path
          
        64. 
        
        
      
        
        
          
      64. 
            
            

            

            
          
        65. 
        
        
      
        
        
          
      65. 
            1
            

            

                    within 'form', class: 'new_user', id: 'new_user' do
          
        66. 
        
        
      
        
        
          
      66. 
            1
            

            

                      fill_in 'user_email', with: user_second.email
          
        67. 
        
        
      
        
        
          
      67. 
            1
            

            

                      fill_in 'user_password', with: 'wrong_password'
          
        68. 
        
        
      
        
        
          
      68. 
            
            

            

            
          
        69. 
        
        
      
        
        
          
      69. 
            1
            

            

                      click_on I18n.t('header.log_in')
          
        70. 
        
        
      
        
        
          
      70. 
            
            

            

                    end
          
        71. 
        
        
      
        
        
          
      71. 
            
            

            

            
          
        72. 
        
        
      
        
        
          
      72. 
            1
            

            

                    expect(page).to have_text 'Invalid Email or password.'
          
        73. 
        
        
      
        
        
          
      73. 
            
            

            

                  end
          
        74. 
        
        
      
        
        
          
      74. 
            
            

            

                end
          
        75. 
        
        
      
        
        
          
      75. 
            
            

            

              end
          
        76. 
        
        
      
        
        
          
      76. 
            
            

            

            end
          
        77. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/models/admin_user_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      5 relevant lines.
      5 lines covered and
<<<<<<< HEAD
=======
      20 relevant lines.
      20 lines covered and
>>>>>>> d0dc1f1 (Featire specs)
=======
      20 relevant lines.
      20 lines covered and
>>>>>>> 752f0c0 (Featire specs)
=======
      20 relevant lines.
      20 lines covered and
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
      20 relevant lines.
      20 lines covered and
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
      20 relevant lines.
      20 lines covered and
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
      20 relevant lines.
      20 lines covered and
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
      20 relevant lines.
      20 lines covered and
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
      20 relevant lines.
      20 lines covered and
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
      20 relevant lines.
      20 lines covered and
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            require 'rails_helper'
          
        2. 
        
        
      
        
        
          
      2. 
            
            

            

            
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
            RSpec.describe AdminUser, type: :model do
=======
            RSpec.describe 'Homes', type: :feature do
>>>>>>> d0dc1f1 (Featire specs)
=======
            RSpec.describe 'Homes', type: :feature do
>>>>>>> 752f0c0 (Featire specs)
=======
            RSpec.describe 'Homes', type: :feature do
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
            RSpec.describe 'Homes', type: :feature do
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
            RSpec.describe 'Homes', type: :feature do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
            RSpec.describe 'Homes', type: :feature do
>>>>>>> 08edf50 (Featire specs)
=======
            RSpec.describe 'Homes', type: :feature do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
            RSpec.describe 'Homes', type: :feature do
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
            RSpec.describe 'Homes', type: :feature do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
            RSpec.describe 'Homes', type: :feature do
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
            RSpec.describe 'Homes', type: :feature do
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
            RSpec.describe AdminUser, type: :model do
>>>>>>> 5b7749a (Fix)
          
        4. 
        
        
      
        
        
          
      4. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
              context 'when validations' do
=======
              describe 'Get Started' do
>>>>>>> d0dc1f1 (Featire specs)
=======
              describe 'Get Started' do
>>>>>>> 752f0c0 (Featire specs)
=======
              describe 'Get Started' do
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
              describe 'Get Started' do
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
              describe 'Get Started' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
              describe 'Get Started' do
>>>>>>> 08edf50 (Featire specs)
=======
              describe 'Get Started' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
              describe 'Get Started' do
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
              describe 'Get Started' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
              describe 'Get Started' do
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
              describe 'Get Started' do
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
              context 'when validations' do
>>>>>>> 5b7749a (Fix)
          
        5. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      5. 
            2
=======
          
      6. 
            1
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      7. 
            1
>>>>>>> 752f0c0 (Featire specs)
=======
          
      8. 
            1
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      9. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      10. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      11. 
            1
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      12. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      13. 
            1
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      14. 
            1
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      15. 
            2
>>>>>>> 5b7749a (Fix)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
                it { is_expected.to validate_presence_of(:email) }
=======
                it 'on click move to catalog page' do
>>>>>>> d0dc1f1 (Featire specs)
=======
                it 'on click move to catalog page' do
>>>>>>> 752f0c0 (Featire specs)
=======
                it 'on click move to catalog page' do
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
                it 'on click move to catalog page' do
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                it 'on click move to catalog page' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
                it 'on click move to catalog page' do
>>>>>>> 08edf50 (Featire specs)
=======
                it 'on click move to catalog page' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                it 'on click move to catalog page' do
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                it 'on click move to catalog page' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
                it 'on click move to catalog page' do
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
                it 'on click move to catalog page' do
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
                it { is_expected.to validate_presence_of(:email) }
>>>>>>> 5b7749a (Fix)
          
        16. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      16. 
            2
=======
          
      17. 
            1
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      18. 
            1
>>>>>>> 752f0c0 (Featire specs)
=======
          
      19. 
            1
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      20. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      21. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      22. 
            1
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      23. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      24. 
            1
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      25. 
            1
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      26. 
            2
>>>>>>> 5b7749a (Fix)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
                it { is_expected.to validate_presence_of(:password) }
=======
                  visit root_path
>>>>>>> d0dc1f1 (Featire specs)
=======
                  visit root_path
>>>>>>> 752f0c0 (Featire specs)
=======
                  visit root_path
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
                  visit root_path
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                  visit root_path
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
                  visit root_path
>>>>>>> 08edf50 (Featire specs)
=======
                  visit root_path
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  visit root_path
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                  visit root_path
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
                  visit root_path
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
                  visit root_path
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
                it { is_expected.to validate_presence_of(:password) }
>>>>>>> 5b7749a (Fix)
          
        27. 
        
        
      
        
        
          
      27. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
            
          
        28. 
        
        
      
        
        
          
      28. 
            1
            

            

                  click_on 'Get Started'
          
        29. 
        
        
      
        
        
          
      29. 
            
            

            

            
          
        30. 
        
        
      
        
        
          
      30. 
            1
            

            

                  expect(page).to have_content('Catalog')
          
        31. 
        
        
      
        
        
          
      31. 
            
            

            

                end
          
        32. 
        
        
      
        
        
          
      32. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
              end
          
        33. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      33. 
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      34. 
            
            

            

            
          
        35. 
        
        
      
        
        
          
      35. 
            1
            

            

              describe 'navbar' do
          
        36. 
        
        
      
        
        
          
      36. 
            2
            

            

                let(:books_category) { FactoryBot.create(:books_category) }
          
        37. 
        
        
      
        
        
          
      37. 
            
            

            

            
          
        38. 
        
        
      
        
        
          
      38. 
            1
            

            

                it 'on click home move to root-path' do
          
        39. 
        
        
      
        
        
          
      39. 
            1
            

            

                  visit books_path
          
        40. 
        
        
      
        
        
          
      40. 
            
            

            

            
          
        41. 
        
        
      
        
        
          
      41. 
            1
            

            

                  find('a', id: 'root').click
          
        42. 
        
        
      
        
        
          
      42. 
            
            

            

            
          
        43. 
        
        
      
        
        
          
      43. 
            1
            

            

                  expect(page).to have_content('Get Started')
          
        44. 
        
        
      
        
        
          
      44. 
            
            

            

                end
          
        45. 
        
        
      
        
        
          
      45. 
            
            

            

            
          
        46. 
        
        
      
        
        
          
      46. 
            1
            

            

                it 'on click category name move to root-path with books that belong to this category' do
          
        47. 
        
        
      
        
        
          
      47. 
            1
            

            

                  books_category
          
        48. 
        
        
      
        
        
          
      48. 
            
            

            

            
          
        49. 
        
        
      
        
        
          
      49. 
            1
            

            

                  visit root_path
          
        50. 
        
        
      
        
        
          
      50. 
            
            

            

            
          
        51. 
        
        
      
        
        
          
      51. 
            1
            

            

                  find('a', class: 'dropdown-toggle', text: 'Shop').click
          
        52. 
        
        
      
        
        
          
      52. 
            
            

            

            
          
        53. 
        
        
      
        
        
          
      53. 
            1
            

            

                  within('ul', id: 'nav') do
          
        54. 
        
        
      
        
        
          
      54. 
            1
            

            

                    find('a', class: 'collapse-link', text: books_category.category.name).click
          
        55. 
        
        
      
        
        
          
      55. 
            
            

            

                  end
          
        56. 
        
        
      
        
        
          
      56. 
            
            

            

            
          
        57. 
        
        
      
        
        
          
      57. 
            1
            

            

                  expect(page).to have_content(books_category.category.books.first.title)
          
        58. 
        
        
      
        
        
          
      58. 
            
            

            

                end
          
        59. 
        
        
      
        
        
          
      59. 
            
            

            

              end
          
        60. 
        
        
      
        
        
          
      60. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      61. 
>>>>>>> 5b7749a (Fix)
            
            

            

            end
          
        62. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/models/author_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      8 relevant lines.
      8 lines covered and
=======
      9 relevant lines.
      9 lines covered and
>>>>>>> d0dc1f1 (Featire specs)
=======
      9 relevant lines.
      9 lines covered and
>>>>>>> 752f0c0 (Featire specs)
=======
      9 relevant lines.
      9 lines covered and
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
      9 relevant lines.
      9 lines covered and
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
      9 relevant lines.
      9 lines covered and
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
      9 relevant lines.
      9 lines covered and
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
      9 relevant lines.
      9 lines covered and
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
      9 relevant lines.
      9 lines covered and
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
      9 relevant lines.
      9 lines covered and
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
      8 relevant lines.
      8 lines covered and
>>>>>>> 5b7749a (Fix)
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
            RSpec.describe Author, type: :model do
=======
            require 'rails_helper'
>>>>>>> d0dc1f1 (Featire specs)
=======
            require 'rails_helper'
>>>>>>> 752f0c0 (Featire specs)
=======
            require 'rails_helper'
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
            require 'rails_helper'
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
            require 'rails_helper'
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
            require 'rails_helper'
>>>>>>> 08edf50 (Featire specs)
=======
            require 'rails_helper'
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
            require 'rails_helper'
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
            require 'rails_helper'
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
            require 'rails_helper'
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
            require 'rails_helper'
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
            RSpec.describe Author, type: :model do
>>>>>>> 5b7749a (Fix)
          
        2. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
          
      2. 
            1
            

            

              describe 'author' do
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

                context 'when validations' do
          
        4. 
        
        
      
        
        
          
      4. 
            2
            

            

                  it { is_expected.to validate_presence_of(:first_name) }
          
        5. 
        
        
      
        
        
          
      5. 
            2
            

            

                  it { is_expected.to validate_presence_of(:last_name) }
          
        6. 
        
        
      
        
        
          
      6. 
            
            

            

                end
          
        7. 
        
        
      
        
        
          
      7. 
<<<<<<< HEAD
=======
          
      8. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      9. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
      10. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
          
      11. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      12. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      13. 
>>>>>>> 08edf50 (Featire specs)
=======
          
      14. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      15. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      16. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      17. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      18. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
            
            

            

            
          
        19. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      19. 
=======
          
      20. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      21. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
      22. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
          
      23. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      24. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      25. 
>>>>>>> 08edf50 (Featire specs)
=======
          
      26. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      27. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      28. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      29. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      30. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      31. 
>>>>>>> 5b7749a (Fix)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
                context 'when associations' do
=======
            RSpec.describe Author, type: :model do
>>>>>>> d0dc1f1 (Featire specs)
=======
            RSpec.describe Author, type: :model do
>>>>>>> 752f0c0 (Featire specs)
=======
            RSpec.describe Author, type: :model do
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
            RSpec.describe Author, type: :model do
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
            RSpec.describe Author, type: :model do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
            RSpec.describe Author, type: :model do
>>>>>>> 08edf50 (Featire specs)
=======
            RSpec.describe Author, type: :model do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
            RSpec.describe Author, type: :model do
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
            RSpec.describe Author, type: :model do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
            RSpec.describe Author, type: :model do
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
            RSpec.describe Author, type: :model do
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
                context 'when associations' do
>>>>>>> 5b7749a (Fix)
          
        32. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      32. 
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      33. 
            1
            

            

              describe 'author' do
          
        34. 
        
        
      
        
        
          
      34. 
            1
            

            

                context 'when validations' do
          
        35. 
        
        
      
        
        
          
      35. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      36. 
>>>>>>> 5b7749a (Fix)
            2
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
                  it { is_expected.to have_many(:authors_books).dependent(:destroy) }
=======
                  it { is_expected.to validate_presence_of(:first_name) }
>>>>>>> d0dc1f1 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:first_name) }
>>>>>>> 752f0c0 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:first_name) }
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
                  it { is_expected.to validate_presence_of(:first_name) }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                  it { is_expected.to validate_presence_of(:first_name) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
                  it { is_expected.to validate_presence_of(:first_name) }
>>>>>>> 08edf50 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:first_name) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to validate_presence_of(:first_name) }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                  it { is_expected.to validate_presence_of(:first_name) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
                  it { is_expected.to validate_presence_of(:first_name) }
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
                  it { is_expected.to validate_presence_of(:first_name) }
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to have_many(:authors_books).dependent(:destroy) }
>>>>>>> 5b7749a (Fix)
          
        37. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      37. 
=======
          
      38. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      39. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
      40. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
          
      41. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      42. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      43. 
>>>>>>> 08edf50 (Featire specs)
=======
          
      44. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      45. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      46. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      47. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      48. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      49. 
>>>>>>> 5b7749a (Fix)
            2
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
                  it { is_expected.to have_many(:books).through(:authors_books) }
=======
                  it { is_expected.to validate_presence_of(:last_name) }
>>>>>>> d0dc1f1 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:last_name) }
>>>>>>> 752f0c0 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:last_name) }
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
                  it { is_expected.to validate_presence_of(:last_name) }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                  it { is_expected.to validate_presence_of(:last_name) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
                  it { is_expected.to validate_presence_of(:last_name) }
>>>>>>> 08edf50 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:last_name) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to validate_presence_of(:last_name) }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                  it { is_expected.to validate_presence_of(:last_name) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
                  it { is_expected.to validate_presence_of(:last_name) }
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
                  it { is_expected.to validate_presence_of(:last_name) }
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to have_many(:books).through(:authors_books) }
>>>>>>> 5b7749a (Fix)
          
        50. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      50. 
=======
          
      51. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      52. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
      53. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
          
      54. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      55. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      56. 
>>>>>>> 08edf50 (Featire specs)
=======
          
      57. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      58. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      59. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      60. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      61. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      62. 
>>>>>>> 5b7749a (Fix)
            
            

            

                end
          
        63. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      63. 
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      64. 
            
            

            

            
          
        65. 
        
        
      
        
        
          
      65. 
            1
            

            

                context 'when associations' do
          
        66. 
        
        
      
        
        
          
      66. 
            2
            

            

                  it { is_expected.to have_many(:authors_books).dependent(:destroy) }
          
        67. 
        
        
      
        
        
          
      67. 
            2
            

            

                  it { is_expected.to have_many(:books).through(:authors_books) }
          
        68. 
        
        
      
        
        
          
      68. 
            
            

            

                end
          
        69. 
        
        
      
        
        
          
      69. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      70. 
>>>>>>> 5b7749a (Fix)
            
            

            

              end
          
        71. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      71. 
=======
          
      72. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      73. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
      74. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
          
      75. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      76. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      77. 
>>>>>>> 08edf50 (Featire specs)
=======
          
      78. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      79. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      80. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      81. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      82. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      83. 
>>>>>>> 5b7749a (Fix)
            
            

            

            end
          
        84. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/models/authors_book_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      8 relevant lines.
      8 lines covered and
=======
      9 relevant lines.
      9 lines covered and
>>>>>>> d0dc1f1 (Featire specs)
=======
      9 relevant lines.
      9 lines covered and
>>>>>>> 752f0c0 (Featire specs)
=======
      9 relevant lines.
      9 lines covered and
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
      9 relevant lines.
      9 lines covered and
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
      9 relevant lines.
      9 lines covered and
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
      9 relevant lines.
      9 lines covered and
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
      9 relevant lines.
      9 lines covered and
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
      9 relevant lines.
      9 lines covered and
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
      9 relevant lines.
      9 lines covered and
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
      8 relevant lines.
      8 lines covered and
>>>>>>> 5b7749a (Fix)
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
            require 'rails_helper'
          
        2. 
        
        
      
        
        
          
      2. 
            
            

            

            
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
            RSpec.describe AuthorsBook, type: :model do
          
        4. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      4. 
=======
          
      5. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      6. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
      7. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
          
      8. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      9. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      10. 
>>>>>>> 08edf50 (Featire specs)
=======
          
      11. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      12. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      13. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      14. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      15. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      16. 
>>>>>>> 5b7749a (Fix)
            1
            

            

              describe 'authors_book' do
          
        17. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      17. 
=======
          
      18. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      19. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
      20. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
          
      21. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      22. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      23. 
>>>>>>> 08edf50 (Featire specs)
=======
          
      24. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      25. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      26. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      27. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      28. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      29. 
>>>>>>> 5b7749a (Fix)
            1
            

            

                context 'when validations' do
          
        30. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
          
      30. 
            2
            

            

                  it { is_expected.to validate_presence_of(:book) }
          
        31. 
        
        
      
        
        
          
      31. 
            2
            

            

                  it { is_expected.to validate_presence_of(:author) }
          
        32. 
        
        
      
        
        
          
      32. 
            
            

            

                end
          
        33. 
        
        
      
        
        
          
      33. 
            
            

            

            
          
        34. 
        
        
      
        
        
          
      34. 
            1
            

            

                context 'when associations' do
          
        35. 
        
        
      
        
        
          
      35. 
            2
            

            

                  it { is_expected.to belong_to(:author) }
          
        36. 
        
        
      
        
        
          
      36. 
            2
            

            

                  it { is_expected.to belong_to(:book) }
          
        37. 
        
        
      
        
        
          
      37. 
            
            

            

                end
          
        38. 
        
        
      
        
        
          
      38. 
            
            

            

              end
          
        39. 
        
        
      
        
        
          
      39. 
            
            

            

            end
          
        40. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/models/billing_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      20 relevant lines.
      20 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            RSpec.describe Billing, type: :model do
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

              describe 'billing' do
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

                context 'when validations' do
          
        4. 
        
        
      
        
        
          
      4. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::Name.first_name).for(:first_name) }
          
        5. 
        
        
      
        
        
          
      5. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::Name.first_name).for(:last_name) }
          
        6. 
        
        
      
        
        
<<<<<<< HEAD
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
          
      6. 
            2
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
                  it { is_expected.to allow_values('+919367788755', '8989829304', '+16308520397', '786-307-3615').for(:phone) }
=======
                  it { is_expected.to validate_presence_of(:book) }
>>>>>>> d0dc1f1 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:book) }
>>>>>>> 752f0c0 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:book) }
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
                  it { is_expected.to validate_presence_of(:book) }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                  it { is_expected.to validate_presence_of(:book) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
                  it { is_expected.to validate_presence_of(:book) }
>>>>>>> 08edf50 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:book) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to validate_presence_of(:book) }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                  it { is_expected.to validate_presence_of(:book) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
                  it { is_expected.to validate_presence_of(:book) }
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
                  it { is_expected.to validate_presence_of(:book) }
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to allow_values('+919367788755', '8989829304', '+16308520397', '786-307-3615').for(:phone) }
>>>>>>> 5b7749a (Fix)
          
        7. 
        
        
      
        
        
          
      7. 
            2
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
                  it { is_expected.to allow_values(FFaker::AddressUK.country).for(:country) }
=======
                  it { is_expected.to validate_presence_of(:author) }
>>>>>>> d0dc1f1 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:author) }
>>>>>>> 752f0c0 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:author) }
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
                  it { is_expected.to validate_presence_of(:author) }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                  it { is_expected.to validate_presence_of(:author) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
                  it { is_expected.to validate_presence_of(:author) }
>>>>>>> 08edf50 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:author) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to validate_presence_of(:author) }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                  it { is_expected.to validate_presence_of(:author) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
                  it { is_expected.to validate_presence_of(:author) }
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
                  it { is_expected.to validate_presence_of(:author) }
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to allow_values(FFaker::AddressUK.country).for(:country) }
>>>>>>> 5b7749a (Fix)
          
        8. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
          
      8. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::AddressUK.city).for(:city) }
          
        9. 
        
        
      
        
        
          
      9. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::AddressUA.zip_code).for(:zip) }
          
        10. 
        
        
      
        
        
          
      10. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::Address.street_address).for(:address) }
          
        11. 
        
        
      
        
        
          
      11. 
<<<<<<< HEAD
=======
          
      12. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      13. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
      14. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
          
      15. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      16. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      17. 
>>>>>>> 08edf50 (Featire specs)
=======
          
      18. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      19. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      20. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      21. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      22. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
            
            

            

                end
          
        23. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      23. 
=======
          
      24. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      25. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
      26. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
          
      27. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      28. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      29. 
>>>>>>> 08edf50 (Featire specs)
=======
          
      30. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      31. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      32. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      33. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      34. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      35. 
>>>>>>> 5b7749a (Fix)
            
            

            

            
          
        36. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
          
      36. 
            1
            

            

                context 'when not validations' do
          
        37. 
        
        
      
        
        
          
      37. 
            2
            

            

                  it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:first_name) }
          
        38. 
        
        
      
        
        
          
      38. 
            2
            

            

                  it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:last_name) }
          
        39. 
        
        
      
        
        
          
      39. 
            2
            

            

                  it { is_expected.not_to allow_values('789', '123765', '1-1-1', '+982').for(:phone) }
          
        40. 
        
        
      
        
        
          
      40. 
            2
            

            

                  it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:country) }
          
        41. 
        
        
      
        
        
          
      41. 
            2
            

            

                  it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:city) }
          
        42. 
        
        
      
        
        
          
      42. 
            2
            

            

                  it { is_expected.not_to allow_values('1' * Constants::VALIDATES_ZIP_LENGTH_MAX.next).for(:zip) }
          
        43. 
        
        
      
        
        
          
      43. 
            2
            

            

                  it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:address) }
          
        44. 
        
        
      
        
        
          
      44. 
            
            

            

                end
          
        45. 
        
        
      
        
        
          
      45. 
            
            

            

            
          
        46. 
        
        
      
        
        
          
      46. 
<<<<<<< HEAD
=======
          
      47. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      48. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
      49. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
          
      50. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      51. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      52. 
>>>>>>> 08edf50 (Featire specs)
=======
          
      53. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      54. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      55. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      56. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      57. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
            1
            

            

                context 'when associations' do
          
        58. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      58. 
=======
          
      59. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      60. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
      61. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
          
      62. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      63. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      64. 
>>>>>>> 08edf50 (Featire specs)
=======
          
      65. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      66. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      67. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      68. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      69. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      70. 
>>>>>>> 5b7749a (Fix)
            2
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
                  it { is_expected.to belong_to(:user) }
=======
                  it { is_expected.to belong_to(:author) }
>>>>>>> d0dc1f1 (Featire specs)
=======
                  it { is_expected.to belong_to(:author) }
>>>>>>> 752f0c0 (Featire specs)
=======
                  it { is_expected.to belong_to(:author) }
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
                  it { is_expected.to belong_to(:author) }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                  it { is_expected.to belong_to(:author) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
                  it { is_expected.to belong_to(:author) }
>>>>>>> 08edf50 (Featire specs)
=======
                  it { is_expected.to belong_to(:author) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to belong_to(:author) }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                  it { is_expected.to belong_to(:author) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
                  it { is_expected.to belong_to(:author) }
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
                  it { is_expected.to belong_to(:author) }
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to belong_to(:user) }
>>>>>>> 5b7749a (Fix)
          
        71. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      71. 
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      72. 
            2
            

            

                  it { is_expected.to belong_to(:book) }
          
        73. 
        
        
      
        
        
          
      73. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      74. 
>>>>>>> 5b7749a (Fix)
            
            

            

                end
          
        75. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      75. 
=======
          
      76. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      77. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
      78. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
          
      79. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      80. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      81. 
>>>>>>> 08edf50 (Featire specs)
=======
          
      82. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      83. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      84. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      85. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      86. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      87. 
>>>>>>> 5b7749a (Fix)
            
            

            

              end
          
        88. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      88. 
=======
          
      89. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      90. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
      91. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
          
      92. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      93. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      94. 
>>>>>>> 08edf50 (Featire specs)
=======
          
      95. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      96. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      97. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      98. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      99. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      100. 
>>>>>>> 5b7749a (Fix)
            
            

            

            end
          
        101. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/models/book_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      16 relevant lines.
      16 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
            RSpec.describe Book, type: :model do
=======
            require 'rails_helper'
>>>>>>> d0dc1f1 (Featire specs)
=======
            require 'rails_helper'
>>>>>>> 752f0c0 (Featire specs)
=======
            require 'rails_helper'
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
            require 'rails_helper'
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
            require 'rails_helper'
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
            require 'rails_helper'
>>>>>>> 08edf50 (Featire specs)
=======
            require 'rails_helper'
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
            require 'rails_helper'
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
            require 'rails_helper'
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
            require 'rails_helper'
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
            require 'rails_helper'
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
            RSpec.describe Book, type: :model do
>>>>>>> 5b7749a (Fix)
          
        2. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      2. 
            1
=======
          
      3. 
            
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      4. 
            
>>>>>>> 752f0c0 (Featire specs)
=======
          
      5. 
            
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      6. 
            
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      7. 
            
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      8. 
            
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      9. 
            
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      10. 
            
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      11. 
            
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      12. 
            1
>>>>>>> 5b7749a (Fix)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
              describe 'books' do
=======
            
>>>>>>> d0dc1f1 (Featire specs)
=======
            
>>>>>>> 752f0c0 (Featire specs)
=======
            
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
            
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
            
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
            
>>>>>>> 08edf50 (Featire specs)
=======
            
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
            
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
            
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
            
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
            
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
              describe 'books' do
>>>>>>> 5b7749a (Fix)
          
        13. 
        
        
      
        
        
          
      13. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
            RSpec.describe Book, type: :model do
          
        14. 
        
        
      
        
        
          
      14. 
            1
            

            

              describe 'books' do
          
        15. 
        
        
      
        
        
          
      15. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
                context 'when validations' do
          
        16. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
          
      16. 
            2
            

            

                  it { is_expected.to validate_presence_of(:title) }
          
        17. 
        
        
      
        
        
          
      17. 
            2
            

            

                  it { is_expected.to validate_presence_of(:description) }
          
        18. 
        
        
      
        
        
<<<<<<< HEAD
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
          
      18. 
            2
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
                  it { is_expected.to allow_values(Constants::MIN_PRICE_IN_CENTS, Constants::MAX_PRICE_IN_CENTS).for(:price_cents) }
=======
                  it { is_expected.to validate_presence_of(:title) }
>>>>>>> d0dc1f1 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:title) }
>>>>>>> 752f0c0 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:title) }
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
                  it { is_expected.to validate_presence_of(:title) }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                  it { is_expected.to validate_presence_of(:title) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
                  it { is_expected.to validate_presence_of(:title) }
>>>>>>> 08edf50 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:title) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to validate_presence_of(:title) }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                  it { is_expected.to validate_presence_of(:title) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
                  it { is_expected.to validate_presence_of(:title) }
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
                  it { is_expected.to validate_presence_of(:title) }
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to allow_values(Constants::MIN_PRICE_IN_CENTS, Constants::MAX_PRICE_IN_CENTS).for(:price_cents) }
>>>>>>> 5b7749a (Fix)
          
        19. 
        
        
      
        
        
          
      19. 
            2
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
                  it { is_expected.to validate_presence_of(:year_of_publication) }
=======
                  it { is_expected.to validate_presence_of(:description) }
>>>>>>> d0dc1f1 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:description) }
>>>>>>> 752f0c0 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:description) }
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
                  it { is_expected.to validate_presence_of(:description) }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                  it { is_expected.to validate_presence_of(:description) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
                  it { is_expected.to validate_presence_of(:description) }
>>>>>>> 08edf50 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:description) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to validate_presence_of(:description) }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                  it { is_expected.to validate_presence_of(:description) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
                  it { is_expected.to validate_presence_of(:description) }
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
                  it { is_expected.to validate_presence_of(:description) }
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to validate_presence_of(:year_of_publication) }
>>>>>>> 5b7749a (Fix)
          
        20. 
        
        
      
        
        
          
      20. 
            2
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
                  it { is_expected.to validate_presence_of(:quantity) }
=======
                  it { is_expected.to validate_presence_of(:price) }
>>>>>>> d0dc1f1 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:price) }
>>>>>>> 752f0c0 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:price) }
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
                  it { is_expected.to validate_presence_of(:price) }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                  it { is_expected.to validate_presence_of(:price) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
                  it { is_expected.to validate_presence_of(:price) }
>>>>>>> 08edf50 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:price) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to validate_presence_of(:price) }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                  it { is_expected.to validate_presence_of(:price) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
                  it { is_expected.to validate_presence_of(:price) }
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
                  it { is_expected.to validate_presence_of(:price) }
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to validate_presence_of(:quantity) }
>>>>>>> 5b7749a (Fix)
          
        21. 
        
        
      
        
        
          
      21. 
            2
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
                  it { is_expected.to validate_presence_of(:materials) }
=======
                  it { is_expected.to validate_presence_of(:year_of_publication) }
>>>>>>> d0dc1f1 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:year_of_publication) }
>>>>>>> 752f0c0 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:year_of_publication) }
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
                  it { is_expected.to validate_presence_of(:year_of_publication) }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                  it { is_expected.to validate_presence_of(:year_of_publication) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
                  it { is_expected.to validate_presence_of(:year_of_publication) }
>>>>>>> 08edf50 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:year_of_publication) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to validate_presence_of(:year_of_publication) }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                  it { is_expected.to validate_presence_of(:year_of_publication) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
                  it { is_expected.to validate_presence_of(:year_of_publication) }
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
                  it { is_expected.to validate_presence_of(:year_of_publication) }
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to validate_presence_of(:materials) }
>>>>>>> 5b7749a (Fix)
          
        22. 
        
        
      
        
        
          
      22. 
            2
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
                  it { is_expected.to validate_presence_of(:quantity) }
          
        23. 
        
        
      
        
        
          
      23. 
            2
            

            

                  it { is_expected.to validate_presence_of(:materials) }
          
        24. 
        
        
      
        
        
          
      24. 
            2
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
                  it { is_expected.to validate_presence_of(:dimensions) }
          
        25. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      25. 
=======
          
      26. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      27. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
      28. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
          
      29. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      30. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      31. 
>>>>>>> 08edf50 (Featire specs)
=======
          
      32. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      33. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      34. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      35. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      36. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      37. 
>>>>>>> 5b7749a (Fix)
            
            

            

                end
          
        38. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      38. 
=======
          
      39. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      40. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
      41. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
          
      42. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      43. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      44. 
>>>>>>> 08edf50 (Featire specs)
=======
          
      45. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      46. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      47. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      48. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      49. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      50. 
>>>>>>> 5b7749a (Fix)
            
            

            

            
          
        51. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      51. 
=======
          
      52. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      53. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
      54. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
          
      55. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      56. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      57. 
>>>>>>> 08edf50 (Featire specs)
=======
          
      58. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      59. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      60. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      61. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      62. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      63. 
>>>>>>> 5b7749a (Fix)
            1
            

            

                context 'when associations' do
          
        64. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      64. 
=======
          
      65. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      66. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
      67. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
          
      68. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      69. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      70. 
>>>>>>> 08edf50 (Featire specs)
=======
          
      71. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      72. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      73. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      74. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      75. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      76. 
>>>>>>> 5b7749a (Fix)
            2
            

            

                  it { is_expected.to have_many(:authors_books).dependent(:destroy) }
          
        77. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      77. 
=======
          
      78. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      79. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
      80. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
          
      81. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      82. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      83. 
>>>>>>> 08edf50 (Featire specs)
=======
          
      84. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      85. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      86. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      87. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      88. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      89. 
>>>>>>> 5b7749a (Fix)
            2
            

            

                  it { is_expected.to have_many(:authors).through(:authors_books) }
          
        90. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      90. 
=======
          
      91. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      92. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
      93. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
          
      94. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      95. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      96. 
>>>>>>> 08edf50 (Featire specs)
=======
          
      97. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      98. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      99. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      100. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      101. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      102. 
>>>>>>> 5b7749a (Fix)
            
            

            

            
          
        103. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      103. 
=======
          
      104. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      105. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
      106. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
          
      107. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      108. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      109. 
>>>>>>> 08edf50 (Featire specs)
=======
          
      110. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      111. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      112. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      113. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      114. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      115. 
>>>>>>> 5b7749a (Fix)
            2
            

            

                  it { is_expected.to have_many(:books_categories).dependent(:destroy) }
          
        116. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
          
      116. 
            2
            

            

                  it { is_expected.to have_many(:categories).through(:books_categories) }
          
        117. 
        
        
      
        
        
          
      117. 
            
            

            

            
          
        118. 
        
        
      
        
        
<<<<<<< HEAD
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
          
      118. 
            2
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
                  it { is_expected.to have_many(:reviews).dependent(:destroy) }
=======
                  it { is_expected.to have_many(:categories).through(:books_categories) }
>>>>>>> d0dc1f1 (Featire specs)
=======
                  it { is_expected.to have_many(:categories).through(:books_categories) }
>>>>>>> 752f0c0 (Featire specs)
=======
                  it { is_expected.to have_many(:categories).through(:books_categories) }
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
                  it { is_expected.to have_many(:categories).through(:books_categories) }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                  it { is_expected.to have_many(:categories).through(:books_categories) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
                  it { is_expected.to have_many(:categories).through(:books_categories) }
>>>>>>> 08edf50 (Featire specs)
=======
                  it { is_expected.to have_many(:categories).through(:books_categories) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to have_many(:categories).through(:books_categories) }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                  it { is_expected.to have_many(:categories).through(:books_categories) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
                  it { is_expected.to have_many(:categories).through(:books_categories) }
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
                  it { is_expected.to have_many(:categories).through(:books_categories) }
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to have_many(:reviews).dependent(:destroy) }
>>>>>>> 5b7749a (Fix)
          
        119. 
        
        
      
        
        
          
      119. 
            
            

            

                end
          
        120. 
        
        
      
        
        
          
      120. 
            
            

            

              end
          
        121. 
        
        
      
        
        
          
      121. 
            
            

            

            end
          
        122. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/models/books_category_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
      8 relevant lines.
      8 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            RSpec.describe BooksCategory, type: :model do
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

              describe 'books_categories' do
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

                context 'when validations' do
          
        4. 
        
        
      
        
        
          
      4. 
            2
            

            

                  it { is_expected.to validate_presence_of(:book) }
          
        5. 
        
        
      
        
        
          
      5. 
            2
            

            

                  it { is_expected.to validate_presence_of(:category) }
          
        6. 
        
        
      
        
        
          
      6. 
            
            

            

                end
          
        7. 
        
        
      
        
        
          
      7. 
            
            

            

            
          
        8. 
        
        
      
        
        
          
      8. 
            1
            

            

                context 'when associations' do
          
        9. 
        
        
      
        
        
          
      9. 
            2
            

            

                  it { is_expected.to belong_to(:category) }
          
        10. 
        
        
      
        
        
          
      10. 
            2
            

            

                  it { is_expected.to belong_to(:book) }
          
        11. 
        
        
      
        
        
          
      11. 
            
            

            

                end
          
        12. 
        
        
      
        
        
          
      12. 
            
            

            

              end
          
        13. 
        
        
      
        
        
          
      13. 
            
            

            

            end
          
        14. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/models/category_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      7 relevant lines.
      7 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            RSpec.describe Category, type: :model do
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

              describe 'category' do
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

                context 'when validations' do
          
        4. 
        
        
      
        
        
          
      4. 
            2
            

            

                  it { is_expected.to validate_presence_of(:name) }
          
        5. 
        
        
      
        
        
          
      5. 
            
            

            

                end
          
        6. 
        
        
      
        
        
          
      6. 
            
            

            

            
          
        7. 
        
        
      
        
        
          
      7. 
            1
            

            

                context 'when associations' do
          
        8. 
        
        
      
        
        
          
      8. 
            2
            

            

                  it { is_expected.to have_many(:books_categories).dependent(:destroy) }
          
        9. 
        
        
      
        
        
          
      9. 
            2
            

            

                  it { is_expected.to have_many(:books).through(:books_categories) }
          
        10. 
        
        
      
        
        
          
      10. 
            
            

            

                end
          
        11. 
        
        
      
        
        
          
      11. 
            
            

            

              end
          
        12. 
        
        
      
        
        
          
      12. 
            
            

            

            end
          
        13. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/models/order_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
<<<<<<< HEAD
      14 relevant lines.
      14 lines covered and
=======
      9 relevant lines.
      9 lines covered and
>>>>>>> d0dc1f1 (Featire specs)
=======
      9 relevant lines.
      9 lines covered and
>>>>>>> 752f0c0 (Featire specs)
=======
      9 relevant lines.
      9 lines covered and
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
      9 relevant lines.
      9 lines covered and
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
      9 relevant lines.
      9 lines covered and
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
      9 relevant lines.
      9 lines covered and
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
      9 relevant lines.
      9 lines covered and
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
      9 relevant lines.
      9 lines covered and
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
      9 relevant lines.
      9 lines covered and
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
      6 relevant lines.
      6 lines covered and
>>>>>>> 5b7749a (Fix)
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            require 'rails_helper'
          
        2. 
        
        
      
        
        
          
      2. 
            
            

            

            
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
            RSpec.describe Review, type: :model do
=======
            RSpec.describe BooksCategory, type: :model do
>>>>>>> d0dc1f1 (Featire specs)
=======
            RSpec.describe BooksCategory, type: :model do
>>>>>>> 752f0c0 (Featire specs)
=======
            RSpec.describe BooksCategory, type: :model do
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
            RSpec.describe BooksCategory, type: :model do
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
            RSpec.describe BooksCategory, type: :model do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
            RSpec.describe BooksCategory, type: :model do
>>>>>>> 08edf50 (Featire specs)
=======
            RSpec.describe BooksCategory, type: :model do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
            RSpec.describe BooksCategory, type: :model do
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
            RSpec.describe BooksCategory, type: :model do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
            RSpec.describe BooksCategory, type: :model do
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
            RSpec.describe BooksCategory, type: :model do
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
            RSpec.describe Order, type: :model do
          
        4. 
        
        
      
        
        
          
      4. 
            1
            

            

              describe 'order' do
          
        5. 
        
        
      
        
        
          
      5. 
            1
            

            

                context 'when associations' do
          
        6. 
        
        
      
        
        
          
      6. 
            2
            

            

                  it { is_expected.to have_many(:order_books).dependent(:destroy) }
          
        7. 
        
        
      
        
        
          
      7. 
            2
            

            

                  it { is_expected.to have_many(:books).through(:order_books) }
          
        8. 
        
        
      
        
        
          
      8. 
            
            

            

                end
          
        9. 
        
        
      
        
        
          
      9. 
            
            

            

              end
          
        10. 
        
        
      
        
        
          
      10. 
            
            

            

            end
          
        11. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/models/review_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      14 relevant lines.
      14 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            require 'rails_helper'
          
        2. 
        
        
      
        
        
          
      2. 
            
            

            

            
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

            RSpec.describe Review, type: :model do
>>>>>>> 5b7749a (Fix)
          
        4. 
        
        
      
        
        
          
      4. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
              describe 'review' do
=======
              describe 'books_categories' do
>>>>>>> d0dc1f1 (Featire specs)
=======
              describe 'books_categories' do
>>>>>>> 752f0c0 (Featire specs)
=======
              describe 'books_categories' do
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
              describe 'books_categories' do
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
              describe 'books_categories' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
              describe 'books_categories' do
>>>>>>> 08edf50 (Featire specs)
=======
              describe 'books_categories' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
              describe 'books_categories' do
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
              describe 'books_categories' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
              describe 'books_categories' do
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
              describe 'books_categories' do
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
              describe 'review' do
>>>>>>> 5b7749a (Fix)
          
        5. 
        
        
      
        
        
          
      5. 
            1
            

            

                context 'when validations' do
          
        6. 
        
        
      
        
        
          
      6. 
            2
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
                  it { is_expected.to validate_presence_of(:title) }
=======
                  it { is_expected.to validate_presence_of(:book) }
>>>>>>> d0dc1f1 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:book) }
>>>>>>> 752f0c0 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:book) }
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
                  it { is_expected.to validate_presence_of(:book) }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                  it { is_expected.to validate_presence_of(:book) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
                  it { is_expected.to validate_presence_of(:book) }
>>>>>>> 08edf50 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:book) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to validate_presence_of(:book) }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                  it { is_expected.to validate_presence_of(:book) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
                  it { is_expected.to validate_presence_of(:book) }
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
                  it { is_expected.to validate_presence_of(:book) }
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to validate_presence_of(:title) }
>>>>>>> 5b7749a (Fix)
          
        7. 
        
        
      
        
        
          
      7. 
            2
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
                  it { is_expected.to validate_presence_of(:body) }
          
        8. 
        
        
      
        
        
          
      8. 
            2
            

            

                  it { is_expected.to validate_presence_of(:rating) }
          
        9. 
        
        
      
        
        
          
      9. 
            2
            

            

                  it { is_expected.to validate_presence_of(:verified) }
          
        10. 
        
        
      
        
        
          
      10. 
            2
            

            

                  it { is_expected.to allow_values('a' * Constants::VALIDATES_TITLE_LENGTH_MAX).for(:title) }
          
        11. 
        
        
      
        
        
          
      11. 
            2
            

            

                  it { is_expected.to allow_values('a' * Constants::VALIDATES_TEXT_LENGTH_MAX).for(:body) }
          
        12. 
        
        
      
        
        
          
      12. 
            2
            

            

                  it { is_expected.to allow_values(1, 2, 3, 4, 5).for(:rating) }
          
        13. 
        
        
      
        
        
          
      13. 
            
            

            

                end
          
        14. 
        
        
      
        
        
          
      14. 
            
            

            

            
          
        15. 
        
        
      
        
        
          
      15. 
            1
            

            

                context 'when associations' do
          
        16. 
        
        
      
        
        
          
      16. 
            2
            

            

                  it { is_expected.to belong_to(:book) }
          
        17. 
        
        
      
        
        
          
      17. 
            2
            

            

                  it { is_expected.to belong_to(:user) }
          
        18. 
        
        
      
        
        
          
      18. 
            
            

            

                end
          
        19. 
        
        
      
        
        
          
      19. 
            
            

            

              end
          
        20. 
        
        
      
        
        
          
      20. 
            
            

            

            end
          
        21. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/models/shipping_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      20 relevant lines.
      20 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            RSpec.describe Shipping, type: :model do
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

              describe 'shipping' do
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

                context 'when validations' do
          
        4. 
        
        
      
        
        
          
      4. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::Name.first_name).for(:first_name) }
          
        5. 
        
        
      
        
        
          
      5. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::Name.first_name).for(:last_name) }
          
        6. 
        
        
      
        
        
          
      6. 
            2
            

            

                  it { is_expected.to allow_values('+919367788755', '8989829304', '+16308520397', '786-307-3615').for(:phone) }
          
        7. 
        
        
      
        
        
          
      7. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::AddressUK.country).for(:country) }
          
        8. 
        
        
      
        
        
          
      8. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::AddressUK.city).for(:city) }
          
        9. 
        
        
      
        
        
          
      9. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::AddressUA.zip_code).for(:zip) }
          
        10. 
        
        
      
        
        
          
      10. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::Address.street_address).for(:address) }
          
        11. 
        
        
      
        
        
          
      11. 
            
            

            

                end
          
        12. 
        
        
      
        
        
          
      12. 
            
            

            

            
          
        13. 
        
        
      
        
        
          
      13. 
            1
            

            

                context 'when not validations' do
          
        14. 
        
        
      
        
        
          
      14. 
            2
            

            

                  it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:first_name) }
          
        15. 
        
        
      
        
        
          
      15. 
            2
            

            

                  it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:last_name) }
          
        16. 
        
        
      
        
        
          
      16. 
            2
            

            

                  it { is_expected.not_to allow_values('789', '123765', '1-1-1', '+982').for(:phone) }
          
        17. 
        
        
      
        
        
          
      17. 
            2
            

            

                  it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:country) }
          
        18. 
        
        
      
        
        
          
      18. 
            2
            

            

                  it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:city) }
          
        19. 
        
        
      
        
        
          
      19. 
            2
            

            

                  it { is_expected.not_to allow_values('1' * Constants::VALIDATES_ZIP_LENGTH_MAX.next).for(:zip) }
          
        20. 
        
        
      
        
        
          
      20. 
            2
            

            

                  it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:address) }
          
        21. 
        
        
      
        
        
          
      21. 
            
            

            

                end
          
        22. 
        
        
      
        
        
          
      22. 
            
            

            

            
          
        23. 
        
        
      
        
        
          
      23. 
            1
            

            

                context 'when associations' do
          
        24. 
        
        
      
        
        
          
      24. 
            2
            

            

                  it { is_expected.to belong_to(:user) }
          
        25. 
        
        
      
        
        
          
      25. 
            
            

            

                end
          
        26. 
        
        
      
        
        
          
      26. 
            
            

            

              end
          
        27. 
        
        
      
        
        
          
      27. 
            
            

            

            end
          
        28. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/models/user_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      8 relevant lines.
      8 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            RSpec.describe User, type: :model do
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

              describe 'author' do
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

                context 'when validations' do
          
        4. 
        
        
      
        
        
          
      4. 
            2
            

            

                  it { is_expected.to validate_presence_of(:email) }
          
        5. 
        
        
      
        
        
          
      5. 
            2
            

            

                  it { is_expected.to validate_presence_of(:password) }
<<<<<<< HEAD
=======
                  it { is_expected.to validate_presence_of(:category) }
>>>>>>> d0dc1f1 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:category) }
>>>>>>> 752f0c0 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:category) }
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
                  it { is_expected.to validate_presence_of(:category) }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                  it { is_expected.to validate_presence_of(:category) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
                  it { is_expected.to validate_presence_of(:category) }
>>>>>>> 08edf50 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:category) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to validate_presence_of(:category) }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                  it { is_expected.to validate_presence_of(:category) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
                  it { is_expected.to validate_presence_of(:category) }
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
                  it { is_expected.to validate_presence_of(:category) }
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
          
        6. 
        
        
      
        
        
          
      6. 
            
            

            

                end
          
        7. 
        
        
      
        
        
<<<<<<< HEAD
          
      7. 
            
            

            

            
          
        8. 
        
        
      
        
        
          
      8. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
                context 'with associations' do
=======
                context 'when associations' do
>>>>>>> d0dc1f1 (Featire specs)
=======
                context 'when associations' do
>>>>>>> 752f0c0 (Featire specs)
=======
                context 'when associations' do
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
                context 'when associations' do
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                context 'when associations' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
                context 'when associations' do
>>>>>>> 08edf50 (Featire specs)
=======
                context 'when associations' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                context 'when associations' do
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                context 'when associations' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
                context 'when associations' do
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
                context 'when associations' do
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
        9. 
        
        
      
        
        
          
      9. 
            2
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
                  it { is_expected.to have_one(:billing) }
=======
                  it { is_expected.to belong_to(:category) }
>>>>>>> d0dc1f1 (Featire specs)
=======
                  it { is_expected.to belong_to(:category) }
>>>>>>> 752f0c0 (Featire specs)
=======
                  it { is_expected.to belong_to(:category) }
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
                  it { is_expected.to belong_to(:category) }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                  it { is_expected.to belong_to(:category) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
                  it { is_expected.to belong_to(:category) }
>>>>>>> 08edf50 (Featire specs)
=======
                  it { is_expected.to belong_to(:category) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to belong_to(:category) }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                  it { is_expected.to belong_to(:category) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
                  it { is_expected.to belong_to(:category) }
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
                  it { is_expected.to belong_to(:category) }
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
        10. 
        
        
      
        
        
          
      10. 
            2
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
                  it { is_expected.to have_one(:shipping) }
=======
                  it { is_expected.to belong_to(:book) }
>>>>>>> d0dc1f1 (Featire specs)
=======
                  it { is_expected.to belong_to(:book) }
>>>>>>> 752f0c0 (Featire specs)
=======
                  it { is_expected.to belong_to(:book) }
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
                  it { is_expected.to belong_to(:book) }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                  it { is_expected.to belong_to(:book) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
                  it { is_expected.to belong_to(:book) }
>>>>>>> 08edf50 (Featire specs)
=======
                  it { is_expected.to belong_to(:book) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to belong_to(:book) }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                  it { is_expected.to belong_to(:book) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
                  it { is_expected.to belong_to(:book) }
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
                  it { is_expected.to belong_to(:book) }
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
        11. 
        
        
      
        
        
          
      11. 
            
            

            

                end
          
        12. 
        
        
      
        
        
          
      12. 
            
            

            

              end
          
        13. 
        
        
      
        
        
          
      13. 
            
            

            

            end
          
        14. 
        
        
      
    
      
  
      

      

      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
        
      
  
      
    
      spec/queryes/book_query_spec.rb
      
=======
        
      
  
      
    
      spec/models/category_spec.rb
      
>>>>>>> d0dc1f1 (Featire specs)
=======
        
      
  
      
    
      spec/models/category_spec.rb
      
>>>>>>> 752f0c0 (Featire specs)
=======
        
      
  
      
    
      spec/models/category_spec.rb
      
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
        
      
  
      
    
      spec/models/category_spec.rb
      
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
        
      
  
      
    
      spec/models/category_spec.rb
      
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
        
      
  
      
    
      spec/models/category_spec.rb
      
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
        
      
  
      
    
      spec/models/category_spec.rb
      
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
        
      
  
      
    
      spec/models/category_spec.rb
      
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
        
      
  
      
    
      spec/models/category_spec.rb
      
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
    
      
      
  100.0%


      lines covered
    
      

    

    
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      45 relevant lines.
      45 lines covered and
=======
      8 relevant lines.
      8 lines covered and
>>>>>>> d0dc1f1 (Featire specs)
=======
      8 relevant lines.
      8 lines covered and
>>>>>>> 752f0c0 (Featire specs)
=======
      8 relevant lines.
      8 lines covered and
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
      8 relevant lines.
      8 lines covered and
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
      8 relevant lines.
      8 lines covered and
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
      8 relevant lines.
      8 lines covered and
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
      8 relevant lines.
      8 lines covered and
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
      8 relevant lines.
      8 lines covered and
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
      8 relevant lines.
      8 lines covered and
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            require 'rails_helper'
          
        2. 
        
        
      
        
        
          
      2. 
            
            

            

            
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
            RSpec.describe BookQuery do
=======
            RSpec.describe Category, type: :model do
>>>>>>> d0dc1f1 (Featire specs)
=======
            RSpec.describe Category, type: :model do
>>>>>>> 752f0c0 (Featire specs)
=======
            RSpec.describe Category, type: :model do
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
            RSpec.describe Category, type: :model do
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
            RSpec.describe Category, type: :model do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
            RSpec.describe Category, type: :model do
>>>>>>> 08edf50 (Featire specs)
=======
            RSpec.describe Category, type: :model do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
            RSpec.describe Category, type: :model do
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
            RSpec.describe Category, type: :model do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
            RSpec.describe Category, type: :model do
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
            RSpec.describe Category, type: :model do
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
        4. 
        
        
      
        
        
          
      4. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
              shared_examples 'sort test' do
=======
              describe 'category' do
>>>>>>> d0dc1f1 (Featire specs)
=======
              describe 'category' do
>>>>>>> 752f0c0 (Featire specs)
=======
              describe 'category' do
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
              describe 'category' do
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
              describe 'category' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
              describe 'category' do
>>>>>>> 08edf50 (Featire specs)
=======
              describe 'category' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
              describe 'category' do
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
              describe 'category' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
              describe 'category' do
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
              describe 'category' do
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
        5. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      5. 
            5
=======
          
      6. 
            1
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      7. 
            1
>>>>>>> 752f0c0 (Featire specs)
=======
          
      8. 
            1
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      9. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      10. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      11. 
            1
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      12. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      13. 
            1
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      14. 
            1
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
                it 'sort' do
=======
                context 'when validations' do
>>>>>>> d0dc1f1 (Featire specs)
=======
                context 'when validations' do
>>>>>>> 752f0c0 (Featire specs)
=======
                context 'when validations' do
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
                context 'when validations' do
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                context 'when validations' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
                context 'when validations' do
>>>>>>> 08edf50 (Featire specs)
=======
                context 'when validations' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                context 'when validations' do
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                context 'when validations' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
                context 'when validations' do
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
                context 'when validations' do
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
        15. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      15. 
            5
=======
          
      16. 
            2
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      17. 
            2
>>>>>>> 752f0c0 (Featire specs)
=======
          
      18. 
            2
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      19. 
            2
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      20. 
            2
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      21. 
            2
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      22. 
            2
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      23. 
            2
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      24. 
            2
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
                  books
=======
                  it { is_expected.to validate_presence_of(:name) }
>>>>>>> d0dc1f1 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:name) }
>>>>>>> 752f0c0 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:name) }
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
                  it { is_expected.to validate_presence_of(:name) }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                  it { is_expected.to validate_presence_of(:name) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
                  it { is_expected.to validate_presence_of(:name) }
>>>>>>> 08edf50 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:name) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to validate_presence_of(:name) }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                  it { is_expected.to validate_presence_of(:name) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
                  it { is_expected.to validate_presence_of(:name) }
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
                  it { is_expected.to validate_presence_of(:name) }
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
        25. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      25. 
            5
            

            

                  expect(test).to eq(result)
          
        26. 
        
        
      
        
        
          
      26. 
=======
          
      27. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      28. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
      29. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
          
      30. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      31. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      32. 
>>>>>>> 08edf50 (Featire specs)
=======
          
      33. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      34. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      35. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      36. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      37. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
            
            

            

                end
          
        38. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      38. 
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      39. 
            
            

            

            
          
        40. 
        
        
      
        
        
          
      40. 
            1
            

            

                context 'when associations' do
          
        41. 
        
        
      
        
        
          
      41. 
            2
            

            

                  it { is_expected.to have_many(:books_categories).dependent(:destroy) }
          
        42. 
        
        
      
        
        
          
      42. 
            2
            

            

                  it { is_expected.to have_many(:books).through(:books_categories) }
          
        43. 
        
        
      
        
        
          
      43. 
            
            

            

                end
          
        44. 
        
        
      
        
        
          
      44. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
            
            

            

              end
          
        45. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      45. 
            
            

            

            end
          
        46. 
        
        
      
    
      
  
      

      

      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2fef4a0 (Add login registration pages)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e60833c (Add login registration pages)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> f416f45 (Add login registration pages)
=======
<<<<<<< HEAD
>>>>>>> 02a399d (Manifest_cache true)
=======
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> bd8bda4 (Manifest_cache true)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 730a8ca (Add login registration pages)
=======
>>>>>>> e1f4d17 (Add login registration pages)
=======
>>>>>>> 26b462d (Add login registration pages)
        
      
  
      
    
      spec/models/user_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      3 relevant lines.
      3 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            require 'rails_helper'
          
        2. 
        
        
      
        
        
          
      2. 
            
            

            

            
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

            RSpec.describe User, type: :model do
          
        4. 
        
        
      
        
        
          
      4. 
            1
            

            

              pending "add some examples to (or delete) #{__FILE__}"
          
        5. 
        
        
      
        
        
          
      5. 
            
            

            

            end
          
        6. 
        
        
      
    
      
  
      

      

      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1214e1f (Add login registration pages)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 2fef4a0 (Add login registration pages)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 730a8ca (Add login registration pages)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e60833c (Add login registration pages)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 998f08d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 64dceec (Manifest_cache true)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> f416f45 (Add login registration pages)
        
      
  
      
    
      spec/rails_helper.rb
      
    
      
      
  87.5%


      lines covered
    
      

    

    
      
      16 relevant lines.
      14 lines covered and
      2 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            require 'spec_helper'
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

            ENV['RAILS_ENV'] ||= 'test'
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

            require_relative '../config/environment'
          
        4. 
        
        
      
        
        
          
      4. 
            1
            

            

            abort('The Rails environment is running in production mode!') if Rails.env.production?
          
        5. 
        
        
      
        
        
          
      5. 
            1
            

            

            require 'rspec/rails'
          
        6. 
        
        
      
        
        
          
      6. 
            1
            

            

            require 'shoulda-matchers'
          
        7. 
        
        
      
        
        
=======
>>>>>>> 5b7749a (Fix)
          
      7. 
            
            

            

            
          
        8. 
        
        
      
        
        
          
      8. 
            1
            

            

                context 'with associations' do
          
        9. 
        
        
      
        
        
          
      9. 
            2
            

            

                  it { is_expected.to have_one(:billing) }
          
        10. 
        
        
      
        
        
          
      10. 
            2
            

            

                  it { is_expected.to have_one(:shipping) }
          
        11. 
        
        
      
        
        
          
      11. 
            
            

            

                end
          
        12. 
        
        
      
        
        
          
      12. 
            
            

            

              end
          
        13. 
        
        
      
        
        
          
      13. 
            
            

            

            end
          
        14. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/queryes/book_query_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      45 relevant lines.
      45 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            require 'rails_helper'
          
        2. 
        
        
      
        
        
          
      2. 
            
            

            

            
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

            RSpec.describe BookQuery do
          
        4. 
        
        
      
        
        
          
      4. 
            1
            

            

              shared_examples 'sort test' do
          
        5. 
        
        
      
        
        
          
      5. 
            5
            

            

                it 'sort' do
          
        6. 
        
        
      
        
        
          
      6. 
            5
            

            

                  books
          
        7. 
        
        
      
        
        
          
      7. 
            5
            

            

                  expect(test).to eq(result)
          
        8. 
        
        
      
        
        
          
      8. 
            
            

            

                end
          
        9. 
        
        
      
        
        
          
      9. 
            
            

            

              end
          
        10. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 4552227 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 5b7749a (Fix)
          
      10. 
            
            

            

            
          
        11. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
          
      11. 
            3
=======
          
      12. 
            
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      13. 
            
>>>>>>> 752f0c0 (Featire specs)
=======
          
      14. 
            
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      15. 
            
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      16. 
            
>>>>>>> 7a02bbe (Featire specs)
=======
          
      17. 
            
>>>>>>> 4552227 (Featire specs)
=======
          
      18. 
            3
>>>>>>> 5b7749a (Fix)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
              let(:titles) { %w[Adam Zimbabwe] }
=======
            begin
>>>>>>> d0dc1f1 (Featire specs)
=======
            begin
>>>>>>> 752f0c0 (Featire specs)
=======
            begin
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
            begin
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
            begin
>>>>>>> 08edf50 (Featire specs)
=======
            begin
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
            begin
>>>>>>> 4552227 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
=======
              let(:titles) { %w[Adam Zimbabwe] }
>>>>>>> 5b7749a (Fix)
          
        19. 
        
        
      
        
        
          
      19. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
              let(:books_dates) do
=======
              ActiveRecord::Migration.maintain_test_schema!
>>>>>>> d0dc1f1 (Featire specs)
=======
              ActiveRecord::Migration.maintain_test_schema!
>>>>>>> 752f0c0 (Featire specs)
=======
              ActiveRecord::Migration.maintain_test_schema!
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
              ActiveRecord::Migration.maintain_test_schema!
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
              ActiveRecord::Migration.maintain_test_schema!
>>>>>>> 08edf50 (Featire specs)
=======
              ActiveRecord::Migration.maintain_test_schema!
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
              ActiveRecord::Migration.maintain_test_schema!
>>>>>>> 4552227 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
=======
              let(:books_dates) do
>>>>>>> 5b7749a (Fix)
          
        20. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
          
      20. 
            1
=======
          
      21. 
            
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      22. 
            
>>>>>>> 752f0c0 (Featire specs)
=======
          
      23. 
            
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      24. 
            
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      25. 
            
>>>>>>> 7a02bbe (Featire specs)
=======
          
      26. 
            
>>>>>>> 4552227 (Featire specs)
=======
          
      27. 
            1
>>>>>>> 5b7749a (Fix)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
                ['Thu, 25 Aug 2022 15:25:38.761014000 UTC +00:00', 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00']
=======
            rescue ActiveRecord::PendingMigrationError => e
>>>>>>> d0dc1f1 (Featire specs)
=======
            rescue ActiveRecord::PendingMigrationError => e
>>>>>>> 752f0c0 (Featire specs)
=======
            rescue ActiveRecord::PendingMigrationError => e
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
            rescue ActiveRecord::PendingMigrationError => e
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
            rescue ActiveRecord::PendingMigrationError => e
>>>>>>> 08edf50 (Featire specs)
=======
            rescue ActiveRecord::PendingMigrationError => e
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
            rescue ActiveRecord::PendingMigrationError => e
>>>>>>> 4552227 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
=======
                ['Thu, 25 Aug 2022 15:25:38.761014000 UTC +00:00', 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00']
>>>>>>> 5b7749a (Fix)
          
        28. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
          
      28. 
=======
          
      29. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      30. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
      31. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
          
      32. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      33. 
>>>>>>> 08edf50 (Featire specs)
=======
          
      34. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
      35. 
>>>>>>> 4552227 (Featire specs)
=======
          
      36. 
>>>>>>> 5b7749a (Fix)
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
              end
=======
              puts e.to_s.strip
>>>>>>> d0dc1f1 (Featire specs)
=======
              puts e.to_s.strip
>>>>>>> 752f0c0 (Featire specs)
=======
              puts e.to_s.strip
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
              puts e.to_s.strip
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
              puts e.to_s.strip
>>>>>>> 08edf50 (Featire specs)
=======
              puts e.to_s.strip
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
              puts e.to_s.strip
>>>>>>> 4552227 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
=======
              end
>>>>>>> 5b7749a (Fix)
          
        37. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
          
      37. 
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 4552227 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
          
      38. 
            
            

            

              exit 1
          
        39. 
        
        
      
        
        
          
      39. 
            
            

            

            end
          
        40. 
        
        
      
        
        
          
      40. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 4552227 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
=======
          
      41. 
>>>>>>> 5b7749a (Fix)
            
            

            

            
          
        42. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 5b7749a (Fix)
          
      42. 
            1
            

            

              describe 'all books sort' do
          
        43. 
        
        
      
        
        
          
      43. 
            1
            

            

                context 'when sort by title A to Z' do
          
        44. 
        
        
      
        
        
<<<<<<< HEAD
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 4552227 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 5b7749a (Fix)
          
      44. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
                  let(:books) do
=======
            RSpec.configure do |config|
>>>>>>> d0dc1f1 (Featire specs)
=======
            RSpec.configure do |config|
>>>>>>> 752f0c0 (Featire specs)
=======
            RSpec.configure do |config|
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
            RSpec.configure do |config|
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
            RSpec.configure do |config|
>>>>>>> 08edf50 (Featire specs)
=======
            RSpec.configure do |config|
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
            RSpec.configure do |config|
>>>>>>> 4552227 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
=======
                  let(:books) do
>>>>>>> 5b7749a (Fix)
          
        45. 
        
        
      
        
        
          
      45. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
                    create(:book, title: titles.first)
=======
              config.fixture_path = "#{::Rails.root}/spec/fixtures"
>>>>>>> d0dc1f1 (Featire specs)
=======
              config.fixture_path = "#{::Rails.root}/spec/fixtures"
>>>>>>> 752f0c0 (Featire specs)
=======
              config.fixture_path = "#{::Rails.root}/spec/fixtures"
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
              config.fixture_path = "#{::Rails.root}/spec/fixtures"
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
              config.fixture_path = "#{::Rails.root}/spec/fixtures"
>>>>>>> 08edf50 (Featire specs)
=======
              config.fixture_path = "#{::Rails.root}/spec/fixtures"
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
              config.fixture_path = "#{::Rails.root}/spec/fixtures"
>>>>>>> 4552227 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
=======
                    create(:book, title: titles.first)
>>>>>>> 5b7749a (Fix)
          
        46. 
        
        
      
        
        
          
      46. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
                    create(:book, title: titles.second)
=======
              config.use_transactional_fixtures = true
>>>>>>> d0dc1f1 (Featire specs)
=======
              config.use_transactional_fixtures = true
>>>>>>> 752f0c0 (Featire specs)
=======
              config.use_transactional_fixtures = true
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
              config.use_transactional_fixtures = true
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
              config.use_transactional_fixtures = true
>>>>>>> 08edf50 (Featire specs)
=======
              config.use_transactional_fixtures = true
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
              config.use_transactional_fixtures = true
>>>>>>> 4552227 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
=======
                    create(:book, title: titles.second)
>>>>>>> 5b7749a (Fix)
          
        47. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 5b7749a (Fix)
          
      47. 
            
            

            

                  end
          
        48. 
        
        
      
        
        
          
      48. 
            
            

            

            
          
        49. 
        
        
      
        
        
          
      49. 
            2
            

            

                  let(:result) { titles.second }
          
        50. 
        
        
      
        
        
          
      50. 
            2
            

            

                  let(:test) { described_class.query({ sort: 'title DESC' }).first.title }
          
        51. 
        
        
      
        
        
          
      51. 
            
            

            

            
          
        52. 
        
        
      
        
        
          
      52. 
<<<<<<< HEAD
=======
          
      53. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      54. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
      55. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
          
      56. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      57. 
>>>>>>> 08edf50 (Featire specs)
=======
          
      58. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      59. 
>>>>>>> 4552227 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 5b7749a (Fix)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
                  include_examples 'sort test'
=======
              config.infer_spec_type_from_file_location!
>>>>>>> d0dc1f1 (Featire specs)
=======
              config.infer_spec_type_from_file_location!
>>>>>>> 752f0c0 (Featire specs)
=======
              config.infer_spec_type_from_file_location!
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
              config.infer_spec_type_from_file_location!
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
              config.infer_spec_type_from_file_location!
>>>>>>> 08edf50 (Featire specs)
=======
              config.infer_spec_type_from_file_location!
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
              config.infer_spec_type_from_file_location!
>>>>>>> 4552227 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
=======
                  include_examples 'sort test'
>>>>>>> 5b7749a (Fix)
          
        60. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 5b7749a (Fix)
          
      60. 
            
            

            

                end
          
        61. 
        
        
      
        
        
          
      61. 
            
            

            

            
          
        62. 
        
        
      
        
        
          
      62. 
<<<<<<< HEAD
=======
          
      63. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      64. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
      65. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
          
      66. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      67. 
>>>>>>> 08edf50 (Featire specs)
=======
          
      68. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      69. 
>>>>>>> 4552227 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 5b7749a (Fix)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
                context 'when sort title Z to A' do
=======
              config.filter_rails_from_backtrace!
>>>>>>> d0dc1f1 (Featire specs)
=======
              config.filter_rails_from_backtrace!
>>>>>>> 752f0c0 (Featire specs)
=======
              config.filter_rails_from_backtrace!
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
              config.filter_rails_from_backtrace!
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
              config.filter_rails_from_backtrace!
>>>>>>> 08edf50 (Featire specs)
=======
              config.filter_rails_from_backtrace!
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
              config.filter_rails_from_backtrace!
>>>>>>> 4552227 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
=======
                context 'when sort title Z to A' do
>>>>>>> 5b7749a (Fix)
          
        70. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 5b7749a (Fix)
          
      70. 
            1
            

            

                  let(:books) do
          
        71. 
        
        
      
        
        
          
      71. 
            1
            

            

                    create(:book, title: titles.first)
          
        72. 
        
        
      
        
        
          
      72. 
            1
            

            

                    create(:book, title: titles.second)
          
        73. 
        
        
      
        
        
          
      73. 
            
            

            

                  end
          
        74. 
        
        
      
        
        
          
      74. 
            
            

            

            
          
        75. 
        
        
      
        
        
          
      75. 
            2
            

            

                  let(:result) { titles.first }
          
        76. 
        
        
      
        
        
          
      76. 
            2
            

            

                  let(:test) { described_class.query({ sort: 'title' }).first.title }
          
        77. 
        
        
      
        
        
          
      77. 
            
            

            

            
          
        78. 
        
        
      
        
        
          
      78. 
            1
            

            

                  include_examples 'sort test'
          
        79. 
        
        
      
        
        
          
      79. 
            
            

            

                end
          
        80. 
        
        
      
        
        
          
      80. 
            
            

            

            
          
        81. 
        
        
      
        
        
          
      81. 
            1
            

            

                context 'when sort by price High to Low' do
          
        82. 
        
        
      
        
        
          
      82. 
            1
            

            

                  let(:books) do
          
        83. 
        
        
      
        
        
          
      83. 
            1
            

            

                    create(:book, price_cents: 75)
          
        84. 
        
        
      
        
        
          
      84. 
            1
            

            

                    create(:book, price_cents: 23)
          
        85. 
        
        
      
        
        
          
      85. 
            
            

            

                  end
          
        86. 
        
        
      
        
        
          
      86. 
            
            

            

            
          
        87. 
        
        
      
        
        
          
      87. 
            2
            

            

                  let(:result) { 75 }
          
        88. 
        
        
      
        
        
          
      88. 
            2
            

            

                  let(:test) { described_class.query({ sort: 'price_cents DESC' }).first.price_cents }
          
        89. 
        
        
      
        
        
          
      89. 
            
            

            

            
          
        90. 
        
        
      
        
        
          
      90. 
            1
            

            

                  include_examples 'sort test'
          
        91. 
        
        
      
        
        
          
      91. 
            
            

            

                end
          
        92. 
        
        
      
        
        
          
      92. 
            
            

            

            
          
        93. 
        
        
      
        
        
          
      93. 
            1
            

            

                context 'when sort price Low to High' do
          
        94. 
        
        
      
        
        
          
      94. 
            1
            

            

                  let(:books) do
          
        95. 
        
        
      
        
        
          
      95. 
            1
            

            

                    create(:book, price_cents: 75)
          
        96. 
        
        
      
        
        
          
      96. 
            1
            

            

                    create(:book, price_cents: 23)
          
        97. 
        
        
      
        
        
          
      97. 
            
            

            

                  end
          
        98. 
        
        
      
        
        
          
      98. 
            
            

            

            
          
        99. 
        
        
      
        
        
          
      99. 
            2
            

            

                  let(:result) { 23 }
          
        100. 
        
        
      
        
        
          
      100. 
            2
            

            

                  let(:test) { described_class.query({ sort: 'price_cents' }).first.price_cents }
          
        101. 
        
        
      
        
        
          
      101. 
            
            

            

            
          
        102. 
        
        
      
        
        
          
      102. 
            1
            

            

                  include_examples 'sort test'
          
        103. 
        
        
      
        
        
          
      103. 
            
            

            

                end
          
        104. 
        
        
      
        
        
          
      104. 
            
            

            

            
          
        105. 
        
        
      
        
        
          
      105. 
            1
            

            

                context 'when sort by Newest' do
          
        106. 
        
        
      
        
        
          
      106. 
            1
            

            

                  let(:books) do
          
        107. 
        
        
      
        
        
          
      107. 
            1
            

            

                    create(:book, created_at: books_dates.first)
          
        108. 
        
        
      
        
        
          
      108. 
            1
            

            

                    create(:book, created_at: books_dates.second)
          
        109. 
        
        
      
        
        
          
      109. 
            
            

            

                  end
          
        110. 
        
        
      
        
        
          
      110. 
            
            

            

            
          
        111. 
        
        
      
        
        
          
      111. 
            2
            

            

                  let(:result) { books_dates.first }
          
        112. 
        
        
      
        
        
          
      112. 
            2
            

            

                  let(:test) { described_class.query({ sort: 'created_at DESC' }).first.created_at }
          
        113. 
        
        
      
        
        
          
      113. 
            
            

            

            
          
        114. 
        
        
      
        
        
          
      114. 
            1
            

            

                  include_examples 'sort test'
          
        115. 
        
        
      
        
        
          
      115. 
            
            

            

                end
          
        116. 
        
        
      
        
        
          
      116. 
            
            

            

              end
          
        117. 
        
        
      
        
        
          
      117. 
<<<<<<< HEAD
=======
          
      118. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      119. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
      120. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
          
      121. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      122. 
>>>>>>> 08edf50 (Featire specs)
=======
          
      123. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      124. 
>>>>>>> 4552227 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 5b7749a (Fix)
            
            

            

            end
          
        125. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/support/configs/capybara.rb
      
    
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 64dceec (Manifest_cache true)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      
  36.84%
=======
<<<<<<< HEAD
      
  100.0%
=======
      
  36.84%
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
=======
      
  100.0%
>>>>>>> 752f0c0 (Featire specs)
=======
      
  36.84%
>>>>>>> bd8bda4 (Manifest_cache true)
=======
      
  100.0%
>>>>>>> 4e81ea2 (Featire specs)
=======
      
  36.84%
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
      
  100.0%
>>>>>>> 08edf50 (Featire specs)
=======
      
  36.84%
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
      
  100.0%
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
      
  100.0%
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
      
  36.84%
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
=======
      
  100.0%
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
      
  100.0%
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
      
  36.84%
>>>>>>> 998f08d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 64dceec (Manifest_cache true)
=======
=======
      
  100.0%
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
      
  100.0%
>>>>>>> 5b7749a (Fix)


      lines covered
    
      

    

    
      
      19 relevant lines.
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 64dceec (Manifest_cache true)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
      19 lines covered and
>>>>>>> a5d032d (Fix)
      0 lines missed.
=======
      7 lines covered and
      12 lines missed.
>>>>>>> 845dac1 (Manifest_cache true)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 64dceec (Manifest_cache true)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      7 lines covered and
      12 lines missed.
=======
<<<<<<< HEAD
      19 lines covered and
      0 lines missed.
=======
      7 lines covered and
      12 lines missed.
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
=======
      19 lines covered and
      0 lines missed.
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 59d75f9 (Featire specs)
=======
=======
      7 lines covered and
      12 lines missed.
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 96aecde (Manifest_cache true)
=======
=======
      19 lines covered and
      0 lines missed.
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
=======
=======
      7 lines covered and
      12 lines missed.
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2722d07 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 2722d07 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
      19 lines covered and
      0 lines missed.
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> e54deeb (Featire specs)
=======
=======
      7 lines covered and
      12 lines missed.
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
      19 lines covered and
      0 lines missed.
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
=======
      19 lines covered and
      0 lines missed.
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
=======
      7 lines covered and
      12 lines missed.
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
=======
=======
      19 lines covered and
      0 lines missed.
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
=======
      19 lines covered and
      0 lines missed.
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
=======
      7 lines covered and
      12 lines missed.
>>>>>>> 998f08d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 64dceec (Manifest_cache true)
=======
=======
=======
      19 lines covered and
      0 lines missed.
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
=======
      19 lines covered and
      0 lines missed.
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
    
      

    

  
      

  
          
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 64dceec (Manifest_cache true)
          
      1. 
            1
=======
          
      2. 
            
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      3. 
            
>>>>>>> 752f0c0 (Featire specs)
=======
          
      4. 
            
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      5. 
            
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      6. 
            
>>>>>>> 7a02bbe (Featire specs)
=======
          
      7. 
            
>>>>>>> 4552227 (Featire specs)
=======
          
      8. 
            1
>>>>>>> 5b7749a (Fix)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 5b7749a (Fix)
            RSpec.describe 'Author' do
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
            Capybara.configure do |config|
=======
            
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9620751 (Featire specs)
=======
=======
            
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 59d75f9 (Featire specs)
=======
=======
            
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
=======
=======
            
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54deeb (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
            
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> e54deeb (Featire specs)
=======
=======
            
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
=======
            
>>>>>>> 4552227 (Featire specs)
>>>>>>> 94841b5 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
          
        9. 
        
        
      
        
        
          
      9. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
          
      10. 
>>>>>>> 02a399d (Manifest_cache true)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      11. 
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> 64dceec (Manifest_cache true)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
              include_context 'with api request authentication helper methods'
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
              config.asset_host = 'http://localhost:3000'
=======
            Capybara.configure do |config|
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9620751 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 9620751 (Featire specs)
=======
=======
            Capybara.configure do |config|
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
=======
=======
>>>>>>> 7c4ea7f (Fix)
            Capybara.configure do |config|
>>>>>>> 94841b5 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
          
        12. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
          
      12. 
=======
          
      13. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
      14. 
>>>>>>> 36356d3 (Featire specs)
=======
          
      15. 
>>>>>>> 64dceec (Manifest_cache true)
            1
            

            

              config.asset_host = 'http://localhost:3000'
<<<<<<< HEAD
>>>>>>> 4552227 (Featire specs)
          
        16. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
          
      16. 
=======
          
      17. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
      18. 
>>>>>>> 4552227 (Featire specs)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
              include_context 'with api request global before and after hooks'
          
        19. 
        
        
      
        
        
=======
>>>>>>> 6da9530 (Featire specs)
          
      19. 
            
            

            

            
          
        20. 
        
        
      
        
        
          
      20. 
            2
            

            

              let(:first_name) { FFaker::Name.first_name }
          
        21. 
        
        
      
        
        
          
      21. 
            2
            

            

              let(:last_name) { FFaker::Name.last_name }
          
        22. 
        
        
      
        
        
          
      22. 
            
            

            

            
          
        23. 
        
        
      
        
        
          
      23. 
            2
            

            

              let(:new_name) { FFaker::Name.first_name }
          
        24. 
        
        
      
        
        
          
      24. 
            2
            

            

              let(:old_name) { author.first_name }
          
        25. 
        
        
      
        
        
          
      25. 
            
            

            

            
          
        26. 
        
        
      
        
        
          
      26. 
            4
            

            

              let(:author) { create(:author) }
          
        27. 
        
        
      
        
        
          
      27. 
            
            

            

            
          
        28. 
        
        
      
        
        
          
      28. 
            1
            

            

              before do
          
        29. 
        
        
      
        
        
          
      29. 
            4
            

            

                sign_in(create(:admin_user), :admin_user)
          
        30. 
        
        
      
        
        
          
      30. 
            
            

            

              end
          
        31. 
        
        
      
        
        
          
      31. 
            
            

            

            
          
        32. 
        
        
      
        
        
          
      32. 
            1
            

            

              it 'can create an author' do
          
        33. 
        
        
      
        
        
          
      33. 
            1
            

            

                visit 'admin/authors'
          
        34. 
        
        
      
        
        
          
      34. 
            
            

            

            
          
        35. 
        
        
      
        
        
          
      35. 
            1
            

            

                click_link('New Author')
          
        36. 
        
        
      
        
        
          
      36. 
            
            

            

            
          
        37. 
        
        
      
        
        
          
      37. 
            1
            

            

                fill_in 'author[first_name]', with: first_name
          
        38. 
        
        
      
        
        
          
      38. 
            1
            

            

                fill_in 'author[last_name]', with: last_name
          
        39. 
        
        
      
        
        
          
      39. 
            
            

            

            
          
        40. 
        
        
      
        
        
          
      40. 
            2
            

            

                expect { click_button('Create Author') }.to change(Author, :count).from(0).to(1)
          
        41. 
        
        
      
        
        
          
      41. 
            
            

            

              end
          
        42. 
        
        
      
        
        
          
      42. 
            
            

            

            
          
        43. 
        
        
      
        
        
          
      43. 
            1
            

            

              it 'can delete an author' do
          
        44. 
        
        
      
        
        
          
      44. 
            1
            

            

                author
          
        45. 
        
        
      
        
        
          
      45. 
            
            

            

            
          
        46. 
        
        
      
        
        
          
      46. 
            1
            

            

                visit 'admin/authors'
          
        47. 
        
        
      
        
        
          
      47. 
            
            

            

            
          
        48. 
        
        
      
        
        
          
      48. 
            2
            

            

                expect { click_link('Delete') }.to change(Author, :count).from(1).to(0)
          
        49. 
        
        
      
        
        
          
      49. 
            
            

            

              end
          
        50. 
        
        
      
        
        
          
      50. 
            
            

            

            
          
        51. 
        
        
      
        
        
          
      51. 
            1
            

            

              it 'can view an author' do
          
        52. 
        
        
      
        
        
          
      52. 
            1
            

            

                author
          
        53. 
        
        
      
        
        
          
      53. 
            
            

            

            
          
        54. 
        
        
      
        
        
          
      54. 
            1
            

            

                visit 'admin/authors'
          
        55. 
        
        
      
        
        
          
      55. 
            
            

            

            
          
        56. 
        
        
      
        
        
          
      56. 
            1
            

            

                click_link('View')
          
        57. 
        
        
      
        
        
          
      57. 
            
            

            

            
          
        58. 
        
        
      
        
        
          
      58. 
            1
            

            

                expect(page).to have_content(author.first_name)
          
        59. 
        
        
      
        
        
          
      59. 
            
            

            

              end
          
        60. 
        
        
      
        
        
          
      60. 
            
            

            

            
          
        61. 
        
        
      
        
        
          
      61. 
            1
            

            

              it 'can edit an author' do
          
        62. 
        
        
      
        
        
          
      62. 
            1
            

            

                author
          
        63. 
        
        
      
        
        
          
      63. 
            
            

            

            
          
        64. 
        
        
      
        
        
          
      64. 
            1
            

            

                visit 'admin/authors'
          
        65. 
        
        
      
        
        
          
      65. 
            
            

            

            
          
        66. 
        
        
      
        
        
          
      66. 
            1
            

            

                click_link('Edit')
          
        67. 
        
        
      
        
        
          
      67. 
            
            

            

            
          
        68. 
        
        
      
        
        
          
      68. 
            1
            

            

                fill_in 'author[first_name]', with: new_name
          
        69. 
        
        
      
        
        
          
      69. 
            
            

            

            
          
        70. 
        
        
      
        
        
          
      70. 
            4
            

            

                expect { click_button('Update Author') }.to change { author.reload.first_name }.from(old_name).to(new_name)
          
        71. 
        
        
      
        
        
          
      71. 
            
            

            

              end
          
        72. 
        
        
      
        
        
          
      72. 
            
            

            

            end
          
        73. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/feature/admin/book_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      43 relevant lines.
      43 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            RSpec.describe 'Book' do
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

              include_context 'with api request authentication helper methods'
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

              include_context 'with api request global before and after hooks'
          
        4. 
        
        
      
        
        
          
      4. 
            
            

            

            
          
        5. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
          
      5. 
            7
=======
          
      6. 
=======
          
      7. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      8. 
>>>>>>> 752f0c0 (Featire specs)
            5
>>>>>>> 93bdda9 (Featire specs)
=======
          
      9. 
            7
>>>>>>> 872e675 (Fix)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              let(:book) { create(:book) }
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> 752f0c0 (Featire specs)
              let(:category_one) { FactoryBot.create(:category) }
          
        10. 
        
        
      
        
        
          
      10. 
            3
            

            

              let(:category_two) { FactoryBot.create(:category) }
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
              let(:book) { create(:book) }
>>>>>>> 872e675 (Fix)
=======
              let(:category_two) { FactoryBot.create(:category) }
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
=======
              let(:category_two) { FactoryBot.create(:category) }
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
              let(:category_two) { FactoryBot.create(:category) }
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
              let(:category_two) { FactoryBot.create(:category) }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
              let(:category_two) { FactoryBot.create(:category) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
              let(:category_two) { FactoryBot.create(:category) }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
              let(:category_two) { FactoryBot.create(:category) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
              let(:category_two) { FactoryBot.create(:category) }
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
              let(:category_two) { FactoryBot.create(:category) }
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1d59aaa (Fix)
          
        11. 
        
        
      
        
        
          
      11. 
            1
            

            

              let(:params) do
          
        12. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
          
      12. 
            1
=======
          
      13. 
            4
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> af057e3 (Featire specs)
=======
          
      14. 
            4
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      15. 
            1
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
=======
          
      16. 
            4
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
          
      17. 
            4
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
          
      18. 
            4
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
          
      19. 
            4
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
          
      20. 
            4
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
          
      21. 
            4
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
          
      22. 
            4
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
          
      23. 
            1
>>>>>>> 1d59aaa (Fix)
            

            

                { title: FFaker::Book.title,
          
        24. 
        
        
      
        
        
          
      24. 
            
            

            

                  description: FFaker::Book.description,
          
        25. 
        
        
      
        
        
          
      25. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
                  price_cents: FFaker::Number.rand(1..100),
=======
                  price: FFaker::Number.rand(1..100),
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                  price: FFaker::Number.rand(1..100),
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
                  price_cents: FFaker::Number.rand(1..100),
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
                  price: FFaker::Number.rand(1..100),
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
                  price: FFaker::Number.rand(1..100),
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
                  price: FFaker::Number.rand(1..100),
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
                  price: FFaker::Number.rand(1..100),
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
                  price: FFaker::Number.rand(1..100),
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
                  price: FFaker::Number.rand(1..100),
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
                  price: FFaker::Number.rand(1..100),
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
                  price: FFaker::Number.rand(1..100),
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
                  price_cents: FFaker::Number.rand(1..100),
>>>>>>> 1d59aaa (Fix)
          
        26. 
        
        
      
        
        
          
      26. 
            
            

            

                  dimensions: FFaker::Book.cover,
          
        27. 
        
        
      
        
        
          
      27. 
            
            

            

                  year_of_publication: FFaker::Number.rand(1900..2022),
          
        28. 
        
        
      
        
        
          
      28. 
            
            

            

                  materials: 'Soft cover',
          
        29. 
        
        
      
        
        
          
      29. 
            
            

            

                  quantity: FFaker::Number.rand(2..5) }
          
        30. 
        
        
      
        
        
          
      30. 
            
            

            

              end
          
        31. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1d59aaa (Fix)
          
      31. 
            
            

            

            
          
        32. 
        
        
      
        
        
          
      32. 
            1
            

            

              before do
          
        33. 
        
        
      
        
        
          
      33. 
            6
            

            

                sign_in(create(:admin_user), :admin_user)
          
        34. 
        
        
      
        
        
          
      34. 
            
            

            

            
          
        35. 
        
        
      
        
        
          
      35. 
            6
            

            

                book
          
        36. 
        
        
      
        
        
          
      36. 
            
            

            

            
          
        37. 
        
        
      
        
        
          
      37. 
            6
            

            

                visit 'admin/books'
          
        38. 
        
        
      
        
        
          
      38. 
            
            

            

              end
          
        39. 
        
        
      
        
        
          
      39. 
            
            

            

            
          
        40. 
        
        
      
        
        
          
      40. 
            1
            

            

              it 'can create an book' do
          
        41. 
        
        
      
        
        
          
      41. 
            1
            

            

                click_link('New Book')
          
        42. 
        
        
      
        
        
          
      42. 
            
            

            

            
          
        43. 
        
        
      
        
        
          
      43. 
            1
            

            

                fill_in 'book[title]', with: params[:title]
          
        44. 
        
        
      
        
        
          
      44. 
            1
            

            

                fill_in 'book[description]', with: params[:description]
          
        45. 
        
        
      
        
        
          
      45. 
            1
            

            

                fill_in 'book[year_of_publication]', with: params[:year_of_publication]
          
        46. 
        
        
      
        
        
          
      46. 
            1
            

            

                fill_in 'book[price_cents]', with: params[:price_cents]
          
        47. 
        
        
      
        
        
          
      47. 
            1
            

            

                fill_in 'book[materials]', with: params[:materials]
          
        48. 
        
        
      
        
        
          
      48. 
            1
            

            

                fill_in 'book[dimensions]', with: params[:dimensions]
          
        49. 
        
        
      
        
        
          
      49. 
            1
            

            

                fill_in 'book[quantity]', with: params[:quantity]
          
        50. 
        
        
      
        
        
          
      50. 
            
            

            

            
          
        51. 
        
        
      
        
        
          
      51. 
            1
            

            

                click_button('Create Book')
          
        52. 
        
        
      
        
        
          
      52. 
            
            

            

            
          
        53. 
        
        
      
        
        
          
      53. 
            1
            

            

                expect(page).to have_content(params[:title])
          
        54. 
        
        
      
        
        
          
      54. 
            
            

            

              end
          
        55. 
        
        
      
        
        
          
      55. 
            
            

            

            
          
        56. 
        
        
      
        
        
          
      56. 
            1
            

            

              it 'can delete an book' do
          
        57. 
        
        
      
        
        
          
      57. 
            1
            

            

                click_link('Delete')
          
        58. 
        
        
      
        
        
          
      58. 
            
            

            

            
          
        59. 
        
        
      
        
        
          
      59. 
            1
            

            

                expect(page).not_to have_content(book.title)
          
        60. 
        
        
      
        
        
          
      60. 
            
            

            

              end
          
        61. 
        
        
      
        
        
          
      61. 
            
            

            

            
          
        62. 
        
        
      
        
        
          
      62. 
            1
            

            

              it 'can view an book' do
          
        63. 
        
        
      
        
        
          
      63. 
            1
            

            

                click_link('View')
          
        64. 
        
        
      
        
        
          
      64. 
            
            

            

            
          
        65. 
        
        
      
        
        
          
      65. 
            1
            

            

                expect(page).to have_content(book.title)
          
        66. 
        
        
      
        
        
          
      66. 
            
            

            

              end
          
        67. 
        
        
      
        
        
          
      67. 
            
            

            

            
          
        68. 
        
        
      
        
        
          
      68. 
            1
            

            

              it 'can edit an book' do
          
        69. 
        
        
      
        
        
          
      69. 
            1
            

            

                click_link('Edit')
          
        70. 
        
        
      
        
        
          
      70. 
            
            

            

            
          
        71. 
        
        
      
        
        
          
      71. 
            1
            

            

                fill_in 'book[title]', with: 'New title'
          
        72. 
        
        
      
        
        
          
      72. 
            
            

            

            
          
        73. 
        
        
      
        
        
          
      73. 
            1
            

            

                click_button('Update Book')
          
        74. 
        
        
      
        
        
          
      74. 
            
            

            

            
          
        75. 
        
        
      
        
        
          
      75. 
            1
            

            

                expect(page).to have_content('New title')
          
        76. 
        
        
      
        
        
          
      76. 
            
            

            

              end
          
        77. 
        
        
      
        
        
          
      77. 
            
            

            

            
          
        78. 
        
        
      
        
        
          
      78. 
            1
            

            

              context 'when image' do
          
        79. 
        
        
      
        
        
          
      79. 
            1
            

            

                before do
          
        80. 
        
        
      
        
        
          
      80. 
            2
            

            

                  click_link('Edit')
          
        81. 
        
        
      
        
        
          
      81. 
            
            

            

            
          
        82. 
        
        
      
        
        
          
      82. 
            2
            

            

                  page.attach_file('book[images][]', './app/assets/images/Web-Book-Cover.png')
          
        83. 
        
        
      
        
        
          
      83. 
            
            

            

            
          
        84. 
        
        
      
        
        
          
      84. 
            2
            

            

                  click_on 'Update Book'
          
        85. 
        
        
      
        
        
          
      85. 
            
            

            

                end
          
        86. 
        
        
      
        
        
          
      86. 
            
            

            

            
          
        87. 
        
        
      
        
        
          
      87. 
            1
            

            

                it 'can add images to book' do
          
        88. 
        
        
      
        
        
          
      88. 
            1
            

            

                  expect(book.reload.images.count).to eq(1)
          
        89. 
        
        
      
        
        
          
      89. 
            
            

            

                end
          
        90. 
        
        
      
        
        
          
      90. 
            
            

            

            
          
        91. 
        
        
      
        
        
          
      91. 
            1
            

            

                it 'can delete images from book' do
          
        92. 
        
        
      
        
        
          
      92. 
            1
            

            

                  click_link('Edit')
          
        93. 
        
        
      
        
        
          
      93. 
            
            

            

            
          
        94. 
        
        
      
        
        
          
      94. 
            1
            

            

                  click_link('Delete')
          
        95. 
        
        
      
        
        
          
      95. 
            
            

            

            
          
        96. 
        
        
      
        
        
          
      96. 
            1
            

            

                  expect(book.reload.images.count).to eq(0)
          
        97. 
        
        
      
        
        
          
      97. 
            
            

            

                end
          
        98. 
        
        
      
        
        
          
      98. 
            
            

            

              end
          
        99. 
        
        
      
        
        
          
      99. 
            
            

            

            end
          
        100. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/feature/admin/category_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      25 relevant lines.
      25 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            RSpec.describe 'Category' do
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

              include_context 'with api request authentication helper methods'
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

              include_context 'with api request global before and after hooks'
          
        4. 
        
        
      
        
        
          
      4. 
            
            

            

            
          
        5. 
        
        
      
        
        
          
      5. 
            2
            

            

              let(:category_name) { FFaker::Book.genre }
          
        6. 
        
        
      
        
        
          
      6. 
            
            

            

            
          
        7. 
        
        
      
        
        
          
      7. 
            5
            

            

              let(:category) { create(:category) }
          
        8. 
        
        
      
        
        
          
      8. 
            
            

            

            
          
        9. 
        
        
      
        
        
          
      9. 
            1
            

            

              before do
          
        10. 
        
        
      
        
        
          
      10. 
            4
            

            

                sign_in(create(:admin_user), :admin_user)
          
        11. 
        
        
      
        
        
          
      11. 
            
            

            

            
          
        12. 
        
        
      
        
        
          
      12. 
            4
            

            

                category
          
        13. 
        
        
      
        
        
          
      13. 
            
            

            

            
          
        14. 
        
        
      
        
        
          
      14. 
            4
            

            

                visit 'admin/categories'
          
        15. 
        
        
      
        
        
          
      15. 
            
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
          
      16. 
            7
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> af057e3 (Featire specs)
=======
          
      17. 
            7
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
=======
          
      18. 
            7
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
          
      19. 
            7
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
          
      20. 
            7
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
          
      21. 
            7
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
          
      22. 
            7
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
          
      23. 
            7
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
          
      24. 
            7
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1d59aaa (Fix)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
              end
=======
              let(:book) { FactoryBot.create(:book) }
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
              let(:book) { FactoryBot.create(:book) }
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
              end
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
              let(:book) { FactoryBot.create(:book) }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
              let(:book) { FactoryBot.create(:book) }
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
              let(:book) { FactoryBot.create(:book) }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
              let(:book) { FactoryBot.create(:book) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
              let(:book) { FactoryBot.create(:book) }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
              let(:book) { FactoryBot.create(:book) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
              let(:book) { FactoryBot.create(:book) }
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
              let(:book) { FactoryBot.create(:book) }
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
              end
>>>>>>> 1d59aaa (Fix)
          
        25. 
        
        
      
        
        
          
      25. 
            
            

            

            
          
        26. 
        
        
      
        
        
          
      26. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
              it 'can create an category' do
=======
              describe '#show book' do
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
              describe '#show book' do
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
              it 'can create an category' do
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
              describe '#show book' do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
              describe '#show book' do
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
              describe '#show book' do
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
              describe '#show book' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
              describe '#show book' do
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
              describe '#show book' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
              describe '#show book' do
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
              describe '#show book' do
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
              it 'can create an category' do
>>>>>>> 1d59aaa (Fix)
          
        27. 
        
        
      
        
        
          
      27. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
                click_link('New Category')
=======
                it 'show books info' do
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                it 'show books info' do
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
                click_link('New Category')
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
                it 'show books info' do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
                it 'show books info' do
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
                it 'show books info' do
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
                it 'show books info' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
                it 'show books info' do
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
                it 'show books info' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
                it 'show books info' do
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
                it 'show books info' do
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
                click_link('New Category')
>>>>>>> 1d59aaa (Fix)
          
        28. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
          
      28. 
=======
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      29. 
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
          
      30. 
            1
            

            

                  visit "books/#{book.id}"
          
        31. 
        
        
      
        
        
          
      31. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
          
      32. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
          
      33. 
>>>>>>> 1d59aaa (Fix)
            
            

            

            
          
        34. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
          
      34. 
=======
          
      35. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      36. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
          
      37. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      38. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      39. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
          
      40. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
          
      41. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
          
      42. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
          
      43. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
          
      44. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
          
      45. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
          
      46. 
>>>>>>> 1d59aaa (Fix)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
                fill_in 'category[name]', with: category_name
=======
                  expect(page).to have_content(book.title)
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                  expect(page).to have_content(book.title)
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
                fill_in 'category[name]', with: category_name
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
                  expect(page).to have_content(book.title)
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
                  expect(page).to have_content(book.title)
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
                  expect(page).to have_content(book.title)
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
                  expect(page).to have_content(book.title)
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
                  expect(page).to have_content(book.title)
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
                  expect(page).to have_content(book.title)
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
                  expect(page).to have_content(book.title)
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
                  expect(page).to have_content(book.title)
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
                fill_in 'category[name]', with: category_name
>>>>>>> 1d59aaa (Fix)
          
        47. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
          
      47. 
=======
          
      48. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      49. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
          
      50. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      51. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      52. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
          
      53. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
          
      54. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
          
      55. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
          
      56. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
          
      57. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
          
      58. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
          
      59. 
>>>>>>> 1d59aaa (Fix)
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1d59aaa (Fix)
            
          
        60. 
        
        
      
        
        
          
      60. 
            1
            

            

                click_button('Create Category')
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
                end
>>>>>>> d0dc1f1 (Featire specs)
=======
                end
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
=======
                end
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
=======
                end
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
                end
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
                end
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
                end
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
                end
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
                end
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
                end
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1d59aaa (Fix)
          
        61. 
        
        
      
        
        
          
      61. 
            
            

            

            
          
        62. 
        
        
      
        
        
          
      62. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
                expect(page).to have_content(category_name)
=======
                it 'clicked Beck to results' do
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                it 'clicked Beck to results' do
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
                expect(page).to have_content(category_name)
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
                it 'clicked Beck to results' do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
                it 'clicked Beck to results' do
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
                it 'clicked Beck to results' do
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
                it 'clicked Beck to results' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
                it 'clicked Beck to results' do
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
                it 'clicked Beck to results' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
                it 'clicked Beck to results' do
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
                it 'clicked Beck to results' do
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
                expect(page).to have_content(category_name)
>>>>>>> 1d59aaa (Fix)
          
        63. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
          
      63. 
            
=======
          
      64. 
            1
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> af057e3 (Featire specs)
=======
          
      65. 
            1
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      66. 
            
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
=======
          
      67. 
            1
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
          
      68. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
          
      69. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
          
      70. 
            1
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
          
      71. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
          
      72. 
            1
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
          
      73. 
            1
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
          
      74. 
            
>>>>>>> 1d59aaa (Fix)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
              end
=======
                  visit "books/#{book.id}"
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                  visit "books/#{book.id}"
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
              end
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
                  visit "books/#{book.id}"
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
                  visit "books/#{book.id}"
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
                  visit "books/#{book.id}"
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
                  visit "books/#{book.id}"
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
                  visit "books/#{book.id}"
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
                  visit "books/#{book.id}"
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
                  visit "books/#{book.id}"
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
                  visit "books/#{book.id}"
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
              end
>>>>>>> 1d59aaa (Fix)
          
        75. 
        
        
      
        
        
          
      75. 
            
            

            

            
          
        76. 
        
        
      
        
        
          
      76. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
              it 'can delete an category' do
=======
                  find('a', class: 'general-back-link').click
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                  find('a', class: 'general-back-link').click
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
              it 'can delete an category' do
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
                  find('a', class: 'general-back-link').click
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
                  find('a', class: 'general-back-link').click
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
                  find('a', class: 'general-back-link').click
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
                  find('a', class: 'general-back-link').click
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
                  find('a', class: 'general-back-link').click
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
                  find('a', class: 'general-back-link').click
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
                  find('a', class: 'general-back-link').click
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
                  find('a', class: 'general-back-link').click
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
              it 'can delete an category' do
>>>>>>> 1d59aaa (Fix)
          
        77. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1d59aaa (Fix)
          
      77. 
            1
            

            

                click_link('Delete')
          
        78. 
        
        
      
        
        
          
      78. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      79. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      80. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
=======
          
      81. 
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
=======
          
      82. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
          
      83. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
          
      84. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
          
      85. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
          
      86. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
          
      87. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
          
      88. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1d59aaa (Fix)
            
            

            

            
          
        89. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
          
      89. 
=======
          
      90. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      91. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
          
      92. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      93. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      94. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
          
      95. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
          
      96. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
          
      97. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
          
      98. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
          
      99. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
          
      100. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
          
      101. 
>>>>>>> 1d59aaa (Fix)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
                expect(page).not_to have_content(category.name)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                expect(page).not_to have_content(category.name)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
                  expect(page).to have_content('Catalog')
          
        102. 
        
        
      
        
        
          
      102. 
            
            

            

                end
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
                expect(page).not_to have_content(category.name)
>>>>>>> 872e675 (Fix)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
                expect(page).not_to have_content(category.name)
>>>>>>> 1d59aaa (Fix)
          
        103. 
        
        
      
        
        
          
      103. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
              end
=======
            
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
            
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
              end
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
            
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
            
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
            
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
            
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
            
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
            
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
            
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
            
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
              end
>>>>>>> 1d59aaa (Fix)
          
        104. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
          
      104. 
            
=======
          
      105. 
            1
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> af057e3 (Featire specs)
=======
          
      106. 
            1
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      107. 
            
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
=======
          
      108. 
            1
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
          
      109. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
          
      110. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
          
      111. 
            1
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
          
      112. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
          
      113. 
            1
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
          
      114. 
            1
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
          
      115. 
            
>>>>>>> 1d59aaa (Fix)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
            
=======
                context 'when test read more' do
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                context 'when test read more' do
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
            
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
                context 'when test read more' do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
                context 'when test read more' do
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
                context 'when test read more' do
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
                context 'when test read more' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
                context 'when test read more' do
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
                context 'when test read more' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
                context 'when test read more' do
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
                context 'when test read more' do
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
            
>>>>>>> 1d59aaa (Fix)
          
        116. 
        
        
      
        
        
          
      116. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
              it 'can view an category' do
=======
                  it 'show read more' do
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                  it 'show read more' do
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
              it 'can view an category' do
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
                  it 'show read more' do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
                  it 'show read more' do
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
                  it 'show read more' do
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
                  it 'show read more' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
                  it 'show read more' do
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
                  it 'show read more' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
                  it 'show read more' do
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
                  it 'show read more' do
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
              it 'can view an category' do
>>>>>>> 1d59aaa (Fix)
          
        117. 
        
        
      
        
        
          
      117. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
                click_link('View')
=======
                    visit "books/#{book.id}"
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                    visit "books/#{book.id}"
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
                click_link('View')
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
                    visit "books/#{book.id}"
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
                    visit "books/#{book.id}"
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
                    visit "books/#{book.id}"
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
                    visit "books/#{book.id}"
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
                    visit "books/#{book.id}"
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
                    visit "books/#{book.id}"
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
                    visit "books/#{book.id}"
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
                    visit "books/#{book.id}"
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
                click_link('View')
>>>>>>> 1d59aaa (Fix)
          
        118. 
        
        
      
        
        
          
      118. 
            
            

            

            
          
        119. 
        
        
      
        
        
          
      119. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
                expect(page).to have_content(category.name)
=======
                    expect(page).to have_content('Read More')
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                    expect(page).to have_content('Read More')
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
                expect(page).to have_content(category.name)
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
                    expect(page).to have_content('Read More')
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
                    expect(page).to have_content('Read More')
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
                    expect(page).to have_content('Read More')
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
                    expect(page).to have_content('Read More')
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
                    expect(page).to have_content('Read More')
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
                    expect(page).to have_content('Read More')
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
                    expect(page).to have_content('Read More')
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
                    expect(page).to have_content('Read More')
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
                expect(page).to have_content(category.name)
>>>>>>> 1d59aaa (Fix)
          
        120. 
        
        
      
        
        
          
      120. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
              end
=======
                  end
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                  end
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
              end
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
                  end
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
                  end
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
                  end
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
                  end
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
                  end
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
                  end
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
                  end
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
                  end
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
              end
>>>>>>> 1d59aaa (Fix)
          
        121. 
        
        
      
        
        
          
      121. 
            
            

            

            
          
        122. 
        
        
      
        
        
          
      122. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
              it 'can edit an category' do
=======
                  it 'clicked read more', js: true do
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                  it 'clicked read more', js: true do
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
              it 'can edit an category' do
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
                  it 'clicked read more', js: true do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
                  it 'clicked read more', js: true do
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
                  it 'clicked read more', js: true do
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
                  it 'clicked read more', js: true do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
                  it 'clicked read more', js: true do
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
                  it 'clicked read more', js: true do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
                  it 'clicked read more', js: true do
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
                  it 'clicked read more', js: true do
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
              it 'can edit an category' do
>>>>>>> 1d59aaa (Fix)
          
        123. 
        
        
      
        
        
          
      123. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
                click_link('Edit')
=======
                    visit "books/#{book.id}"
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                    visit "books/#{book.id}"
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
                click_link('Edit')
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
                    visit "books/#{book.id}"
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
                    visit "books/#{book.id}"
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
                    visit "books/#{book.id}"
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
                    visit "books/#{book.id}"
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
                    visit "books/#{book.id}"
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
                    visit "books/#{book.id}"
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
                    visit "books/#{book.id}"
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
                    visit "books/#{book.id}"
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
                click_link('Edit')
>>>>>>> 1d59aaa (Fix)
          
        124. 
        
        
      
        
        
          
      124. 
            
            

            

            
          
        125. 
        
        
      
        
        
          
      125. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
                fill_in 'category[name]', with: 'New Genre'
=======
                    click_link 'Read More'
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                    click_link 'Read More'
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
                fill_in 'category[name]', with: 'New Genre'
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
                    click_link 'Read More'
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
                    click_link 'Read More'
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
                    click_link 'Read More'
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
                    click_link 'Read More'
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
                    click_link 'Read More'
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
                    click_link 'Read More'
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
                    click_link 'Read More'
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
                    click_link 'Read More'
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
                fill_in 'category[name]', with: 'New Genre'
>>>>>>> 1d59aaa (Fix)
          
        126. 
        
        
      
        
        
          
      126. 
            
            

            

            
          
        127. 
        
        
      
        
        
          
      127. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
                click_button('Update Category')
=======
                    expect(page).not_to have_content('Read More')
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                    expect(page).not_to have_content('Read More')
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
                click_button('Update Category')
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
                    expect(page).not_to have_content('Read More')
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
                    expect(page).not_to have_content('Read More')
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
                    expect(page).not_to have_content('Read More')
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
                    expect(page).not_to have_content('Read More')
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
                    expect(page).not_to have_content('Read More')
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
                    expect(page).not_to have_content('Read More')
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
                    expect(page).not_to have_content('Read More')
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
                    expect(page).not_to have_content('Read More')
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
                click_button('Update Category')
>>>>>>> 1d59aaa (Fix)
          
        128. 
        
        
      
        
        
          
      128. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
            
=======
                  end
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                  end
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
            
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
                  end
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
                  end
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
                  end
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
                  end
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
                  end
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
                  end
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
                  end
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
                  end
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
            
>>>>>>> 1d59aaa (Fix)
          
        129. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
          
      129. 
            1
=======
          
      130. 
            
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> af057e3 (Featire specs)
=======
          
      131. 
            
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      132. 
            1
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
=======
          
      133. 
            
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
          
      134. 
            
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
          
      135. 
            
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
          
      136. 
            
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
          
      137. 
            
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
          
      138. 
            
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
          
      139. 
            
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
          
      140. 
            1
>>>>>>> 1d59aaa (Fix)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
                expect(page).to have_content('New Genre')
=======
                end
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                end
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
                expect(page).to have_content('New Genre')
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
                end
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
                end
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
                end
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
                end
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
                end
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
                end
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
                end
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
                end
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
                expect(page).to have_content('New Genre')
>>>>>>> 1d59aaa (Fix)
          
        141. 
        
        
      
        
        
          
      141. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1d59aaa (Fix)
              end
          
        142. 
        
        
      
        
        
          
      142. 
            
            

            

            end
          
        143. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/feature/billing_spec.rb
      
    
      
      
  73.08%


      lines covered
    
      

    

    
      
      26 relevant lines.
      19 lines covered and
      7 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            RSpec.describe 'Billing', type: :feature do
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

              include_context 'with api request authentication helper methods'
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

              include_context 'with api request global before and after hooks'
          
        4. 
        
        
      
        
        
          
      4. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1d59aaa (Fix)
            
          
        5. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1d59aaa (Fix)
          
      5. 
            2
            

            

              let(:user) { create(:user) }
          
        6. 
        
        
      
        
        
          
      6. 
            1
            

            

              let(:attributes_for) { attributes_for(:billing) }
          
        7. 
        
        
      
        
        
          
      7. 
            
            

            

            
          
        8. 
        
        
      
        
        
          
      8. 
            1
            

            

              describe '#fill_in', js: true do
          
        9. 
        
        
      
        
        
          
      9. 
            1
            

            

                it 'fill in billing' do
          
        10. 
        
        
      
        
        
          
      10. 
            1
            

            

                  sign_in(user)
          
        11. 
        
        
      
        
        
          
      11. 
            
            

            

            
          
        12. 
        
        
      
        
        
          
      12. 
            1
            

            

                  visit edit_user_path(user.id)
          
        13. 
        
        
      
        
        
          
      13. 
            
            

            

            
          
        14. 
        
        
      
        
        
          
      14. 
            1
            

            

                  within('div#billing.col-md-5.mb-40') do
          
        15. 
        
        
      
        
        
          
      15. 
            1
            

            

                    find_all('div', class: 'form-group')[0] do
          
        16. 
        
        
      
        
        
          
      16. 
            
            

            

                      fill_in :first_name, with: attributes_for[:first_name]
          
        17. 
        
        
      
        
        
          
      17. 
            
            

            

                    end
          
        18. 
        
        
      
        
        
          
      18. 
            1
            

            

                    find_all('div', class: 'form-group')[1] do
          
        19. 
        
        
      
        
        
          
      19. 
            
            

            

                      fill_in :last_name, with: attributes_for[:last_name]
          
        20. 
        
        
      
        
        
          
      20. 
            
            

            

                    end
          
        21. 
        
        
      
        
        
          
      21. 
            1
            

            

                    find_all('div', class: 'form-group')[2] do
          
        22. 
        
        
      
        
        
          
      22. 
            
            

            

                      fill_in :address, with: attributes_for[:address]
          
        23. 
        
        
      
        
        
          
      23. 
            
            

            

                    end
          
        24. 
        
        
      
        
        
          
      24. 
            1
            

            

                    find_all('div', class: 'form-group')[3] do
          
        25. 
        
        
      
        
        
          
      25. 
            
            

            

                      fill_in :city, with: attributes_for[:city]
          
        26. 
        
        
      
        
        
          
      26. 
            
            

            

                    end
          
        27. 
        
        
      
        
        
          
      27. 
            1
            

            

                    find_all('div', class: 'form-group')[4] do
          
        28. 
        
        
      
        
        
          
      28. 
            
            

            

                      fill_in :zip, with: attributes_for[:zip]
          
        29. 
        
        
      
        
        
          
      29. 
            
            

            

                    end
          
        30. 
        
        
      
        
        
          
      30. 
            1
            

            

                    find_all('div', class: 'form-group')[5] do
          
        31. 
        
        
      
        
        
          
      31. 
            
            

            

                      fill_in :country, with: attributes_for[:country]
          
        32. 
        
        
      
        
        
          
      32. 
            
            

            

                    end
          
        33. 
        
        
      
        
        
          
      33. 
            1
            

            

                    find_all('div', class: 'form-group')[6] do
          
        34. 
        
        
      
        
        
          
      34. 
            
            

            

                      fill_in :phone, with: attributes_for[:phone]
          
        35. 
        
        
      
        
        
          
      35. 
            
            

            

                    end
          
        36. 
        
        
      
        
        
          
      36. 
            1
            

            

                    click_on I18n.t('settings.save')
          
        37. 
        
        
      
        
        
          
      37. 
            
            

            

                  end
          
        38. 
        
        
      
        
        
          
      38. 
            
            

            

            
          
        39. 
        
        
      
        
        
          
      39. 
            1
            

            

                  expect(page).to have_content(I18n.t('settings.message.update'))
          
        40. 
        
        
      
        
        
          
      40. 
            
            

            

                end
          
        41. 
        
        
      
        
        
          
      41. 
            
            

            

              end
          
        42. 
        
        
      
        
        
          
      42. 
            
            

            

            end
          
        43. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/feature/book_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      104 relevant lines.
      104 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            RSpec.describe 'Book', type: :feature do
          
        2. 
        
        
      
        
        
          
      2. 
            5
            

            

              let(:category_one) { create(:category) }
          
        3. 
        
        
      
        
        
          
      3. 
            3
            

            

              let(:category_two) { create(:category) }
          
        4. 
        
        
      
        
        
          
      4. 
            1
            

            

              let(:params) do
          
        5. 
        
        
      
        
        
          
      5. 
            4
            

            

                { title: FFaker::Book.title,
          
        6. 
        
        
      
        
        
          
      6. 
            
            

            

                  description: FFaker::Book.description,
          
        7. 
        
        
      
        
        
          
      7. 
            
            

            

                  price_cents: FFaker::Number.rand(1..100),
          
        8. 
        
        
      
        
        
          
      8. 
            
            

            

                  dimensions: FFaker::Book.cover,
          
        9. 
        
        
      
        
        
          
      9. 
            
            

            

                  year_of_publication: FFaker::Number.rand(1900..2022),
          
        10. 
        
        
      
        
        
          
      10. 
            
            

            

                  materials: 'Soft cover',
          
        11. 
        
        
      
        
        
          
      11. 
            
            

            

                  quantity: FFaker::Number.rand(2..5) }
          
        12. 
        
        
      
        
        
          
      12. 
            
            

            

              end
          
        13. 
        
        
      
        
        
          
      13. 
            7
            

            

              let(:book) { create(:book).decorate }
          
        14. 
        
        
      
        
        
          
      14. 
            
            

            

            
          
        15. 
        
        
      
        
        
          
      15. 
            1
            

            

              describe '#show book' do
          
        16. 
        
        
      
        
        
          
      16. 
            1
            

            

                it 'show books info' do
          
        17. 
        
        
      
        
        
          
      17. 
            1
            

            

                  visit "books/#{book.id}"
          
        18. 
        
        
      
        
        
          
      18. 
            
            

            

            
          
        19. 
        
        
      
        
        
          
      19. 
            1
            

            

                  expect(page).to have_content(book.title)
          
        20. 
        
        
      
        
        
          
      20. 
            
            

            

                end
          
        21. 
        
        
      
        
        
          
      21. 
            
            

            

            
          
        22. 
        
        
      
        
        
          
      22. 
            1
            

            

                it 'clicked Beck to results' do
          
        23. 
        
        
      
        
        
          
      23. 
            1
            

            

                  visit "books/#{book.id}"
          
        24. 
        
        
      
        
        
          
      24. 
            
            

            

            
          
        25. 
        
        
      
        
        
          
      25. 
            1
            

            

                  find('a', class: 'general-back-link').click
          
        26. 
        
        
      
        
        
          
      26. 
            
            

            

            
          
        27. 
        
        
      
        
        
          
      27. 
            1
            

            

                  expect(page).to have_content(I18n.t('catalog_page.title'))
          
        28. 
        
        
      
        
        
          
      28. 
            
            

            

                end
          
        29. 
        
        
      
        
        
          
      29. 
            
            

            

            
          
        30. 
        
        
      
        
        
          
      30. 
            1
            

            

                context 'when test read more' do
          
        31. 
        
        
      
        
        
          
      31. 
            1
            

            

                  it 'show read more' do
          
        32. 
        
        
      
        
        
          
      32. 
            1
            

            

                    visit "books/#{book.id}"
          
        33. 
        
        
      
        
        
          
      33. 
            
            

            

            
          
        34. 
        
        
      
        
        
          
      34. 
            1
            

            

                    expect(page).to have_content(I18n.t('book_page.read_more'))
          
        35. 
        
        
      
        
        
          
      35. 
            
            

            

                  end
          
        36. 
        
        
      
        
        
          
      36. 
            
            

            

            
          
        37. 
        
        
      
        
        
          
      37. 
            1
            

            

                  it 'clicked read more', js: true do
          
        38. 
        
        
      
        
        
          
      38. 
            1
            

            

                    visit "books/#{book.id}"
          
        39. 
        
        
      
        
        
          
      39. 
            
            

            

            
          
        40. 
        
        
      
        
        
          
      40. 
            1
            

            

                    click_link I18n.t('book_page.read_more')
          
        41. 
        
        
      
        
        
          
      41. 
            
            

            

            
          
        42. 
        
        
      
        
        
          
      42. 
            1
            

            

                    expect(page).not_to have_content(I18n.t('book_page.read_more'))
          
        43. 
        
        
      
        
        
          
      43. 
            
            

            

                  end
          
        44. 
        
        
      
        
        
          
      44. 
            
            

            

                end
          
        45. 
        
        
      
        
        
          
      45. 
            
            

            

            
          
        46. 
        
        
      
        
        
          
      46. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      47. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      48. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
=======
          
      49. 
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
=======
          
      50. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
          
      51. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
          
      52. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
          
      53. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
          
      54. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
          
      55. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
          
      56. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1d59aaa (Fix)
            1
            

            

                context 'when quantity changes', js: true do
          
        57. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
          
      57. 
=======
          
      58. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      59. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
          
      60. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      61. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      62. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
          
      63. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
          
      64. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
          
      65. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
          
      66. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
          
      67. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
          
      68. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
          
      69. 
>>>>>>> 1d59aaa (Fix)
            1
            

            

                  before do
          
        70. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1d59aaa (Fix)
          
      70. 
            2
            

            

                    visit "books/#{book.id}"
          
        71. 
        
        
      
        
        
          
      71. 
            
            

            

            
          
        72. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1d59aaa (Fix)
          
      72. 
            2
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
                    find('a', class: 'inc').click
=======
                    visit "books/#{book.id}"
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                    visit "books/#{book.id}"
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
                    find('a', class: 'inc').click
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
                    visit "books/#{book.id}"
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
                    visit "books/#{book.id}"
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
                    visit "books/#{book.id}"
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
                    visit "books/#{book.id}"
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
                    visit "books/#{book.id}"
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
                    visit "books/#{book.id}"
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
                    visit "books/#{book.id}"
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
                    visit "books/#{book.id}"
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
                    find('a', class: 'inc').click
>>>>>>> 1d59aaa (Fix)
          
        73. 
        
        
      
        
        
          
      73. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1d59aaa (Fix)
                  end
          
        74. 
        
        
      
        
        
          
      74. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1d59aaa (Fix)
            
          
        75. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
          
      75. 
            1
=======
          
      76. 
            2
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> af057e3 (Featire specs)
=======
          
      77. 
            2
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      78. 
            1
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
=======
          
      79. 
            2
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
          
      80. 
            2
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4552227 (Featire specs)
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
          
      81. 
            2
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
          
      82. 
            1
>>>>>>> 1d59aaa (Fix)
            

            

                  it 'increase quantity' do
          
        83. 
        
        
      
        
        
<<<<<<< HEAD
          
      83. 
            
            

            

                  end
          
        84. 
        
        
      
        
        
          
      84. 
            
            

            

            
          
        85. 
        
        
      
        
        
          
      85. 
            1
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4552227 (Featire specs)
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
                  it 'increase quantity' do
>>>>>>> 563720e (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
                  it 'increase quantity' do
=======
                  it 'increase quantity' do
>>>>>>> 715fac2 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                  it 'increase quantity' do
=======
                  it 'increase quantity', js: true do
>>>>>>> 752f0c0 (Featire specs)
=======
                  it 'increase quantity', js: true do
>>>>>>> 4e81ea2 (Featire specs)
=======
                  it 'increase quantity', js: true do
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
=======
                  it 'increase quantity' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
                  it 'increase quantity' do
>>>>>>> c033601 (Rebased)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
                  it 'increase quantity' do
=======
                    find('a', class: 'inc').click
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
=======
=======
                    find('a', class: 'inc').click
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
                  it 'increase quantity' do
>>>>>>> 872e675 (Fix)
=======
                  it 'increase quantity' do
=======
                    find('a', class: 'inc').click
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
=======
=======
                    find('a', class: 'inc').click
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
=======
                    find('a', class: 'inc').click
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
                    find('a', class: 'inc').click
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
                  it 'increase quantity' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
                  it 'increase quantity', js: true do
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
                  it 'increase quantity' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
                  it 'increase quantity', js: true do
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
                  it 'increase quantity' do
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 715fac2 (Featire specs)
          
        86. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1d59aaa (Fix)
          
      86. 
            1
            

            

                    expect(page).to have_content("€#{Money.new(book.price_cents * 2)}")
          
        87. 
        
        
      
        
        
          
      87. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      88. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      89. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
=======
          
      90. 
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
=======
          
      91. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
          
      92. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 1d59aaa (Fix)
            
            

            

                  end
          
        93. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
          
      93. 
=======
          
      94. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      95. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
          
      96. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      97. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      98. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
          
      99. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> ee5242b (Featire specs)
=======
          
      100. 
>>>>>>> 1d59aaa (Fix)
            
            

            

            
          
        101. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
          
      101. 
=======
          
      102. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      103. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
          
      104. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      105. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      106. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
          
      107. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> ee5242b (Featire specs)
=======
          
      108. 
>>>>>>> 1d59aaa (Fix)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
                  it 'decrease quantity' do
>>>>>>> 563720e (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
                  it 'decrease quantity' do
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                  it 'decrease quantity' do
=======
                  it 'decrease quantity', js: true do
>>>>>>> 752f0c0 (Featire specs)
=======
                  it 'decrease quantity', js: true do
>>>>>>> 4e81ea2 (Featire specs)
=======
                  it 'decrease quantity', js: true do
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
=======
=======
=======
                  it 'decrease quantity' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
                  it 'decrease quantity' do
>>>>>>> c033601 (Rebased)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
                  it 'decrease quantity' do
=======
                  it 'increase quantity', js: true do
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
=======
=======
                  it 'increase quantity', js: true do
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
                  it 'decrease quantity' do
>>>>>>> 872e675 (Fix)
=======
                  it 'decrease quantity' do
=======
                  it 'increase quantity', js: true do
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
=======
=======
                  it 'increase quantity', js: true do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
=======
                  it 'increase quantity', js: true do
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
                  it 'increase quantity', js: true do
>>>>>>> 08edf50 (Featire specs)
>>>>>>> ee5242b (Featire specs)
=======
                  it 'decrease quantity' do
>>>>>>> 1d59aaa (Fix)
          
        109. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
          
      109. 
=======
          
      110. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      111. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
          
      112. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      113. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      114. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
          
      115. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> ee5242b (Featire specs)
=======
          
      116. 
>>>>>>> 1d59aaa (Fix)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
                    find('a', class: 'dec').click
=======
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                    find('a', class: 'dec').click
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
                    expect(page).to have_content("€#{book.price * 2}")
          
        117. 
        
        
      
        
        
          
      117. 
            
            

            

                  end
          
        118. 
        
        
      
        
        
          
      118. 
            
            

            

            
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
                    find('a', class: 'dec').click
>>>>>>> 872e675 (Fix)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
                    find('a', class: 'dec').click
>>>>>>> 1d59aaa (Fix)
          
        119. 
        
        
      
        
        
          
      119. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> ee5242b (Featire specs)
                  it 'decrease quantity', js: true do
=======
                  it 'decrease quantity' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it 'decrease quantity', js: true do
>>>>>>> 7a02bbe (Featire specs)
=======
                  it 'decrease quantity' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
                  it 'decrease quantity', js: true do
>>>>>>> 4552227 (Featire specs)
=======
                  it 'decrease quantity' do
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
=======
                  it 'decrease quantity' do
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                  it 'decrease quantity' do
=======
                  it 'decrease quantity', js: true do
>>>>>>> 752f0c0 (Featire specs)
=======
                  it 'decrease quantity', js: true do
>>>>>>> 4e81ea2 (Featire specs)
=======
                  it 'decrease quantity', js: true do
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 715fac2 (Featire specs)
          
        120. 
        
        
      
        
        
          
      120. 
            1
            

            

                    find('a', class: 'dec').click
          
        121. 
        
        
      
        
        
          
      121. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 872e675 (Fix)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1d59aaa (Fix)
                    expect(page).to have_content("€#{book.price}")
          
        122. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1d59aaa (Fix)
          
      122. 
            
            

            

                  end
          
        123. 
        
        
      
        
        
          
      123. 
            
            

            

                end
          
        124. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1d59aaa (Fix)
          
      124. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
              end
=======
                  end
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                  end
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
              end
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
                  end
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
                  end
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
                  end
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
                  end
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
                  end
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
                  end
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
                  end
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
                  end
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
              end
>>>>>>> 1d59aaa (Fix)
          
        125. 
        
        
      
        
        
          
      125. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
                end
          
        126. 
        
        
      
        
        
          
      126. 
            
            

            

              end
          
        127. 
        
        
      
        
        
          
      127. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 872e675 (Fix)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1d59aaa (Fix)
            
          
        128. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1d59aaa (Fix)
          
      128. 
            1
            

            

              describe '#catalog' do
          
        129. 
        
        
      
        
        
          
      129. 
            1
            

            

                describe 'filter by category' do
          
        130. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1d59aaa (Fix)
          
      130. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
              describe '#catalog' do
          
        131. 
        
        
      
        
        
          
      131. 
            1
            

            

                describe 'filter by category' do
          
        132. 
        
        
      
        
        
          
      132. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 872e675 (Fix)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1d59aaa (Fix)
                  before do
          
        133. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
          
      133. 
=======
          
      134. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      135. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
          
      136. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      137. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      138. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
          
      139. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
          
      140. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
          
      141. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
          
      142. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
          
      143. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
          
      144. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
          
      145. 
>>>>>>> 1d59aaa (Fix)
            2
            

            

                    category_one.books.create(params)
          
        146. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
          
      146. 
=======
          
      147. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      148. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
          
      149. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      150. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      151. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
          
      152. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
          
      153. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
          
      154. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
          
      155. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
          
      156. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
          
      157. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
          
      158. 
>>>>>>> 1d59aaa (Fix)
            2
            

            

                    visit books_path
          
        159. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
          
      159. 
=======
          
      160. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      161. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
          
      162. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      163. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      164. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
          
      165. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
          
      166. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
          
      167. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
          
      168. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
          
      169. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
          
      170. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
          
      171. 
>>>>>>> 1d59aaa (Fix)
            
            

            

                  end
          
        172. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
          
      172. 
=======
          
      173. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      174. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
          
      175. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      176. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      177. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
          
      178. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
          
      179. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
          
      180. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
          
      181. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
          
      182. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
          
      183. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
          
      184. 
>>>>>>> 1d59aaa (Fix)
            
            

            

            
          
        185. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
          
      185. 
=======
          
      186. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      187. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
          
      188. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      189. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      190. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
          
      191. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
          
      192. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
          
      193. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
          
      194. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
          
      195. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
          
      196. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
          
      197. 
>>>>>>> 1d59aaa (Fix)
            1
            

            

                  after do
          
        198. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
          
      198. 
=======
          
      199. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      200. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
          
      201. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      202. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      203. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
          
      204. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
          
      205. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
          
      206. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
          
      207. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
          
      208. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
          
      209. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
          
      210. 
>>>>>>> 1d59aaa (Fix)
            2
            

            

                    category_one.destroy
          
        211. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
          
      211. 
=======
          
      212. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      213. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
          
      214. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      215. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      216. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
          
      217. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
          
      218. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
          
      219. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
          
      220. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
          
      221. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
          
      222. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
          
      223. 
>>>>>>> 1d59aaa (Fix)
            
            

            

                  end
          
        224. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
          
      224. 
=======
          
      225. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      226. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
          
      227. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      228. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      229. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
          
      230. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
          
      231. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
          
      232. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
          
      233. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
          
      234. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
          
      235. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
          
      236. 
>>>>>>> 1d59aaa (Fix)
            
            

            

            
          
        237. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
          
      237. 
=======
          
      238. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      239. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
          
      240. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      241. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      242. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
          
      243. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
          
      244. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
          
      245. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
          
      246. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
          
      247. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
          
      248. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
          
      249. 
>>>>>>> 1d59aaa (Fix)
            1
            

            

                  it 'show book count for category' do
          
        250. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
          
      250. 
=======
          
      251. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      252. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
          
      253. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      254. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      255. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
          
      256. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
          
      257. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
          
      258. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
          
      259. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
          
      260. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
          
      261. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
          
      262. 
>>>>>>> 1d59aaa (Fix)
            1
            

            

                    expect(page).to have_content(category_one.books.size)
          
        263. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
          
      263. 
=======
          
      264. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      265. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
          
      266. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      267. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      268. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
          
      269. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
          
      270. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
          
      271. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
          
      272. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
          
      273. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
          
      274. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
          
      275. 
>>>>>>> 1d59aaa (Fix)
            
            

            

                  end
          
        276. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
          
      276. 
=======
          
      277. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      278. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
          
      279. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      280. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      281. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
          
      282. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
          
      283. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
          
      284. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
          
      285. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
          
      286. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
          
      287. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
          
      288. 
>>>>>>> 1d59aaa (Fix)
            
            

            

            
          
        289. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1d59aaa (Fix)
          
      289. 
            1
            

            

                  it 'filter book by category' do
          
        290. 
        
        
      
        
        
          
      290. 
            1
            

            

                    within 'ul', class: 'list-inline pt-10 mb-25 mr-240', id: 'filter' do
          
        291. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1d59aaa (Fix)
          
      291. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
                  it 'filter book by category' do
          
        292. 
        
        
      
        
        
          
      292. 
            1
            

            

                    within 'ul', class: 'list-inline pt-10 mb-25 mr-240', id: 'filter' do
          
        293. 
        
        
      
        
        
          
      293. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 872e675 (Fix)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1d59aaa (Fix)
                      click_on category_one.name
          
        294. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
          
      294. 
=======
          
      295. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      296. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
          
      297. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      298. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      299. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
          
      300. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
          
      301. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
          
      302. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
          
      303. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
          
      304. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
          
      305. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
          
      306. 
>>>>>>> 1d59aaa (Fix)
            
            

            

                    end
          
        307. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
          
      307. 
=======
          
      308. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      309. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
          
      310. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      311. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      312. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
          
      313. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
          
      314. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
          
      315. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
          
      316. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
          
      317. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
          
      318. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
          
      319. 
>>>>>>> 1d59aaa (Fix)
            
            

            

            
          
        320. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
          
      320. 
=======
          
      321. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      322. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
          
      323. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      324. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      325. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
          
      326. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
          
      327. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
          
      328. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
          
      329. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
          
      330. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
          
      331. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
          
      332. 
>>>>>>> 1d59aaa (Fix)
            1
            

            

                    expect(page).to have_content(category_one.books.first.title)
          
        333. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
          
      333. 
=======
          
      334. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      335. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
          
      336. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      337. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      338. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
          
      339. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
          
      340. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
          
      341. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
          
      342. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
          
      343. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
          
      344. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
          
      345. 
>>>>>>> 1d59aaa (Fix)
            
            

            

                  end
          
        346. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
          
      346. 
=======
          
      347. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      348. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
          
      349. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      350. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      351. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
          
      352. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
          
      353. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
          
      354. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
          
      355. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
          
      356. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
          
      357. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
          
      358. 
>>>>>>> 1d59aaa (Fix)
            
            

            

                end
          
        359. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
          
      359. 
=======
          
      360. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      361. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
          
      362. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      363. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      364. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
          
      365. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
          
      366. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
          
      367. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
          
      368. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
          
      369. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
          
      370. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
          
      371. 
>>>>>>> 1d59aaa (Fix)
            
            

            

            
          
        372. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
          
      372. 
=======
          
      373. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      374. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
          
      375. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      376. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      377. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
          
      378. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
          
      379. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
          
      380. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
          
      381. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
          
      382. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
          
      383. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
          
      384. 
>>>>>>> 1d59aaa (Fix)
            1
            

            

                describe 'filter by all books' do
          
        385. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
          
      385. 
=======
          
      386. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      387. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
          
      388. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      389. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      390. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
          
      391. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
          
      392. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
          
      393. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
          
      394. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
          
      395. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
          
      396. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
          
      397. 
>>>>>>> 1d59aaa (Fix)
            1
            

            

                  before do
          
        398. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
          
      398. 
=======
          
      399. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      400. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
          
      401. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      402. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      403. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
          
      404. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
          
      405. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
          
      406. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
          
      407. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
          
      408. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
          
      409. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
          
      410. 
>>>>>>> 1d59aaa (Fix)
            2
            

            

                    category_one.books.create(params)
          
        411. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1d59aaa (Fix)
          
      411. 
            2
            

            

                    category_two.books.create(params)
          
        412. 
        
        
      
        
        
          
      412. 
            
            

            

            
          
        413. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1d59aaa (Fix)
          
      413. 
            2
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
                    visit books_path
=======
                    category_two.books.create(params)
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                    category_two.books.create(params)
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
                    visit books_path
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
                    category_two.books.create(params)
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
                    category_two.books.create(params)
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
                    category_two.books.create(params)
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
                    category_two.books.create(params)
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
                    category_two.books.create(params)
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
                    category_two.books.create(params)
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
                    category_two.books.create(params)
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
                    category_two.books.create(params)
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
                    visit books_path
>>>>>>> 1d59aaa (Fix)
          
        414. 
        
        
      
        
        
          
      414. 
            
            

            

            
          
        415. 
        
        
      
        
        
          
      415. 
            2
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
                    click_on I18n.t('catalog_page.all')
=======
                    visit books_path
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                    visit books_path
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
                    click_on I18n.t('catalog_page.all')
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
                    visit books_path
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
                    visit books_path
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
                    visit books_path
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
                    visit books_path
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
                    visit books_path
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
                    visit books_path
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
                    visit books_path
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
                    visit books_path
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
                    click_on I18n.t('catalog_page.all')
>>>>>>> 1d59aaa (Fix)
          
        416. 
        
        
      
        
        
          
      416. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
            
          
        417. 
        
        
      
        
        
          
      417. 
            2
            

            

                    click_on 'All'
          
        418. 
        
        
      
        
        
          
      418. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 872e675 (Fix)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1d59aaa (Fix)
                  end
          
        419. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
          
      419. 
=======
          
      420. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      421. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
          
      422. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      423. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      424. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
          
      425. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
          
      426. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
          
      427. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
          
      428. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
          
      429. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
          
      430. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
          
      431. 
>>>>>>> 1d59aaa (Fix)
            
            

            

            
          
        432. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
          
      432. 
=======
          
      433. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      434. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
          
      435. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      436. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      437. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
          
      438. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
          
      439. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
          
      440. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
          
      441. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
          
      442. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
          
      443. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
          
      444. 
>>>>>>> 1d59aaa (Fix)
            1
            

            

                  after do
          
        445. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
          
      445. 
=======
          
      446. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      447. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
          
      448. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      449. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      450. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
          
      451. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
          
      452. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
          
      453. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
          
      454. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
          
      455. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
          
      456. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
          
      457. 
>>>>>>> 1d59aaa (Fix)
            2
            

            

                    category_one.destroy
          
        458. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
          
      458. 
=======
          
      459. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      460. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
          
      461. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      462. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      463. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
          
      464. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
          
      465. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
          
      466. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
          
      467. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
          
      468. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
          
      469. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
          
      470. 
>>>>>>> 1d59aaa (Fix)
            2
            

            

                    category_two.destroy
          
        471. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
          
      471. 
=======
          
      472. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      473. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
          
      474. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      475. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      476. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
          
      477. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
          
      478. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
          
      479. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
          
      480. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
          
      481. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
          
      482. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
          
      483. 
>>>>>>> 1d59aaa (Fix)
            
            

            

                  end
          
        484. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
          
      484. 
=======
          
      485. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      486. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
          
      487. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      488. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      489. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
          
      490. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
          
      491. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
          
      492. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
          
      493. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
          
      494. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
          
      495. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
          
      496. 
>>>>>>> 1d59aaa (Fix)
            
            

            

            
          
        497. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
          
      497. 
=======
          
      498. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      499. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
          
      500. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      501. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      502. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
          
      503. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
          
      504. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
          
      505. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
          
      506. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
          
      507. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
          
      508. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
          
      509. 
>>>>>>> 1d59aaa (Fix)
            1
            

            

                  it 'shown books for first category' do
          
        510. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
          
      510. 
=======
          
      511. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      512. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
          
      513. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      514. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      515. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
          
      516. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
          
      517. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
          
      518. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
          
      519. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
          
      520. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
          
      521. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
          
      522. 
>>>>>>> 1d59aaa (Fix)
            1
            

            

                    expect(page).to have_content(category_one.books.first.title)
          
        523. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
          
      523. 
=======
          
      524. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      525. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
          
      526. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      527. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      528. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
          
      529. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
          
      530. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
          
      531. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
          
      532. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
          
      533. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
          
      534. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
          
      535. 
>>>>>>> 1d59aaa (Fix)
            
            

            

                  end
          
        536. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
          
      536. 
=======
          
      537. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      538. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
          
      539. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      540. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      541. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
          
      542. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
          
      543. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
          
      544. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
          
      545. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
          
      546. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
          
      547. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
          
      548. 
>>>>>>> 1d59aaa (Fix)
            
            

            

            
          
        549. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
          
      549. 
=======
          
      550. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      551. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
          
      552. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      553. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      554. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
          
      555. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
          
      556. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
          
      557. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
          
      558. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
          
      559. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
          
      560. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
          
      561. 
>>>>>>> 1d59aaa (Fix)
            1
            

            

                  it 'shown books for second category' do
          
        562. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
          
      562. 
=======
          
      563. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      564. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
          
      565. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      566. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      567. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
          
      568. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
          
      569. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
          
      570. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
          
      571. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
          
      572. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
          
      573. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
          
      574. 
>>>>>>> 1d59aaa (Fix)
            1
            

            

                    expect(page).to have_content(category_two.books.first.title)
          
        575. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1d59aaa (Fix)
          
      575. 
            
            

            

                  end
          
        576. 
        
        
      
        
        
          
      576. 
            
            

            

                end
          
        577. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1d59aaa (Fix)
          
      577. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
              end
=======
                  end
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                  end
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
              end
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
                  end
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
                  end
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
                  end
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
                  end
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
                  end
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
                  end
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
                  end
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
                  end
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
              end
>>>>>>> 1d59aaa (Fix)
          
        578. 
        
        
      
        
        
          
      578. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
                end
          
        579. 
        
        
      
        
        
          
      579. 
            
            

            

              end
          
        580. 
        
        
      
        
        
          
      580. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 872e675 (Fix)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1d59aaa (Fix)
            
          
        581. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
          
      581. 
=======
          
      582. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      583. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
          
      584. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      585. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      586. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
          
      587. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
          
      588. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
          
      589. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
          
      590. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
          
      591. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
          
      592. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
          
      593. 
>>>>>>> 1d59aaa (Fix)
            1
            

            

              describe 'load_more' do
          
        594. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
          
      594. 
=======
          
      595. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      596. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
          
      597. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      598. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      599. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
          
      600. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
          
      601. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
          
      602. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
          
      603. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
          
      604. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
          
      605. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
          
      606. 
>>>>>>> 1d59aaa (Fix)
            1
            

            

                before do
          
        607. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
          
      607. 
=======
          
      608. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      609. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
          
      610. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      611. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      612. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
          
      613. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
          
      614. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
          
      615. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
          
      616. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
          
      617. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
          
      618. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
          
      619. 
>>>>>>> 1d59aaa (Fix)
            3
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
                  24.times do
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 715fac2 (Featire specs)
                  (BooksController::PAGINATION_PER_PAGE * 2).times do
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                  (BooksController::PAGINATION_PER_PAGE * 2).times do
=======
                  (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do
>>>>>>> 752f0c0 (Featire specs)
=======
                  (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do
>>>>>>> 4e81ea2 (Featire specs)
=======
                  (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> df37394 (Featire specs)
=======
=======
=======
                  (BooksController::PAGINATION_PER_PAGE * 2).times do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
                  24.times do
>>>>>>> c033601 (Rebased)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
                  24.times do
=======
                  (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
=======
=======
                  (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
                  24.times do
>>>>>>> 872e675 (Fix)
=======
                  24.times do
=======
                  (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
=======
=======
                  (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
=======
                  (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
=======
                  (BooksController::PAGINATION_PER_PAGE * 2).times do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
                  (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
                  (BooksController::PAGINATION_PER_PAGE * 2).times do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
                  (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
                  (BooksController::PAGINATION_PER_PAGE * 2).times do
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
                  24.times do
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 715fac2 (Featire specs)
          
        620. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
          
      620. 
=======
          
      621. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      622. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
          
      623. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      624. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      625. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
          
      626. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
          
      627. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
          
      628. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
          
      629. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
          
      630. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
          
      631. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
          
      632. 
>>>>>>> 1d59aaa (Fix)
            72
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1d59aaa (Fix)
                    books << create(:book)
          
        633. 
        
        
      
        
        
          
      633. 
            
            

            

                  end
          
        634. 
        
        
      
        
        
          
      634. 
            
            

            

                end
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
                    books << FactoryBot.create(:book)
>>>>>>> d0dc1f1 (Featire specs)
=======
                    books << FactoryBot.create(:book)
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
=======
                    books << FactoryBot.create(:book)
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
=======
                    books << FactoryBot.create(:book)
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
                    books << FactoryBot.create(:book)
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
                    books << FactoryBot.create(:book)
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
                    books << FactoryBot.create(:book)
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
                    books << FactoryBot.create(:book)
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
                    books << FactoryBot.create(:book)
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
                    books << FactoryBot.create(:book)
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1d59aaa (Fix)
          
        635. 
        
        
      
        
        
          
      635. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
            
=======
                  end
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                  end
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
            
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
                  end
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
                  end
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
                  end
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
                  end
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
                  end
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
                  end
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
                  end
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
                  end
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
            
>>>>>>> 1d59aaa (Fix)
          
        636. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
          
      636. 
            4
=======
          
      637. 
            
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> af057e3 (Featire specs)
=======
          
      638. 
            
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      639. 
            4
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
=======
          
      640. 
            
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
          
      641. 
            
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
          
      642. 
            
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
          
      643. 
            
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
          
      644. 
            
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
          
      645. 
            
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
          
      646. 
            
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
          
      647. 
            4
>>>>>>> 1d59aaa (Fix)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
                let(:books) { [] }
=======
                end
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                end
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
                let(:books) { [] }
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
                end
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
                end
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
                end
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
                end
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
                end
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
                end
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
                end
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
                end
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
                let(:books) { [] }
>>>>>>> 1d59aaa (Fix)
          
        648. 
        
        
      
        
        
          
      648. 
            
            

            

            
          
        649. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
          
      649. 
            1
=======
          
      650. 
            4
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> af057e3 (Featire specs)
=======
          
      651. 
            4
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      652. 
            1
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
=======
          
      653. 
            4
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
          
      654. 
            4
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
          
      655. 
            4
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
          
      656. 
            4
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
          
      657. 
            4
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
          
      658. 
            4
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
          
      659. 
            4
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
          
      660. 
            1
>>>>>>> 1d59aaa (Fix)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
                it 'show books without view more button' do
=======
                let(:books) { [] }
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                let(:books) { [] }
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
                it 'show books without view more button' do
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
                let(:books) { [] }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
                let(:books) { [] }
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
                let(:books) { [] }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
                let(:books) { [] }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
                let(:books) { [] }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
                let(:books) { [] }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
                let(:books) { [] }
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
                let(:books) { [] }
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
                it 'show books without view more button' do
>>>>>>> 1d59aaa (Fix)
          
        661. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1d59aaa (Fix)
          
      661. 
            1
            

            

                  visit books_path
          
        662. 
        
        
      
        
        
          
      662. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      663. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      664. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
=======
          
      665. 
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
=======
          
      666. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
          
      667. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
          
      668. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
          
      669. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
          
      670. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
          
      671. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
          
      672. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1d59aaa (Fix)
            
            

            

            
          
        673. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
          
      673. 
            1
            

            

                it 'show books without view more button' do
          
        674. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 872e675 (Fix)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1d59aaa (Fix)
          
      674. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
                  find('a', id: 'view_more', class: 'view_more').click
=======
                  visit books_path
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                  visit books_path
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
                  find('a', id: 'view_more', class: 'view_more').click
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
                  visit books_path
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
                  visit books_path
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
                  visit books_path
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
                  visit books_path
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
                  visit books_path
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
                  visit books_path
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
                  visit books_path
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
                  visit books_path
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
                  find('a', id: 'view_more', class: 'view_more').click
>>>>>>> 1d59aaa (Fix)
          
        675. 
        
        
      
        
        
          
      675. 
            
            

            

            
          
        676. 
        
        
      
        
        
          
      676. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
                  expect(page).not_to have_css('a', class: 'view_more hidden', id: 'view_more')
=======
                  find('a', id: 'view_more', class: 'view_more').click
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                  find('a', id: 'view_more', class: 'view_more').click
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
                  expect(page).not_to have_css('a', class: 'view_more hidden', id: 'view_more')
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
                  find('a', id: 'view_more', class: 'view_more').click
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
                  find('a', id: 'view_more', class: 'view_more').click
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
                  find('a', id: 'view_more', class: 'view_more').click
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
                  find('a', id: 'view_more', class: 'view_more').click
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
                  find('a', id: 'view_more', class: 'view_more').click
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
                  find('a', id: 'view_more', class: 'view_more').click
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
                  find('a', id: 'view_more', class: 'view_more').click
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
                  find('a', id: 'view_more', class: 'view_more').click
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
                  expect(page).not_to have_css('a', class: 'view_more hidden', id: 'view_more')
>>>>>>> 1d59aaa (Fix)
          
        677. 
        
        
      
        
        
          
      677. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
            
          
        678. 
        
        
      
        
        
          
      678. 
            1
            

            

                  expect(page).not_to have_css('a', class: 'view_more hidden', id: 'view_more')
          
        679. 
        
        
      
        
        
          
      679. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 872e675 (Fix)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1d59aaa (Fix)
                end
          
        680. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
          
      680. 
=======
          
      681. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      682. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
          
      683. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      684. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      685. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
          
      686. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
          
      687. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
          
      688. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
          
      689. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
          
      690. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
          
      691. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
          
      692. 
>>>>>>> 1d59aaa (Fix)
            
            

            

            
          
        693. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1d59aaa (Fix)
          
      693. 
            1
            

            

                context 'when view more' do
          
        694. 
        
        
      
        
        
          
      694. 
            1
            

            

                  it 'show books with view more button' do
          
        695. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1d59aaa (Fix)
          
      695. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
                    visit books_path
=======
                context 'when view more' do
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                context 'when view more' do
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
                    visit books_path
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
                context 'when view more' do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
                context 'when view more' do
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
                context 'when view more' do
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
                context 'when view more' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
                context 'when view more' do
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
                context 'when view more' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
                context 'when view more' do
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
                context 'when view more' do
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
                    visit books_path
>>>>>>> 1d59aaa (Fix)
          
        696. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
          
      696. 
            
=======
          
      697. 
            1
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> af057e3 (Featire specs)
=======
          
      698. 
            1
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      699. 
            
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
=======
          
      700. 
            1
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
          
      701. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
          
      702. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
          
      703. 
            1
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
          
      704. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
          
      705. 
            1
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
          
      706. 
            1
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
          
      707. 
            
>>>>>>> 1d59aaa (Fix)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
            
=======
                  it 'show books with view more button' do
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                  it 'show books with view more button' do
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
            
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
                  it 'show books with view more button' do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
                  it 'show books with view more button' do
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
                  it 'show books with view more button' do
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
                  it 'show books with view more button' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
                  it 'show books with view more button' do
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
                  it 'show books with view more button' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
                  it 'show books with view more button' do
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
                  it 'show books with view more button' do
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
            
>>>>>>> 1d59aaa (Fix)
          
        708. 
        
        
      
        
        
          
      708. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
                    expect(page).to have_css('a', class: 'view_more')
=======
                    visit books_path
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                    visit books_path
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
                    expect(page).to have_css('a', class: 'view_more')
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
                    visit books_path
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
                    visit books_path
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
                    visit books_path
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
                    visit books_path
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
                    visit books_path
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
                    visit books_path
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
                    visit books_path
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
                    visit books_path
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
                    expect(page).to have_css('a', class: 'view_more')
>>>>>>> 1d59aaa (Fix)
          
        709. 
        
        
      
        
        
          
      709. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
            
          
        710. 
        
        
      
        
        
          
      710. 
            1
            

            

                    expect(page).to have_css('a', class: 'view_more')
          
        711. 
        
        
      
        
        
          
      711. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 872e675 (Fix)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1d59aaa (Fix)
                  end
          
        712. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
          
      712. 
=======
          
      713. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      714. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
          
      715. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      716. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      717. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
          
      718. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
          
      719. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
          
      720. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
          
      721. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
          
      722. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
          
      723. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
          
      724. 
>>>>>>> 1d59aaa (Fix)
            
            

            

            
          
        725. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
          
      725. 
=======
          
      726. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      727. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
          
      728. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      729. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      730. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
          
      731. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
          
      732. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
          
      733. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
          
      734. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
          
      735. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
          
      736. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
          
      737. 
>>>>>>> 1d59aaa (Fix)
            1
            

            

                  it 'show loaded books', js: true do
          
        738. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1d59aaa (Fix)
          
      738. 
            1
            

            

                    visit books_path
          
        739. 
        
        
      
        
        
          
      739. 
            
            

            

            
          
        740. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1d59aaa (Fix)
          
      740. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
                    find('a', class: 'view_more').click
=======
                    visit books_path
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                    visit books_path
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
                    find('a', class: 'view_more').click
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
                    visit books_path
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
                    visit books_path
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
                    visit books_path
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
                    visit books_path
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
                    visit books_path
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
                    visit books_path
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
                    visit books_path
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
                    visit books_path
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
                    find('a', class: 'view_more').click
>>>>>>> 1d59aaa (Fix)
          
        741. 
        
        
      
        
        
          
      741. 
            
            

            

            
          
        742. 
        
        
      
        
        
          
      742. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
                    expect(page).to have_content(books.last.title)
=======
                    find('a', id: 'view_more', class: 'view_more').click
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                    find('a', id: 'view_more', class: 'view_more').click
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
                    expect(page).to have_content(books.last.title)
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
                    find('a', id: 'view_more', class: 'view_more').click
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
                    find('a', id: 'view_more', class: 'view_more').click
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
                    find('a', id: 'view_more', class: 'view_more').click
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
                    find('a', id: 'view_more', class: 'view_more').click
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
                    find('a', id: 'view_more', class: 'view_more').click
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
                    find('a', id: 'view_more', class: 'view_more').click
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
                    find('a', id: 'view_more', class: 'view_more').click
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
                    find('a', id: 'view_more', class: 'view_more').click
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
                    expect(page).to have_content(books.last.title)
>>>>>>> 1d59aaa (Fix)
          
        743. 
        
        
      
        
        
          
      743. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
                  end
=======
            
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
            
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
                  end
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
            
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
            
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
            
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
            
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
            
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
            
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
            
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
            
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
                  end
>>>>>>> 1d59aaa (Fix)
          
        744. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
          
      744. 
            
=======
          
      745. 
            1
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> af057e3 (Featire specs)
=======
          
      746. 
            1
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      747. 
            
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
=======
          
      748. 
            1
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
          
      749. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
          
      750. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
          
      751. 
            1
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
          
      752. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
          
      753. 
            1
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
          
      754. 
            1
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
          
      755. 
            
>>>>>>> 1d59aaa (Fix)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
                end
=======
                    expect(page).to have_content(books.last.title)
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                    expect(page).to have_content(books.last.title)
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
                end
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
                    expect(page).to have_content(books.last.title)
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
                    expect(page).to have_content(books.last.title)
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
                    expect(page).to have_content(books.last.title)
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
                    expect(page).to have_content(books.last.title)
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
                    expect(page).to have_content(books.last.title)
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
                    expect(page).to have_content(books.last.title)
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
                    expect(page).to have_content(books.last.title)
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
                    expect(page).to have_content(books.last.title)
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
                end
>>>>>>> 1d59aaa (Fix)
          
        756. 
        
        
      
        
        
          
      756. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
              end
=======
                  end
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                  end
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
              end
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
                  end
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
                  end
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
                  end
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
                  end
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
                  end
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
                  end
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
                  end
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
                  end
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
              end
>>>>>>> 1d59aaa (Fix)
          
        757. 
        
        
      
        
        
          
      757. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
                end
          
        758. 
        
        
      
        
        
          
      758. 
            
            

            

              end
          
        759. 
        
        
      
        
        
          
      759. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 872e675 (Fix)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1d59aaa (Fix)
            
          
        760. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
          
      760. 
=======
          
      761. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      762. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
          
      763. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      764. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      765. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
          
      766. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
          
      767. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
          
      768. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
          
      769. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
          
      770. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
          
      771. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
          
      772. 
>>>>>>> 1d59aaa (Fix)
            1
            

            

              describe 'sort' do
          
        773. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
          
      773. 
=======
          
      774. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      775. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
          
      776. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      777. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      778. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
          
      779. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
          
      780. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
          
      781. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
          
      782. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
          
      783. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
          
      784. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
          
      785. 
>>>>>>> 1d59aaa (Fix)
            1
            

            

                shared_examples 'sort test' do
          
        786. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
          
      786. 
=======
          
      787. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      788. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
          
      789. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      790. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      791. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
          
      792. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
          
      793. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
          
      794. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
          
      795. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
          
      796. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
          
      797. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
          
      798. 
>>>>>>> 1d59aaa (Fix)
            5
            

            

                  it 'sort books' do
          
        799. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1d59aaa (Fix)
          
      799. 
            5
            

            

                    create(:book, title: 'Zimbabwe', price_cents: 75,
          
        800. 
        
        
      
        
        
          
      800. 
            
            

            

                                  created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
          
        801. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1d59aaa (Fix)
          
      801. 
            5
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
                    create(:book, title: 'Anna', price_cents: 23,
=======
                    FactoryBot.create(:book, title: 'Zimbabwe', price: 75,
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                    FactoryBot.create(:book, title: 'Zimbabwe', price: 75,
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
                    create(:book, title: 'Anna', price_cents: 23,
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
                    FactoryBot.create(:book, title: 'Zimbabwe', price: 75,
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
                    FactoryBot.create(:book, title: 'Zimbabwe', price: 75,
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
                    FactoryBot.create(:book, title: 'Zimbabwe', price: 75,
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
                    FactoryBot.create(:book, title: 'Zimbabwe', price: 75,
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
                    FactoryBot.create(:book, title: 'Zimbabwe', price: 75,
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
                    FactoryBot.create(:book, title: 'Zimbabwe', price: 75,
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
                    FactoryBot.create(:book, title: 'Zimbabwe', price: 75,
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
                    FactoryBot.create(:book, title: 'Zimbabwe', price: 75,
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
                    create(:book, title: 'Anna', price_cents: 23,
>>>>>>> 1d59aaa (Fix)
          
        802. 
        
        
      
        
        
          
      802. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
                                  created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00')
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 715fac2 (Featire specs)
                                             created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                                             created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
=======
                                      created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
>>>>>>> 752f0c0 (Featire specs)
=======
                                      created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
>>>>>>> 4e81ea2 (Featire specs)
=======
                                      created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> df37394 (Featire specs)
=======
=======
=======
                                             created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
                                  created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00')
>>>>>>> c033601 (Rebased)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
                                  created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00')
=======
                                      created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
=======
=======
                                      created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
                                  created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00')
>>>>>>> 872e675 (Fix)
=======
                                  created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00')
=======
                                      created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
=======
=======
                                      created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
=======
                                      created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
=======
                                             created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
                                      created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
                                             created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
                                      created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
                                             created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
                                  created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00')
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 715fac2 (Featire specs)
          
        803. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
          
      803. 
=======
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      804. 
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
          
      805. 
            5
            

            

                    FactoryBot.create(:book, title: 'Anna', price: 23, created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00')
          
        806. 
        
        
      
        
        
          
      806. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
          
      807. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
          
      808. 
>>>>>>> 1d59aaa (Fix)
            
            

            

            
          
        809. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
          
      809. 
=======
          
      810. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      811. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
          
      812. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      813. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      814. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
          
      815. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
          
      816. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
          
      817. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
          
      818. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
          
      819. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
          
      820. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
          
      821. 
>>>>>>> 1d59aaa (Fix)
            5
            

            

                    visit books_path
          
        822. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
          
      822. 
=======
          
      823. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      824. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
          
      825. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      826. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      827. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
          
      828. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
          
      829. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
          
      830. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
          
      831. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
          
      832. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
          
      833. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
          
      834. 
>>>>>>> 1d59aaa (Fix)
            
            

            

            
          
        835. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
          
      835. 
=======
          
      836. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      837. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
          
      838. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      839. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      840. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
          
      841. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
          
      842. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
          
      843. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
          
      844. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
          
      845. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
          
      846. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
          
      847. 
>>>>>>> 1d59aaa (Fix)
            5
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1d59aaa (Fix)
                    find('a', class: 'dropdown-toggle lead small', text: I18n.t('catalog_page.sorting.newer_first'),
          
        848. 
        
        
      
        
        
          
      848. 
            
            

            

                              id: 'menu').click
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
                    find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click
>>>>>>> d0dc1f1 (Featire specs)
=======
                    find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
=======
                    find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
=======
                    find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
                    find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
                    find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
                    find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
                    find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
                    find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
                    find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1d59aaa (Fix)
          
        849. 
        
        
      
        
        
          
      849. 
            
            

            

            
          
        850. 
        
        
      
        
        
          
      850. 
            5
            

            

                    within 'ul', class: 'dropdown-menu', id: 'sort' do
          
        851. 
        
        
      
        
        
          
      851. 
            5
            

            

                      click_link button
          
        852. 
        
        
      
        
        
          
      852. 
            
            

            

                    end
          
        853. 
        
        
      
        
        
          
      853. 
            5
            

            

                    expect(find('.col-xs-6.col-sm-3', match: :first)).to have_content(book_title)
          
        854. 
        
        
      
        
        
          
      854. 
            
            

            

                  end
          
        855. 
        
        
      
        
        
          
      855. 
            
            

            

                end
          
        856. 
        
        
      
        
        
          
      856. 
            
            

            

            
          
        857. 
        
        
      
        
        
          
      857. 
            1
            

            

                context 'when sort by title A to Z' do
          
        858. 
        
        
      
        
        
          
      858. 
            2
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
                  let(:button) { I18n.t('catalog_page.sorting.title.asc') }
=======
                  let(:button) { 'Title: A to Z' }
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                  let(:button) { 'Title: A to Z' }
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
                  let(:button) { I18n.t('catalog_page.sorting.title.asc') }
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
                  let(:button) { 'Title: A to Z' }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
                  let(:button) { 'Title: A to Z' }
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
                  let(:button) { 'Title: A to Z' }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
                  let(:button) { 'Title: A to Z' }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
                  let(:button) { 'Title: A to Z' }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
                  let(:button) { 'Title: A to Z' }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
                  let(:button) { 'Title: A to Z' }
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
                  let(:button) { 'Title: A to Z' }
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
                  let(:button) { I18n.t('catalog_page.sorting.title.asc') }
>>>>>>> 1d59aaa (Fix)
          
        859. 
        
        
      
        
        
          
      859. 
            2
            

            

                  let(:book_title) { 'Anna' }
          
        860. 
        
        
      
        
        
          
      860. 
            
            

            

            
          
        861. 
        
        
      
        
        
          
      861. 
            1
            

            

                  include_examples 'sort test'
          
        862. 
        
        
      
        
        
          
      862. 
            
            

            

                end
          
        863. 
        
        
      
        
        
          
      863. 
            
            

            

            
          
        864. 
        
        
      
        
        
          
      864. 
            1
            

            

                context 'when sort by title Z to A' do
          
        865. 
        
        
      
        
        
          
      865. 
            2
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
                  let(:button) { I18n.t('catalog_page.sorting.title.desc') }
=======
                  let(:button) { 'Title: Z to A' }
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                  let(:button) { 'Title: Z to A' }
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
                  let(:button) { I18n.t('catalog_page.sorting.title.desc') }
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
                  let(:button) { 'Title: Z to A' }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
                  let(:button) { 'Title: Z to A' }
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
                  let(:button) { 'Title: Z to A' }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
                  let(:button) { 'Title: Z to A' }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
                  let(:button) { 'Title: Z to A' }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
                  let(:button) { 'Title: Z to A' }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
                  let(:button) { 'Title: Z to A' }
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
                  let(:button) { 'Title: Z to A' }
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
                  let(:button) { I18n.t('catalog_page.sorting.title.desc') }
>>>>>>> 1d59aaa (Fix)
          
        866. 
        
        
      
        
        
          
      866. 
            2
            

            

                  let(:book_title) { 'Zimbabwe' }
          
        867. 
        
        
      
        
        
          
      867. 
            
            

            

            
          
        868. 
        
        
      
        
        
          
      868. 
            1
            

            

                  include_examples 'sort test'
          
        869. 
        
        
      
        
        
          
      869. 
            
            

            

                end
          
        870. 
        
        
      
        
        
          
      870. 
            
            

            

            
          
        871. 
        
        
      
        
        
          
      871. 
            1
            

            

                context 'when sort by price High to Low' do
          
        872. 
        
        
      
        
        
          
      872. 
            2
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
                  let(:button) { I18n.t('catalog_page.sorting.price.desc') }
=======
                  let(:button) { 'Price: High to Low' }
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                  let(:button) { 'Price: High to Low' }
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
                  let(:button) { I18n.t('catalog_page.sorting.price.desc') }
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
                  let(:button) { 'Price: High to Low' }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
                  let(:button) { 'Price: High to Low' }
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
                  let(:button) { 'Price: High to Low' }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
                  let(:button) { 'Price: High to Low' }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
                  let(:button) { 'Price: High to Low' }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
                  let(:button) { 'Price: High to Low' }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
                  let(:button) { 'Price: High to Low' }
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
                  let(:button) { 'Price: High to Low' }
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
                  let(:button) { I18n.t('catalog_page.sorting.price.desc') }
>>>>>>> 1d59aaa (Fix)
          
        873. 
        
        
      
        
        
          
      873. 
            2
            

            

                  let(:book_title) { 'Zimbabwe' }
          
        874. 
        
        
      
        
        
          
      874. 
            
            

            

            
          
        875. 
        
        
      
        
        
          
      875. 
            1
            

            

                  include_examples 'sort test'
          
        876. 
        
        
      
        
        
          
      876. 
            
            

            

                end
          
        877. 
        
        
      
        
        
          
      877. 
            
            

            

            
          
        878. 
        
        
      
        
        
          
      878. 
            1
            

            

                context 'when sort by price Low to High' do
          
        879. 
        
        
      
        
        
          
      879. 
            2
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
                  let(:button) { I18n.t('catalog_page.sorting.price.asc') }
=======
                  let(:button) { 'Price: Low to High' }
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                  let(:button) { 'Price: Low to High' }
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
                  let(:button) { I18n.t('catalog_page.sorting.price.asc') }
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
                  let(:button) { 'Price: Low to High' }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
                  let(:button) { 'Price: Low to High' }
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
                  let(:button) { 'Price: Low to High' }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
                  let(:button) { 'Price: Low to High' }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
                  let(:button) { 'Price: Low to High' }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
                  let(:button) { 'Price: Low to High' }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
                  let(:button) { 'Price: Low to High' }
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
                  let(:button) { 'Price: Low to High' }
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
                  let(:button) { I18n.t('catalog_page.sorting.price.asc') }
>>>>>>> 1d59aaa (Fix)
          
        880. 
        
        
      
        
        
          
      880. 
            2
            

            

                  let(:book_title) { 'Anna' }
          
        881. 
        
        
      
        
        
          
      881. 
            
            

            

            
          
        882. 
        
        
      
        
        
          
      882. 
            1
            

            

                  include_examples 'sort test'
          
        883. 
        
        
      
        
        
          
      883. 
            
            

            

                end
          
        884. 
        
        
      
        
        
          
      884. 
            
            

            

            
          
        885. 
        
        
      
        
        
          
      885. 
            1
            

            

                context 'when sort by newest' do
          
        886. 
        
        
      
        
        
          
      886. 
            2
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
                  let(:button) { I18n.t('catalog_page.sorting.newer_first') }
=======
                  let(:button) { 'Newest first' }
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                  let(:button) { 'Newest first' }
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
                  let(:button) { I18n.t('catalog_page.sorting.newer_first') }
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
                  let(:button) { 'Newest first' }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
                  let(:button) { 'Newest first' }
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
                  let(:button) { 'Newest first' }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
                  let(:button) { 'Newest first' }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
                  let(:button) { 'Newest first' }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
                  let(:button) { 'Newest first' }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
                  let(:button) { 'Newest first' }
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
                  let(:button) { 'Newest first' }
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
                  let(:button) { I18n.t('catalog_page.sorting.newer_first') }
>>>>>>> 1d59aaa (Fix)
          
        887. 
        
        
      
        
        
          
      887. 
            2
            

            

                  let(:book_title) { 'Zimbabwe' }
          
        888. 
        
        
      
        
        
          
      888. 
            
            

            

            
          
        889. 
        
        
      
        
        
          
      889. 
            1
            

            

                  include_examples 'sort test'
          
        890. 
        
        
      
        
        
          
      890. 
            
            

            

                end
          
        891. 
        
        
      
        
        
          
      891. 
            
            

            

              end
          
        892. 
        
        
      
        
        
          
      892. 
            
            

            

            end
          
        893. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/feature/cart_spec.rb
      
    
      
      
  96.55%


      lines covered
    
      

    

    
      
      29 relevant lines.
      28 lines covered and
      1 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            require 'rails_helper'
          
        2. 
        
        
      
        
        
          
      2. 
            
            

            

            
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

            RSpec.describe 'Cart', type: :feature, js: true do
          
        4. 
        
        
      
        
        
          
      4. 
            5
            

            

              let(:book) { FactoryBot.create(:book) }
          
        5. 
        
        
      
        
        
          
      5. 
            
            

            

            
          
        6. 
        
        
      
        
        
          
      6. 
            1
            

            

              before do
          
        7. 
        
        
      
        
        
          
      7. 
            4
            

            

                book
          
        8. 
        
        
      
        
        
          
      8. 
            4
            

            

                visit book_path(book.id)
          
        9. 
        
        
      
        
        
          
      9. 
            
            

            

            
          
        10. 
        
        
      
        
        
          
      10. 
            4
            

            

                click_button I18n.t('book_page.add_to_card')
          
        11. 
        
        
      
        
        
          
      11. 
            
            

            

              end
          
        12. 
        
        
      
        
        
          
      12. 
            
            

            

            
          
        13. 
        
        
      
        
        
          
      13. 
            1
            

            

              describe '#add_book_to_order' do
          
        14. 
        
        
      
        
        
          
      14. 
            1
            

            

                it 'add book to order' do
          
        15. 
        
        
      
        
        
          
      15. 
            1
            

            

                  within('span', class: 'shop-icon') do
          
        16. 
        
        
      
        
        
          
      16. 
            1
            

            

                    expect(page).to have_content(1)
          
        17. 
        
        
      
        
        
          
      17. 
            
            

            

                  end
          
        18. 
        
        
      
        
        
          
      18. 
            
            

            

                end
          
        19. 
        
        
      
        
        
          
      19. 
            
            

            

              end
          
        20. 
        
        
      
        
        
          
      20. 
            
            

            

            
          
        21. 
        
        
      
        
        
          
      21. 
            1
            

            

              describe '#quantity_change' do
          
        22. 
        
        
      
        
        
          
      22. 
            1
            

            

                it 'book quantity inc' do
          
        23. 
        
        
      
        
        
          
      23. 
            1
            

            

                  visit orders_path
          
        24. 
        
        
      
        
        
          
      24. 
            
            

            

            
          
        25. 
        
        
      
        
        
          
      25. 
            1
            

            

                  within("a#inc#{book.id}.input-link") do
          
        26. 
        
        
      
        
        
          
      26. 
            1
            

            

                    find('i.fa.fa-plus.line-heaght-40').click
          
        27. 
        
        
      
        
        
          
      27. 
            
            

            

                  end
          
        28. 
        
        
      
        
        
          
      28. 
            
            

            

            
          
        29. 
        
        
      
        
        
          
      29. 
            1
            

            

                  sleep(2)
          
        30. 
        
        
      
        
        
          
      30. 
            
            

            

            
          
        31. 
        
        
      
        
        
          
      31. 
            1
            

            

                  expect(find_field("counter#{book.id}").value).to eq('2')
          
        32. 
        
        
      
        
        
          
      32. 
            
            

            

                end
          
        33. 
        
        
      
        
        
          
      33. 
            
            

            

            
          
        34. 
        
        
      
        
        
          
      34. 
            1
            

            

                it 'book quantity dec' do
          
        35. 
        
        
      
        
        
          
      35. 
            1
            

            

                  visit orders_path
          
        36. 
        
        
      
        
        
          
      36. 
            
            

            

            
          
        37. 
        
        
      
        
        
          
      37. 
            1
            

            

                  within("a#dec#{book.id}.input-link") do
          
        38. 
        
        
      
        
        
          
      38. 
            1
            

            

                    find('i.fa.fa-minus.line-heaght-40').click
          
        39. 
        
        
      
        
        
          
      39. 
            
            

            

                  end
          
        40. 
        
        
      
        
        
          
      40. 
            
            

            

            
          
        41. 
        
        
      
        
        
          
      41. 
            1
            

            

                  sleep(2)
          
        42. 
        
        
      
        
        
          
      42. 
            
            

            

            
          
        43. 
        
        
      
        
        
          
      43. 
            1
            

            

                  expect(find_field("counter#{book.id}").value).to eq('0')
          
        44. 
        
        
      
        
        
          
      44. 
            
            

            

                end
          
        45. 
        
        
      
        
        
          
      45. 
            
            

            

              end
          
        46. 
        
        
      
        
        
          
      46. 
            
            

            

            
          
        47. 
        
        
      
        
        
          
      47. 
            1
            

            

              describe '#remove_book_from_cart' do
          
        48. 
        
        
      
        
        
          
      48. 
            1
            

            

                it 'book quantity change' do
          
        49. 
        
        
      
        
        
          
      49. 
            1
            

            

                  visit orders_path
          
        50. 
        
        
      
        
        
          
      50. 
            
            

            

            
          
        51. 
        
        
      
        
        
          
      51. 
            1
            

            

                  find('button.close.general-cart-close').click
          
        52. 
        
        
      
        
        
          
      52. 
            
            

            

            
          
        53. 
        
        
      
        
        
          
      53. 
            
            

            

                  expect(page).to have_content(I18n.t('order.messages.delete'))
          
        54. 
        
        
      
        
        
          
      54. 
            
            

            

                end
          
        55. 
        
        
      
        
        
          
      55. 
            
            

            

              end
          
        56. 
        
        
      
        
        
          
      56. 
            
            

            

            end
          
        57. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/feature/coupon_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      30 relevant lines.
      30 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            require 'rails_helper'
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

            require_relative '../support/shared_context'
          
        3. 
        
        
      
        
        
          
      3. 
            
            

            

            
          
        4. 
        
        
      
        
        
          
      4. 
            1
            

            

            RSpec.describe 'Coupon', type: :feature, js: true do
          
        5. 
        
        
      
        
        
          
      5. 
            1
            

            

              include_context 'with api request authentication helper methods'
          
        6. 
        
        
      
        
        
          
      6. 
            1
            

            

              include_context 'with api request global before and after hooks'
          
        7. 
        
        
      
        
        
          
      7. 
            
            

            

            
          
        8. 
        
        
      
        
        
          
      8. 
            5
            

            

              let(:user) { FactoryBot.create(:user) }
          
        9. 
        
        
      
        
        
          
      9. 
            4
            

            

              let(:coupon) { FactoryBot.create(:coupon, discount: 0.15) }
          
        10. 
        
        
      
        
        
          
      10. 
            5
            

            

              let(:order) { FactoryBot.create(:order, user_id: user.id, books_count: 0) }
          
        11. 
        
        
      
        
        
          
      11. 
            5
            

            

              let(:book) { FactoryBot.create(:book, price_cents: 1234) }
          
        12. 
        
        
      
        
        
          
      12. 
            5
            

            

              let(:order_book) { FactoryBot.create(:order_book, order: order, book: book) }
          
        13. 
        
        
      
        
        
          
      13. 
            
            

            

            
          
        14. 
        
        
      
        
        
          
      14. 
            1
            

            

              before do
          
        15. 
        
        
      
        
        
          
      15. 
            4
            

            

                sign_in(user)
          
        16. 
        
        
      
        
        
          
      16. 
            4
            

            

                order
          
        17. 
        
        
      
        
        
          
      17. 
            4
            

            

                order_book
          
        18. 
        
        
      
        
        
          
      18. 
            4
            

            

                visit orders_path
          
        19. 
        
        
      
        
        
          
      19. 
            
            

            

              end
          
        20. 
        
        
      
        
        
          
      20. 
            
            

            

            
          
        21. 
        
        
      
        
        
          
      21. 
            1
            

            

              describe '#valid coupon' do
          
        22. 
        
        
      
        
        
          
      22. 
            1
            

            

                before do
          
        23. 
        
        
      
        
        
          
      23. 
            3
            

            

                  fill_in 'input', with: coupon.code
          
        24. 
        
        
      
        
        
          
      24. 
            
            

            

            
          
        25. 
        
        
      
        
        
          
      25. 
            3
            

            

                  click_button I18n.t('order.apply')
          
        26. 
        
        
      
        
        
          
      26. 
            
            

            

                end
          
        27. 
        
        
      
        
        
          
      27. 
            
            

            

            
          
        28. 
        
        
      
        
        
          
      28. 
            1
            

            

                it 'sub price' do
          
        29. 
        
        
      
        
        
          
      29. 
            1
            

            

                  expect(page).to have_content("SubTotal:\n€ 12.34")
          
        30. 
        
        
      
        
        
          
      30. 
            
            

            

                end
          
        31. 
        
        
      
        
        
          
      31. 
            
            

            

            
          
        32. 
        
        
      
        
        
          
      32. 
            1
            

            

                it 'use coupon' do
          
        33. 
        
        
      
        
        
          
      33. 
            1
            

            

                  expect(page).to have_content("Coupon:\n€ 1.85")
          
        34. 
        
        
      
        
        
          
      34. 
            
            

            

                end
          
        35. 
        
        
      
        
        
          
      35. 
            
            

            

            
          
        36. 
        
        
      
        
        
          
      36. 
            1
            

            

                it 'count price with coupon' do
          
        37. 
        
        
      
        
        
          
      37. 
            1
            

            

                  expect(page).to have_content('Order Total: € 10.49')
          
        38. 
        
        
      
        
        
          
      38. 
            
            

            

                end
          
        39. 
        
        
      
        
        
          
      39. 
            
            

            

              end
          
        40. 
        
        
      
        
        
          
      40. 
            
            

            

            
          
        41. 
        
        
      
        
        
          
      41. 
            1
            

            

              describe '#invalid coupon' do
          
        42. 
        
        
      
        
        
          
      42. 
            1
            

            

                it 'show error message' do
          
        43. 
        
        
      
        
        
          
      43. 
            1
            

            

                  fill_in 'input', with: 'dasdasdqe1243wasad'
          
        44. 
        
        
      
        
        
          
      44. 
            
            

            

            
          
        45. 
        
        
      
        
        
          
      45. 
            1
            

            

                  click_button I18n.t('order.apply')
          
        46. 
        
        
      
        
        
          
      46. 
            
            

            

            
          
        47. 
        
        
      
        
        
          
      47. 
            1
            

            

                  expect(page).to have_content(I18n.t('order.coupon.error'))
          
        48. 
        
        
      
        
        
          
      48. 
            
            

            

                end
          
        49. 
        
        
      
        
        
          
      49. 
            
            

            

              end
          
        50. 
        
        
      
        
        
          
      50. 
            
            

            

            end
          
        51. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/feature/home_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1d59aaa (Fix)
      49 relevant lines.
      49 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            RSpec.describe 'Home', type: :feature do
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

              include_context 'with api request authentication helper methods'
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

              include_context 'with api request global before and after hooks'
          
        4. 
        
        
      
        
        
          
      4. 
            
            

            

            
          
        5. 
        
        
      
        
        
          
      5. 
            1
            

            

              describe 'Get Started' do
          
        6. 
        
        
      
        
        
          
      6. 
            1
            

            

                it 'on click move to catalog page' do
          
        7. 
        
        
      
        
        
          
      7. 
            1
            

            

                  visit root_path
          
        8. 
        
        
      
        
        
          
      8. 
            
            

            

            
          
        9. 
        
        
      
        
        
          
      9. 
            1
            

            

                  click_on 'Get Started'
          
        10. 
        
        
      
        
        
          
      10. 
            
            

            

            
          
        11. 
        
        
      
        
        
          
      11. 
            1
            

            

                  expect(page).to have_content('Catalog')
          
        12. 
        
        
      
        
        
          
      12. 
            
            

            

                end
          
        13. 
        
        
      
        
        
          
      13. 
            
            

            

              end
          
        14. 
        
        
      
        
        
          
      14. 
            
            

            

            
          
        15. 
        
        
      
        
        
          
      15. 
            1
            

            

              describe 'navbar' do
          
        16. 
        
        
      
        
        
          
      16. 
            2
            

            

                let(:books_category) { create(:books_category) }
          
        17. 
        
        
      
        
        
          
      17. 
            
            

            

            
          
        18. 
        
        
      
        
        
          
      18. 
            1
            

            

                it 'on click home move to root-path' do
          
        19. 
        
        
      
        
        
          
      19. 
            1
            

            

                  visit books_path
          
        20. 
        
        
      
        
        
          
      20. 
            
            

            

            
          
        21. 
        
        
      
        
        
          
      21. 
            1
            

            

                  find('a', id: 'root').click
          
        22. 
        
        
      
        
        
          
      22. 
            
            

            

            
          
        23. 
        
        
      
        
        
          
      23. 
            1
            

            

                  expect(page).to have_content('Get Started')
          
        24. 
        
        
      
        
        
          
      24. 
            
            

            

                end
          
        25. 
        
        
      
        
        
          
      25. 
            
            

            

            
          
        26. 
        
        
      
        
        
          
      26. 
            1
            

            

                it 'on click category name move to root-path with books that belong to this category' do
          
        27. 
        
        
      
        
        
          
      27. 
            1
            

            

                  books_category
          
        28. 
        
        
      
        
        
          
      28. 
            
            

            

            
          
        29. 
        
        
      
        
        
          
      29. 
            1
            

            

                  visit root_path
          
        30. 
        
        
      
        
        
          
      30. 
            
            

            

            
          
        31. 
        
        
      
        
        
          
      31. 
            1
            

            

                  find('a', class: 'dropdown-toggle', text: 'Shop').click
          
        32. 
        
        
      
        
        
          
      32. 
            
            

            

            
          
        33. 
        
        
      
        
        
          
      33. 
            1
            

            

                  within('ul', id: 'nav') do
          
        34. 
        
        
      
        
        
          
      34. 
            1
            

            

                    find('a', class: 'collapse-link', text: books_category.category.name).click
          
        35. 
        
        
      
        
        
          
      35. 
            
            

            

                  end
          
        36. 
        
        
      
        
        
          
      36. 
            
            

            

            
          
        37. 
        
        
      
        
        
          
      37. 
            1
            

            

                  expect(page).to have_content(books_category.category.books.first.title)
          
        38. 
        
        
      
        
        
          
      38. 
            
            

            

                end
          
        39. 
        
        
      
        
        
          
      39. 
            
            

            

            
          
        40. 
        
        
      
        
        
          
      40. 
            1
            

            

                context 'when guest' do
          
        41. 
        
        
      
        
        
          
      41. 
            1
            

            

                  it 'on click login go to login page' do
          
        42. 
        
        
      
        
        
          
      42. 
            1
            

            

                    visit root_path
          
        43. 
        
        
      
        
        
          
      43. 
            
            

            

            
          
        44. 
        
        
      
        
        
          
      44. 
            1
            

            

                    within 'div', class: 'visible-xs' do
          
        45. 
        
        
      
        
        
          
      45. 
            1
            

            

                      click_link I18n.t('header.log_in')
          
        46. 
        
        
      
        
        
          
      46. 
            
            

            

                    end
          
        47. 
        
        
      
        
        
          
      47. 
            
            

            

            
          
        48. 
        
        
      
        
        
          
      48. 
            1
            

            

                    expect(page).to have_content(I18n.t('header.log_in'))
          
        49. 
        
        
      
        
        
          
      49. 
            
            

            

                  end
          
        50. 
        
        
      
        
        
          
      50. 
            
            

            

            
          
        51. 
        
        
      
        
        
          
      51. 
            1
            

            

                  it 'on click sing up go to sing up page' do
          
        52. 
        
        
      
        
        
          
      52. 
            1
            

            

                    visit root_path
          
        53. 
        
        
      
        
        
          
      53. 
            
            

            

            
          
        54. 
        
        
      
        
        
          
      54. 
            1
            

            

                    within 'div', class: 'visible-xs' do
          
        55. 
        
        
      
        
        
          
      55. 
            1
            

            

                      click_link I18n.t('header.sing_up')
          
        56. 
        
        
      
        
        
          
      56. 
            
            

            

                    end
          
        57. 
        
        
      
        
        
          
      57. 
            
            

            

            
          
        58. 
        
        
      
        
        
          
      58. 
            1
            

            

                    expect(page).to have_content(I18n.t('header.sing_up'))
          
        59. 
        
        
      
        
        
          
      59. 
            
            

            

                  end
          
        60. 
        
        
      
        
        
          
      60. 
            
            

            

                end
          
        61. 
        
        
      
        
        
          
      61. 
            
            

            

            
          
        62. 
        
        
      
        
        
          
      62. 
            1
            

            

                context 'when user', js: true do
          
        63. 
        
        
      
        
        
          
      63. 
            4
            

            

                  let(:user) { create(:user) }
          
        64. 
        
        
      
        
        
          
      64. 
            
            

            

            
          
        65. 
        
        
      
        
        
          
      65. 
            1
            

            

                  before do
          
        66. 
        
        
      
        
        
          
      66. 
            3
            

            

                    sign_in(user)
          
        67. 
        
        
      
        
        
          
      67. 
            
            

            

                  end
          
        68. 
        
        
      
        
        
          
      68. 
            
            

            

            
          
        69. 
        
        
      
        
        
          
      69. 
            1
            

            

                  it 'on click account show settings' do
          
        70. 
        
        
      
        
        
          
      70. 
            1
            

            

                    visit root_path
          
        71. 
        
        
      
        
        
          
      71. 
            
            

            

            
          
        72. 
        
        
      
        
        
          
      72. 
            1
            

            

                    click_on I18n.t('header.account')
          
        73. 
        
        
      
        
        
          
      73. 
            
            

            

            
          
        74. 
        
        
      
        
        
          
      74. 
            1
            

            

                    expect(page).to have_content(I18n.t('header.settings'))
          
        75. 
        
        
      
        
        
          
      75. 
            
            

            

                  end
          
        76. 
        
        
      
        
        
          
      76. 
            
            

            

            
          
        77. 
        
        
      
        
        
          
      77. 
            1
            

            

                  it 'on click account show log_out' do
          
        78. 
        
        
      
        
        
          
      78. 
            1
            

            

                    visit root_path
          
        79. 
        
        
      
        
        
          
      79. 
            
            

            

            
          
        80. 
        
        
      
        
        
          
      80. 
            1
            

            

                    click_on I18n.t('header.account')
          
        81. 
        
        
      
        
        
          
      81. 
            
            

            

            
          
        82. 
        
        
      
        
        
          
      82. 
            1
            

            

                    expect(page).to have_content(I18n.t('header.log_out'))
          
        83. 
        
        
      
        
        
          
      83. 
            
            

            

                  end
          
        84. 
        
        
      
        
        
          
      84. 
            
            

            

            
          
        85. 
        
        
      
        
        
          
      85. 
            1
            

            

                  it 'log_out' do
          
        86. 
        
        
      
        
        
          
      86. 
            1
            

            

                    visit root_path
          
        87. 
        
        
      
        
        
          
      87. 
            
            

            

            
          
        88. 
        
        
      
        
        
          
      88. 
            1
            

            

                    click_on I18n.t('header.account')
          
        89. 
        
        
      
        
        
          
      89. 
            
            

            

            
          
        90. 
        
        
      
        
        
          
      90. 
            1
            

            

                    click_on(I18n.t('header.log_out'), match: :first)
          
        91. 
        
        
      
        
        
          
      91. 
            
            

            

            
          
        92. 
        
        
      
        
        
          
      92. 
            1
            

            

                    expect(page).to have_content(I18n.t('devise.sessions.signed_out'))
          
        93. 
        
        
      
        
        
          
      93. 
            
            

            

                  end
          
        94. 
        
        
      
        
        
          
      94. 
            
            

            

                end
          
        95. 
        
        
      
        
        
          
      95. 
            
            

            

              end
          
        96. 
        
        
      
        
        
          
      96. 
            
            

            

            end
          
        97. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/feature/login_spec.rb
      
    
      
>>>>>>> a5d032d (Fix)
      
  100.0%


      lines covered
    
      

    

    
      
<<<<<<< HEAD
      31 relevant lines.
      31 lines covered and
=======
      19 relevant lines.
      19 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            RSpec.describe 'Login', type: :feature do
          
        2. 
        
        
      
        
        
          
      2. 
            3
            

            

              let(:user_second) { create(:user, email: 'test.rspec@rspec.ua') }
          
        3. 
        
        
      
        
        
          
      3. 
            
            

            

            
          
        4. 
        
        
      
        
        
          
      4. 
            1
            

            

              describe '#login' do
          
        5. 
        
        
      
        
        
          
      5. 
            1
            

            

                before do
          
        6. 
        
        
      
        
        
          
      6. 
            2
            

            

                  visit new_user_session_path
          
        7. 
        
        
      
        
        
          
      7. 
            
            

            

                end
          
        8. 
        
        
      
        
        
          
      8. 
            
            

            

            
          
        9. 
        
        
      
        
        
          
      9. 
            1
            

            

                context 'when successfully login' do
          
        10. 
        
        
      
        
        
          
      10. 
            1
            

            

                  it 'login' do
          
        11. 
        
        
      
        
        
          
      11. 
            1
            

            

                    within 'form', class: 'new_user', id: 'new_user' do
          
        12. 
        
        
      
        
        
          
      12. 
            1
            

            

                      fill_in 'user_email', with: user_second.email
          
        13. 
        
        
      
        
        
          
      13. 
            1
            

            

                      fill_in 'user_password', with: user_second.password
          
        14. 
        
        
      
        
        
          
      14. 
            
            

            

            
          
        15. 
        
        
      
        
        
          
      15. 
            1
            

            

                      click_on I18n.t('header.log_in')
          
        16. 
        
        
      
        
        
          
      16. 
            
            

            

                    end
          
        17. 
        
        
      
        
        
          
      17. 
            
            

            

            
          
        18. 
        
        
      
        
        
          
      18. 
            1
            

            

                    expect(page).to have_text I18n.t('devise.sessions.signed_in')
          
        19. 
        
        
      
        
        
          
      19. 
            
            

            

                  end
          
        20. 
        
        
      
        
        
          
      20. 
            
            

            

                end
          
        21. 
        
        
      
        
        
          
      21. 
            
            

            

            
          
        22. 
        
        
      
        
        
          
      22. 
            1
            

            

                context 'when unsuccessfully login' do
          
        23. 
        
        
      
        
        
          
      23. 
            1
            

            

                  it 'didn`t login' do
          
        24. 
        
        
      
        
        
          
      24. 
            1
            

            

                    within 'form', class: 'new_user', id: 'new_user' do
          
        25. 
        
        
      
        
        
          
      25. 
            1
            

            

                      fill_in 'user_email', with: user_second.email
          
        26. 
        
        
      
        
        
          
      26. 
            1
            

            

                      fill_in 'user_password', with: 'wrong_password'
          
        27. 
        
        
      
        
        
          
      27. 
            
            

            

            
          
        28. 
        
        
      
        
        
          
      28. 
            1
            

            

                      click_on I18n.t('header.log_in')
          
        29. 
        
        
      
        
        
          
      29. 
            
            

            

                    end
          
        30. 
        
        
      
        
        
          
      30. 
            
            

            

            
          
        31. 
        
        
      
        
        
          
      31. 
            1
            

            

                    expect(page).to have_text 'Invalid Email or password.'
          
        32. 
        
        
      
        
        
          
      32. 
            
            

            

                  end
          
        33. 
        
        
      
        
        
          
      33. 
            
            

            

                end
          
        34. 
        
        
      
        
        
          
      34. 
            
            

            

              end
          
        35. 
        
        
      
        
        
          
      35. 
            
            

            

            end
          
        36. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/feature/new_password_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      13 relevant lines.
      13 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            require_relative '../rails_helper'
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

            require_relative '../support/shared_context'
          
        3. 
        
        
      
        
        
          
      3. 
            
            

            

            
          
        4. 
        
        
      
        
        
          
      4. 
            1
            

            

            RSpec.describe 'New Password', type: :feature do
          
        5. 
        
        
      
        
        
          
      5. 
            3
            

            

              let(:user) { FactoryBot.create(:user) }
          
        6. 
        
        
      
        
        
          
      6. 
            
            

            

            
          
        7. 
        
        
      
        
        
          
      7. 
            1
            

            

              describe '#new_password' do
          
        8. 
        
        
      
        
        
          
      8. 
            1
            

            

                it 'change password' do
          
        9. 
        
        
      
        
        
          
      9. 
            1
            

            

                  user.reset_password('newPassword', 'newPassword')
          
        10. 
        
        
      
        
        
          
      10. 
            
            

            

            
          
        11. 
        
        
      
        
        
          
      11. 
            1
            

            

                  expect(user.password).to eq('newPassword')
          
        12. 
        
        
      
        
        
          
      12. 
            
            

            

                end
          
        13. 
        
        
      
        
        
          
      13. 
            
            

            

            
          
        14. 
        
        
      
        
        
          
      14. 
            1
            

            

                it 'not validate password' do
          
        15. 
        
        
      
        
        
          
      15. 
            1
            

            

                  visit new_user_password_path
          
        16. 
        
        
      
        
        
          
      16. 
            
            

            

            
          
        17. 
        
        
      
        
        
          
      17. 
            1
            

            

                  fill_in 'email', with: user.email
          
        18. 
        
        
      
        
        
          
      18. 
            
            

            

            
          
        19. 
        
        
      
        
        
          
      19. 
            1
            

            

                  click_on I18n.t('login.send_instructions')
          
        20. 
        
        
      
        
        
          
      20. 
            
            

            

            
          
        21. 
        
        
      
        
        
          
      21. 
            1
            

            

                  expect(page).to have_content(I18n.t('devise.passwords.send_instructions'))
          
        22. 
        
        
      
        
        
          
      22. 
            
            

            

                end
          
        23. 
        
        
      
        
        
          
      23. 
            
            

            

              end
          
        24. 
        
        
      
        
        
          
      24. 
            
            

            

            end
          
        25. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/feature/registration_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      29 relevant lines.
      29 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            RSpec.describe 'Registration', type: :feature do
          
        2. 
        
        
      
        
        
          
      2. 
            3
            

            

              let(:user) { create(:user, email: 'test.rspec@rspec.ua') }
          
        3. 
        
        
      
        
        
          
      3. 
            
            

            

            
          
        4. 
        
        
      
        
        
          
      4. 
            1
            

            

              describe '#sing_up' do
          
        5. 
        
        
      
        
        
          
      5. 
            1
            

            

                before do
          
        6. 
        
        
      
        
        
          
      6. 
            3
            

            

                  visit new_user_registration_path
          
        7. 
        
        
      
        
        
          
      7. 
            
            

            

                end
          
        8. 
        
        
      
        
        
          
      8. 
            
            

            

            
          
        9. 
        
        
      
        
        
          
      9. 
            1
            

            

                context 'when successfully sing_up' do
          
        10. 
        
        
      
        
        
          
      10. 
            1
            

            

                  it 'sing_up users' do
          
        11. 
        
        
      
        
        
          
      11. 
            1
            

            

                    within 'form', class: 'new_user', id: 'new_user' do
          
        12. 
        
        
      
        
        
          
      12. 
            1
            

            

                      fill_in 'user_email', with: 'email-test@rspec.com'
          
        13. 
        
        
      
        
        
          
      13. 
            1
            

            

                      fill_in 'user_password', with: user.password
          
        14. 
        
        
      
        
        
          
      14. 
            1
            

            

                      fill_in 'user_password_confirmation', with: user.password
          
        15. 
        
        
      
        
        
          
      15. 
            
            

            

            
          
        16. 
        
        
      
        
        
          
      16. 
            1
            

            

                      click_on I18n.t('header.sing_up')
          
        17. 
        
        
      
        
        
          
      17. 
            
            

            

                    end
          
        18. 
        
        
      
        
        
          
      18. 
            
            

            

            
          
        19. 
        
        
      
        
        
          
      19. 
            1
            

            

                    expect(page).to have_text I18n.t('devise.registrations.signed_up_but_unconfirmed')
          
        20. 
        
        
      
        
        
          
      20. 
            
            

            

                  end
          
        21. 
        
        
      
        
        
          
      21. 
            
            

            

                end
          
        22. 
        
        
      
        
        
          
      22. 
            
            

            

            
          
        23. 
        
        
      
        
        
          
      23. 
            1
            

            

                context 'when users is already exits' do
          
        24. 
        
        
      
        
        
          
      24. 
            1
            

            

                  it 'sing_up users' do
          
        25. 
        
        
      
        
        
          
      25. 
            1
            

            

                    within 'form', class: 'new_user', id: 'new_user' do
          
        26. 
        
        
      
        
        
          
      26. 
            1
            

            

                      fill_in 'user_email', with: user.email
          
        27. 
        
        
      
        
        
          
      27. 
            1
            

            

                      fill_in 'user_password', with: user.password
          
        28. 
        
        
      
        
        
          
      28. 
            1
            

            

                      fill_in 'user_password_confirmation', with: user.password
          
        29. 
        
        
      
        
        
          
      29. 
            
            

            

            
          
        30. 
        
        
      
        
        
          
      30. 
            1
            

            

                      click_on I18n.t('header.sing_up')
          
        31. 
        
        
      
        
        
          
      31. 
            
            

            

                    end
          
        32. 
        
        
      
        
        
          
      32. 
            
            

            

            
          
        33. 
        
        
      
        
        
          
      33. 
            1
            

            

                    expect(page).to have_text('Email has already been taken')
          
        34. 
        
        
      
        
        
          
      34. 
            
            

            

                  end
          
        35. 
        
        
      
        
        
          
      35. 
            
            

            

                end
          
        36. 
        
        
      
        
        
          
      36. 
            
            

            

            
          
        37. 
        
        
      
        
        
          
      37. 
            1
            

            

                context 'when unsuccessfully sing_up' do
          
        38. 
        
        
      
        
        
          
      38. 
            1
            

            

                  it 'didn`t sing_up' do
          
        39. 
        
        
      
        
        
          
      39. 
            1
            

            

                    within 'form', class: 'new_user', id: 'new_user' do
          
        40. 
        
        
      
        
        
          
      40. 
            1
            

            

                      fill_in 'user_email', with: FFaker::Internet.email
          
        41. 
        
        
      
        
        
          
      41. 
            1
            

            

                      fill_in 'user_password', with: 'password'
          
        42. 
        
        
      
        
        
          
      42. 
            1
            

            

                      fill_in 'user_password_confirmation', with: 'wrong'
          
        43. 
        
        
      
        
        
          
      43. 
            
            

            

            
          
        44. 
        
        
      
        
        
          
      44. 
            1
            

            

                      click_on I18n.t('header.sing_up')
          
        45. 
        
        
      
        
        
          
      45. 
            
            

            

                    end
          
        46. 
        
        
      
        
        
          
      46. 
            
            

            

            
          
        47. 
        
        
      
        
        
          
      47. 
            1
            

            

                    expect(page).to have_text '1 error prohibited this user from being saved'
          
        48. 
        
        
      
        
        
          
      48. 
            
            

            

                  end
          
        49. 
        
        
      
        
        
          
      49. 
            
            

            

                end
          
        50. 
        
        
      
        
        
          
      50. 
            
            

            

              end
          
        51. 
        
        
      
        
        
          
      51. 
            
            

            

            end
          
        52. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/feature/review_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      28 relevant lines.
      28 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            RSpec.describe 'Review', type: :feature do
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

              include_context 'with api request authentication helper methods'
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

              include_context 'with api request global before and after hooks'
          
        4. 
        
        
      
        
        
          
      4. 
            
            

            

            
          
        5. 
        
        
      
        
        
          
      5. 
            3
            

            

              let(:user) { create(:user).decorate }
          
        6. 
        
        
      
        
        
          
      6. 
            3
            

            

              let(:book) { create(:book).decorate }
          
        7. 
        
        
      
        
        
          
      7. 
            
            

            

            
          
        8. 
        
        
      
        
        
          
      8. 
            1
            

            

              before do
          
        9. 
        
        
      
        
        
          
      9. 
            2
            

            

                sign_in(user)
          
        10. 
        
        
      
        
        
          
      10. 
            
            

            

            
          
        11. 
        
        
      
        
        
          
      11. 
            2
            

            

                visit book_path(book)
          
        12. 
        
        
      
        
        
          
      12. 
            
            

            

              end
          
        13. 
        
        
      
        
        
          
      13. 
            
            

            

            
          
        14. 
        
        
      
        
        
          
      14. 
            1
            

            

              shared_examples 'review' do
          
        15. 
        
        
      
        
        
          
      15. 
            2
            

            

                it 'review' do
          
        16. 
        
        
      
        
        
          
      16. 
            2
            

            

                  find('i', id: rating).click
          
        17. 
        
        
      
        
        
          
      17. 
            
            

            

            
          
        18. 
        
        
      
        
        
          
      18. 
            2
            

            

                  fill_in :title, with: FFaker::Lorem.sentence(title_words)
          
        19. 
        
        
      
        
        
          
      19. 
            2
            

            

                  fill_in :body, with: FFaker::Lorem.sentence(body_words)
          
        20. 
        
        
      
        
        
          
      20. 
            
            

            

            
          
        21. 
        
        
      
        
        
          
      21. 
            2
            

            

                  click_on I18n.t('review.post')
          
        22. 
        
        
      
        
        
          
      22. 
            
            

            

            
          
        23. 
        
        
      
        
        
          
      23. 
            2
            

            

                  expect(page).to have_content(result)
          
        24. 
        
        
      
        
        
          
      24. 
            
            

            

                end
          
        25. 
        
        
      
        
        
          
      25. 
            
            

            

              end
          
        26. 
        
        
      
        
        
          
      26. 
            
            

            

            
          
        27. 
        
        
      
        
        
          
      27. 
            1
            

            

              describe '#post review', js: true do
          
        28. 
        
        
      
        
        
          
      28. 
            1
            

            

                context 'when review posted' do
          
        29. 
        
        
      
        
        
          
      29. 
            2
            

            

                  let(:rating) { "star#{rand(1..5)}" }
          
        30. 
        
        
      
        
        
          
      30. 
            2
            

            

                  let(:title_words) { 3 }
          
        31. 
        
        
      
        
        
          
      31. 
            2
            

            

                  let(:body_words) { 5 }
          
        32. 
        
        
      
        
        
          
      32. 
            2
            

            

                  let(:result) { user.name_or_email }
          
        33. 
        
        
      
        
        
          
      33. 
            
            

            

            
          
        34. 
        
        
      
        
        
          
      34. 
            1
            

            

                  include_examples 'review'
          
        35. 
        
        
      
        
        
          
      35. 
            
            

            

                end
          
        36. 
        
        
      
        
        
          
      36. 
            
            

            

            
          
        37. 
        
        
      
        
        
          
      37. 
            1
            

            

                context 'when review not been posted' do
          
        38. 
        
        
      
        
        
          
      38. 
            2
            

            

                  let(:rating) { "star#{rand(1..5)}" }
          
        39. 
        
        
      
        
        
          
      39. 
            2
            

            

                  let(:title_words) { 80 }
          
        40. 
        
        
      
        
        
          
      40. 
            2
            

            

                  let(:body_words) { 30 }
          
        41. 
        
        
      
        
        
          
      41. 
            2
            

            

                  let(:result) { 'Title is too long (maximum is 80 characters)' }
          
        42. 
        
        
      
        
        
          
      42. 
            
            

            

            
          
        43. 
        
        
      
        
        
          
      43. 
            1
            

            

                  include_examples 'review'
          
        44. 
        
        
      
        
        
          
      44. 
            
            

            

                end
          
        45. 
        
        
      
        
        
          
      45. 
            
            

            

              end
          
        46. 
        
        
      
        
        
          
      46. 
            
            

            

            end
          
        47. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/feature/settings_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      34 relevant lines.
      34 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            RSpec.describe 'Settings', type: :feature do
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

              include_context 'with api request authentication helper methods'
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

              include_context 'with api request global before and after hooks'
          
        4. 
        
        
      
        
        
          
      4. 
            
            

            

            
          
        5. 
        
        
      
        
        
          
      5. 
            4
            

            

              let(:user) { create(:user) }
          
        6. 
        
        
      
        
        
          
      6. 
            
            

            

            
          
        7. 
        
        
      
        
        
          
      7. 
            1
            

            

              before do
          
        8. 
        
        
      
        
        
          
      8. 
            3
            

            

                sign_in(user)
          
        9. 
        
        
      
        
        
          
      9. 
            
            

            

            
          
        10. 
        
        
      
        
        
          
      10. 
            3
            

            

                visit edit_user_path(user.id)
          
        11. 
        
        
      
        
        
          
      11. 
            
            

            

            
          
        12. 
        
        
      
        
        
          
      12. 
            3
            

            

                click_link I18n.t('settings.privacy')
          
        13. 
        
        
      
        
        
          
      13. 
            
            

            

              end
          
        14. 
        
        
      
        
        
          
      14. 
            
            

            

            
          
        15. 
        
        
      
        
        
          
      15. 
            1
            

            

              describe '#email_change' do
          
        16. 
        
        
      
        
        
          
      16. 
            1
            

            

                it 'change email' do
          
        17. 
        
        
      
        
        
          
      17. 
            1
            

            

                  within('div', id: 'email') do
          
        18. 
        
        
      
        
        
          
      18. 
            1
            

            

                    fill_in :email, with: FFaker::Internet.email
          
        19. 
        
        
      
        
        
          
      19. 
            
            

            

            
          
        20. 
        
        
      
        
        
          
      20. 
            1
            

            

                    click_on I18n.t('settings.save')
          
        21. 
        
        
      
        
        
          
      21. 
            
            

            

                  end
          
        22. 
        
        
      
        
        
          
      22. 
            
            

            

            
          
        23. 
        
        
      
        
        
          
      23. 
            1
            

            

                  user.confirm
          
        24. 
        
        
      
        
        
          
      24. 
            
            

            

            
          
        25. 
        
        
      
        
        
          
      25. 
            1
            

            

                  expect(page).to have_content(I18n.t('settings.message.update'))
          
        26. 
        
        
      
        
        
          
      26. 
            
            

            

                end
          
        27. 
        
        
      
        
        
          
      27. 
            
            

            

              end
          
        28. 
        
        
      
        
        
          
      28. 
            
            

            

            
          
        29. 
        
        
      
        
        
          
      29. 
            1
            

            

              describe '#password_change' do
          
        30. 
        
        
      
        
        
          
      30. 
            1
            

            

                context 'when error' do
          
        31. 
        
        
      
        
        
          
      31. 
            1
            

            

                  it 'didnt change password' do
          
        32. 
        
        
      
        
        
          
      32. 
            1
            

            

                    within('div', id: 'password') do
          
        33. 
        
        
      
        
        
          
      33. 
            1
            

            

                      fill_in :current_password, with: user.password
          
        34. 
        
        
      
        
        
          
      34. 
            1
            

            

                      fill_in :password, with: 'newPassword'
          
        35. 
        
        
      
        
        
          
      35. 
            1
            

            

                      fill_in :password_confirmation, with: 'incorrectPassword'
          
        36. 
        
        
      
        
        
          
      36. 
            
            

            

            
          
        37. 
        
        
      
        
        
          
      37. 
            1
            

            

                      click_on I18n.t('settings.save')
          
        38. 
        
        
      
        
        
          
      38. 
            
            

            

                    end
          
        39. 
        
        
      
        
        
          
      39. 
            
            

            

            
          
        40. 
        
        
      
        
        
          
      40. 
            1
            

            

                    user.confirm
          
        41. 
        
        
      
        
        
          
      41. 
            
            

            

            
          
        42. 
        
        
      
        
        
          
      42. 
            1
            

            

                    expect(page).to have_content(I18n.t('settings.error.error'))
          
        43. 
        
        
      
        
        
          
      43. 
            
            

            

                  end
          
        44. 
        
        
      
        
        
          
      44. 
            
            

            

                end
          
        45. 
        
        
      
        
        
          
      45. 
            
            

            

            
          
        46. 
        
        
      
        
        
          
      46. 
            1
            

            

                context 'when successful' do
          
        47. 
        
        
      
        
        
          
      47. 
            1
            

            

                  it 'didnt change password' do
          
        48. 
        
        
      
        
        
          
      48. 
            1
            

            

                    within('div', id: 'password') do
          
        49. 
        
        
      
        
        
          
      49. 
            1
            

            

                      fill_in :current_password, with: user.password
          
        50. 
        
        
      
        
        
          
      50. 
            1
            

            

                      fill_in :password, with: 'newPassword'
          
        51. 
        
        
      
        
        
          
      51. 
            1
            

            

                      fill_in :password_confirmation, with: 'newPassword'
          
        52. 
        
        
      
        
        
          
      52. 
            
            

            

            
          
        53. 
        
        
      
        
        
          
      53. 
            1
            

            

                      click_on I18n.t('settings.save')
          
        54. 
        
        
      
        
        
          
      54. 
            
            

            

                    end
          
        55. 
        
        
      
        
        
          
      55. 
            
            

            

            
          
        56. 
        
        
      
        
        
          
      56. 
            1
            

            

                    user.confirm
          
        57. 
        
        
      
        
        
          
      57. 
            
            

            

            
          
        58. 
        
        
      
        
        
          
      58. 
            1
            

            

                    expect(page).to have_content(I18n.t('devise.failure.unauthenticated'))
          
        59. 
        
        
      
        
        
          
      59. 
            
            

            

                  end
          
        60. 
        
        
      
        
        
          
      60. 
            
            

            

                end
          
        61. 
        
        
      
        
        
          
      61. 
            
            

            

              end
          
        62. 
        
        
      
        
        
          
      62. 
            
            

            

            end
          
        63. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/feature/shipping_spec.rb
      
    
      
      
  73.08%


      lines covered
    
      

    

    
      
      26 relevant lines.
      19 lines covered and
      7 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            RSpec.describe 'Shipping', type: :feature do
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

              include_context 'with api request authentication helper methods'
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

              include_context 'with api request global before and after hooks'
          
        4. 
        
        
      
        
        
          
      4. 
            
            

            

            
          
        5. 
        
        
      
        
        
          
      5. 
            2
            

            

              let(:user) { FactoryBot.create(:user) }
          
        6. 
        
        
      
        
        
          
      6. 
            1
            

            

              let(:attributes_for) { attributes_for(:shipping) }
          
        7. 
        
        
      
        
        
          
      7. 
            
            

            

            
          
        8. 
        
        
      
        
        
          
      8. 
            1
            

            

              describe '#fill_in', js: true do
          
        9. 
        
        
      
        
        
          
      9. 
            1
            

            

                it 'fill in shipping' do
          
        10. 
        
        
      
        
        
          
      10. 
            1
            

            

                  sign_in(user)
          
        11. 
        
        
      
        
        
          
      11. 
            
            

            

            
          
        12. 
        
        
      
        
        
          
      12. 
            1
            

            

                  visit edit_user_path(user.id)
          
        13. 
        
        
      
        
        
          
      13. 
            
            

            

            
          
        14. 
        
        
      
        
        
          
      14. 
            1
            

            

                  within('div#shipping.col-md-5.mb-40') do
          
        15. 
        
        
      
        
        
          
      15. 
            1
            

            

                    find_all('div', class: 'form-group')[0] do
          
        16. 
        
        
      
        
        
          
      16. 
            
            

            

                      fill_in :first_name, with: attributes_for[:first_name]
          
        17. 
        
        
      
        
        
          
      17. 
            
            

            

                    end
          
        18. 
        
        
      
        
        
          
      18. 
            1
            

            

                    find_all('div', class: 'form-group')[1] do
          
        19. 
        
        
      
        
        
          
      19. 
            
            

            

                      fill_in :last_name, with: attributes_for[:last_name]
          
        20. 
        
        
      
        
        
          
      20. 
            
            

            

                    end
          
        21. 
        
        
      
        
        
          
      21. 
            1
            

            

                    find_all('div', class: 'form-group')[2] do
          
        22. 
        
        
      
        
        
          
      22. 
            
            

            

                      fill_in :address, with: attributes_for[:address]
          
        23. 
        
        
      
        
        
          
      23. 
            
            

            

                    end
          
        24. 
        
        
      
        
        
          
      24. 
            1
            

            

                    find_all('div', class: 'form-group')[3] do
          
        25. 
        
        
      
        
        
          
      25. 
            
            

            

                      fill_in :city, with: attributes_for[:city]
          
        26. 
        
        
      
        
        
          
      26. 
            
            

            

                    end
          
        27. 
        
        
      
        
        
          
      27. 
            1
            

            

                    find_all('div', class: 'form-group')[4] do
          
        28. 
        
        
      
        
        
          
      28. 
            
            

            

                      fill_in :zip, with: attributes_for[:zip]
          
        29. 
        
        
      
        
        
          
      29. 
            
            

            

                    end
          
        30. 
        
        
      
        
        
          
      30. 
            1
            

            

                    find_all('div', class: 'form-group')[5] do
          
        31. 
        
        
      
        
        
          
      31. 
            
            

            

                      fill_in :country, with: attributes_for[:country]
          
        32. 
        
        
      
        
        
          
      32. 
            
            

            

                    end
          
        33. 
        
        
      
        
        
          
      33. 
            1
            

            

                    find_all('div', class: 'form-group')[6] do
          
        34. 
        
        
      
        
        
          
      34. 
            
            

            

                      fill_in :phone, with: attributes_for[:phone]
          
        35. 
        
        
      
        
        
          
      35. 
            
            

            

                    end
          
        36. 
        
        
      
        
        
          
      36. 
            1
            

            

                    click_on I18n.t('settings.save')
          
        37. 
        
        
      
        
        
          
      37. 
            
            

            

                  end
          
        38. 
        
        
      
        
        
          
      38. 
            
            

            

            
          
        39. 
        
        
      
        
        
          
      39. 
            1
            

            

                  expect(page).to have_content(I18n.t('settings.message.update'))
          
        40. 
        
        
      
        
        
          
      40. 
            
            

            

                end
          
        41. 
        
        
      
        
        
          
      41. 
            
            

            

              end
          
        42. 
        
        
      
        
        
          
      42. 
            
            

            

            end
          
        43. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/feature/user_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      42 relevant lines.
      42 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            RSpec.describe 'User', type: :feature do
          
        2. 
        
        
      
        
        
          
      2. 
            2
            

            

              let(:user) { build(:user, email: 'test.rspec@rspec.ua') }
          
        3. 
        
        
      
        
        
          
      3. 
            3
            

            

              let(:user_second) { create(:user, email: 'test.rspec-test@rspec.ua') }
          
        4. 
        
        
      
        
        
          
      4. 
            
            

            

            
          
        5. 
        
        
      
        
        
          
      5. 
            1
            

            

              describe '#sing_up' do
          
        6. 
        
        
      
        
        
          
      6. 
            1
            

            

                context 'when successfully sing_up' do
          
        7. 
        
        
      
        
        
          
      7. 
            1
            

            

                  before do
          
        8. 
        
        
      
        
        
          
      8. 
            1
            

            

                    visit new_user_registration_path
          
        9. 
        
        
      
        
        
          
      9. 
            
            

            

            
          
        10. 
        
        
      
        
        
          
      10. 
            1
            

            

                    within 'form', class: 'new_user', id: 'new_user' do
          
        11. 
        
        
      
        
        
          
      11. 
            1
            

            

                      fill_in 'user_email', with: user.email
          
        12. 
        
        
      
        
        
          
      12. 
            1
            

            

                      fill_in 'user_password', with: user.password
          
        13. 
        
        
      
        
        
          
      13. 
            1
            

            

                      fill_in 'user_password_confirmation', with: user.password
          
        14. 
        
        
      
        
        
          
      14. 
            
            

            

            
          
        15. 
        
        
      
        
        
          
      15. 
            1
            

            

                      click_on I18n.t('header.sing_up')
          
        16. 
        
        
      
        
        
          
      16. 
            
            

            

                    end
          
        17. 
        
        
      
        
        
          
      17. 
            
            

            

                  end
          
        18. 
        
        
      
        
        
          
      18. 
            
            

            

            
          
        19. 
        
        
      
        
        
          
      19. 
            1
            

            

                  it 'sing_up user' do
          
        20. 
        
        
      
        
        
          
      20. 
            1
            

            

                    expect(page).to have_text I18n.t('devise.registrations.signed_up_but_unconfirmed')
          
        21. 
        
        
      
        
        
          
      21. 
            
            

            

                  end
          
        22. 
        
        
      
        
        
          
      22. 
            
            

            

                end
          
        23. 
        
        
      
        
        
          
      23. 
            
            

            

            
          
        24. 
        
        
      
        
        
          
      24. 
            1
            

            

                context 'when unsuccessfully sing_up' do
          
        25. 
        
        
      
        
        
          
      25. 
            1
            

            

                  it 'didn`t sing_up' do
          
        26. 
        
        
      
        
        
          
      26. 
            1
            

            

                    visit new_user_registration_path
          
        27. 
        
        
      
        
        
          
      27. 
            
            

            

            
          
        28. 
        
        
      
        
        
          
      28. 
            1
            

            

                    within 'form', class: 'new_user', id: 'new_user' do
          
        29. 
        
        
      
        
        
          
      29. 
            1
            

            

                      fill_in 'user_email', with: FFaker::Internet.email
          
        30. 
        
        
      
        
        
          
      30. 
            1
            

            

                      fill_in 'user_password', with: 'wrong'
          
        31. 
        
        
      
        
        
          
      31. 
            1
            

            

                      fill_in 'user_password_confirmation', with: 'wrong'
          
        32. 
        
        
      
        
        
          
      32. 
            
            

            

            
          
        33. 
        
        
      
        
        
          
      33. 
            1
            

            

                      click_on I18n.t('header.sing_up')
          
        34. 
        
        
      
        
        
          
      34. 
            
            

            

                    end
          
        35. 
        
        
      
        
        
          
      35. 
            
            

            

            
          
        36. 
        
        
      
        
        
          
      36. 
            1
            

            

                    expect(page).to have_text '1 error prohibited this user from being saved'
          
        37. 
        
        
      
        
        
          
      37. 
            
            

            

                  end
          
        38. 
        
        
      
        
        
          
      38. 
            
            

            

                end
          
        39. 
        
        
      
        
        
          
      39. 
            
            

            

              end
          
        40. 
        
        
      
        
        
          
      40. 
            
            

            

            
          
        41. 
        
        
      
        
        
          
      41. 
            1
            

            

              describe '#login' do
          
        42. 
        
        
      
        
        
          
      42. 
            1
            

            

                before do
          
        43. 
        
        
      
        
        
          
      43. 
            2
            

            

                  user_second.confirm
          
        44. 
        
        
      
        
        
          
      44. 
            
            

            

                end
          
        45. 
        
        
      
        
        
          
      45. 
            
            

            

            
          
        46. 
        
        
      
        
        
          
      46. 
            1
            

            

                context 'when successfully login' do
          
        47. 
        
        
      
        
        
          
      47. 
            1
            

            

                  it 'login' do
          
        48. 
        
        
      
        
        
          
      48. 
            1
            

            

                    visit new_user_session_path
          
        49. 
        
        
      
        
        
          
      49. 
            
            

            

            
          
        50. 
        
        
      
        
        
          
      50. 
            1
            

            

                    within 'form', class: 'new_user', id: 'new_user' do
          
        51. 
        
        
      
        
        
          
      51. 
            1
            

            

                      fill_in 'user_email', with: user_second.email
          
        52. 
        
        
      
        
        
          
      52. 
            1
            

            

                      fill_in 'user_password', with: user_second.password
          
        53. 
        
        
      
        
        
          
      53. 
            
            

            

            
          
        54. 
        
        
      
        
        
          
      54. 
            1
            

            

                      click_on I18n.t('header.log_in')
          
        55. 
        
        
      
        
        
          
      55. 
            
            

            

                    end
          
        56. 
        
        
      
        
        
          
      56. 
            
            

            

            
          
        57. 
        
        
      
        
        
          
      57. 
            1
            

            

                    expect(page).to have_text I18n.t('devise.sessions.signed_in')
          
        58. 
        
        
      
        
        
          
      58. 
            
            

            

                  end
          
        59. 
        
        
      
        
        
          
      59. 
            
            

            

                end
          
        60. 
        
        
      
        
        
          
      60. 
            
            

            

            
          
        61. 
        
        
      
        
        
          
      61. 
            1
            

            

                context 'when unsuccessfully login' do
          
        62. 
        
        
      
        
        
          
      62. 
            1
            

            

                  it 'didn`t login' do
          
        63. 
        
        
      
        
        
          
      63. 
            1
            

            

                    visit new_user_session_path
          
        64. 
        
        
      
        
        
          
      64. 
            
            

            

            
          
        65. 
        
        
      
        
        
          
      65. 
            1
            

            

                    within 'form', class: 'new_user', id: 'new_user' do
          
        66. 
        
        
      
        
        
          
      66. 
            1
            

            

                      fill_in 'user_email', with: user_second.email
          
        67. 
        
        
      
        
        
          
      67. 
            1
            

            

                      fill_in 'user_password', with: 'wrong_password'
          
        68. 
        
        
      
        
        
          
      68. 
            
            

            

            
          
        69. 
        
        
      
        
        
          
      69. 
            1
            

            

                      click_on I18n.t('header.log_in')
          
        70. 
        
        
      
        
        
          
      70. 
            
            

            

                    end
          
        71. 
        
        
      
        
        
          
      71. 
            
            

            

            
          
        72. 
        
        
      
        
        
          
      72. 
            1
            

            

                    expect(page).to have_text 'Invalid Email or password.'
          
        73. 
        
        
      
        
        
          
      73. 
            
            

            

                  end
          
        74. 
        
        
      
        
        
          
      74. 
            
            

            

                end
          
        75. 
        
        
      
        
        
          
      75. 
            
            

            

              end
          
        76. 
        
        
      
        
        
          
      76. 
            
            

            

            end
          
        77. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/models/admin_user_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      5 relevant lines.
      5 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            require 'rails_helper'
          
        2. 
        
        
      
        
        
          
      2. 
            
            

            

            
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

            RSpec.describe AdminUser, type: :model do
          
        4. 
        
        
      
        
        
          
      4. 
            1
            

            

              context 'when validations' do
          
        5. 
        
        
      
        
        
          
      5. 
            2
            

            

                it { is_expected.to validate_presence_of(:email) }
          
        6. 
        
        
      
        
        
          
      6. 
            2
            

            

                it { is_expected.to validate_presence_of(:password) }
          
        7. 
        
        
      
        
        
          
      7. 
            
            

            

              end
          
        8. 
        
        
      
        
        
          
      8. 
            
            

            

            end
          
        9. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/models/author_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      8 relevant lines.
      8 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            RSpec.describe Author, type: :model do
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

              describe 'author' do
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

                context 'when validations' do
          
        4. 
        
        
      
        
        
          
      4. 
            2
            

            

                  it { is_expected.to validate_presence_of(:first_name) }
          
        5. 
        
        
      
        
        
          
      5. 
            2
            

            

                  it { is_expected.to validate_presence_of(:last_name) }
          
        6. 
        
        
      
        
        
          
      6. 
            
            

            

                end
          
        7. 
        
        
      
        
        
          
      7. 
            
            

            

            
          
        8. 
        
        
      
        
        
          
      8. 
            1
            

            

                context 'when associations' do
          
        9. 
        
        
      
        
        
          
      9. 
            2
            

            

                  it { is_expected.to have_many(:authors_books).dependent(:destroy) }
          
        10. 
        
        
      
        
        
          
      10. 
            2
            

            

                  it { is_expected.to have_many(:books).through(:authors_books) }
          
        11. 
        
        
      
        
        
          
      11. 
            
            

            

                end
          
        12. 
        
        
      
        
        
          
      12. 
            
            

            

              end
          
        13. 
        
        
      
        
        
          
      13. 
            
            

            

            end
          
        14. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/models/authors_book_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      8 relevant lines.
      8 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            RSpec.describe AuthorsBook, type: :model do
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

              describe 'authors_book' do
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

                context 'when validations' do
          
        4. 
        
        
      
        
        
          
      4. 
            2
            

            

                  it { is_expected.to validate_presence_of(:book) }
          
        5. 
        
        
      
        
        
          
      5. 
            2
            

            

                  it { is_expected.to validate_presence_of(:author) }
          
        6. 
        
        
      
        
        
          
      6. 
            
            

            

                end
          
        7. 
        
        
      
        
        
          
      7. 
            
            

            

            
          
        8. 
        
        
      
        
        
          
      8. 
            1
            

            

                context 'when associations' do
          
        9. 
        
        
      
        
        
          
      9. 
            2
            

            

                  it { is_expected.to belong_to(:author) }
          
        10. 
        
        
      
        
        
          
      10. 
            2
            

            

                  it { is_expected.to belong_to(:book) }
          
        11. 
        
        
      
        
        
          
      11. 
            
            

            

                end
          
        12. 
        
        
      
        
        
          
      12. 
            
            

            

              end
          
        13. 
        
        
      
        
        
          
      13. 
            
            

            

            end
          
        14. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/models/billing_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      20 relevant lines.
      20 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            RSpec.describe Billing, type: :model do
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

              describe 'billing' do
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

                context 'when validations' do
          
        4. 
        
        
      
        
        
          
      4. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::Name.first_name).for(:first_name) }
          
        5. 
        
        
      
        
        
          
      5. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::Name.first_name).for(:last_name) }
          
        6. 
        
        
      
        
        
          
      6. 
            2
            

            

                  it { is_expected.to allow_values('+919367788755', '8989829304', '+16308520397', '786-307-3615').for(:phone) }
          
        7. 
        
        
      
        
        
          
      7. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::AddressUK.country).for(:country) }
          
        8. 
        
        
      
        
        
          
      8. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::AddressUK.city).for(:city) }
          
        9. 
        
        
      
        
        
          
      9. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::AddressUA.zip_code).for(:zip) }
          
        10. 
        
        
      
        
        
          
      10. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::Address.street_address).for(:address) }
          
        11. 
        
        
      
        
        
          
      11. 
            
            

            

                end
          
        12. 
        
        
      
        
        
          
      12. 
            
            

            

            
          
        13. 
        
        
      
        
        
          
      13. 
            1
            

            

                context 'when not validations' do
          
        14. 
        
        
      
        
        
          
      14. 
            2
            

            

                  it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:first_name) }
          
        15. 
        
        
      
        
        
          
      15. 
            2
            

            

                  it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:last_name) }
          
        16. 
        
        
      
        
        
          
      16. 
            2
            

            

                  it { is_expected.not_to allow_values('789', '123765', '1-1-1', '+982').for(:phone) }
          
        17. 
        
        
      
        
        
          
      17. 
            2
            

            

                  it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:country) }
          
        18. 
        
        
      
        
        
          
      18. 
            2
            

            

                  it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:city) }
          
        19. 
        
        
      
        
        
          
      19. 
            2
            

            

                  it { is_expected.not_to allow_values('1' * Constants::VALIDATES_ZIP_LENGTH_MAX.next).for(:zip) }
          
        20. 
        
        
      
        
        
          
      20. 
            2
            

            

                  it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:address) }
          
        21. 
        
        
      
        
        
          
      21. 
            
            

            

                end
          
        22. 
        
        
      
        
        
          
      22. 
            
            

            

            
          
        23. 
        
        
      
        
        
          
      23. 
            1
            

            

                context 'when associations' do
          
        24. 
        
        
      
        
        
          
      24. 
            2
            

            

                  it { is_expected.to belong_to(:user) }
          
        25. 
        
        
      
        
        
          
      25. 
            
            

            

                end
          
        26. 
        
        
      
        
        
          
      26. 
            
            

            

              end
          
        27. 
        
        
      
        
        
          
      27. 
            
            

            

            end
          
        28. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/models/book_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      16 relevant lines.
      16 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            RSpec.describe Book, type: :model do
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

              describe 'books' do
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

                context 'when validations' do
          
        4. 
        
        
      
        
        
          
      4. 
            2
            

            

                  it { is_expected.to validate_presence_of(:title) }
          
        5. 
        
        
      
        
        
          
      5. 
            2
            

            

                  it { is_expected.to validate_presence_of(:description) }
          
        6. 
        
        
      
        
        
          
      6. 
            2
            

            

                  it { is_expected.to allow_values(Constants::MIN_PRICE_IN_CENTS, Constants::MAX_PRICE_IN_CENTS).for(:price_cents) }
          
        7. 
        
        
      
        
        
          
      7. 
            2
            

            

                  it { is_expected.to validate_presence_of(:year_of_publication) }
          
        8. 
        
        
      
        
        
          
      8. 
            2
            

            

                  it { is_expected.to validate_presence_of(:quantity) }
          
        9. 
        
        
      
        
        
          
      9. 
            2
            

            

                  it { is_expected.to validate_presence_of(:materials) }
          
        10. 
        
        
      
        
        
          
      10. 
            2
            

            

                  it { is_expected.to validate_presence_of(:dimensions) }
          
        11. 
        
        
      
        
        
          
      11. 
            
            

            

                end
          
        12. 
        
        
      
        
        
          
      12. 
            
            

            

            
          
        13. 
        
        
      
        
        
          
      13. 
            1
            

            

                context 'when associations' do
          
        14. 
        
        
      
        
        
          
      14. 
            2
            

            

                  it { is_expected.to have_many(:authors_books).dependent(:destroy) }
          
        15. 
        
        
      
        
        
          
      15. 
            2
            

            

                  it { is_expected.to have_many(:authors).through(:authors_books) }
          
        16. 
        
        
      
        
        
          
      16. 
            
            

            

            
          
        17. 
        
        
      
        
        
          
      17. 
            2
            

            

                  it { is_expected.to have_many(:books_categories).dependent(:destroy) }
          
        18. 
        
        
      
        
        
          
      18. 
            2
            

            

                  it { is_expected.to have_many(:categories).through(:books_categories) }
          
        19. 
        
        
      
        
        
          
      19. 
            
            

            

            
          
        20. 
        
        
      
        
        
          
      20. 
            2
            

            

                  it { is_expected.to have_many(:reviews).dependent(:destroy) }
          
        21. 
        
        
      
        
        
          
      21. 
            
            

            

                end
          
        22. 
        
        
      
        
        
          
      22. 
            
            

            

              end
          
        23. 
        
        
      
        
        
          
      23. 
            
            

            

            end
          
        24. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/models/books_category_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      8 relevant lines.
      8 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            RSpec.describe BooksCategory, type: :model do
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

              describe 'books_categories' do
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

                context 'when validations' do
          
        4. 
        
        
      
        
        
          
      4. 
            2
            

            

                  it { is_expected.to validate_presence_of(:book) }
          
        5. 
        
        
      
        
        
          
      5. 
            2
            

            

                  it { is_expected.to validate_presence_of(:category) }
          
        6. 
        
        
      
        
        
          
      6. 
            
            

            

                end
          
        7. 
        
        
      
        
        
          
      7. 
            
            

            

            
          
        8. 
        
        
      
        
        
          
      8. 
            1
            

            

                context 'when associations' do
          
        9. 
        
        
      
        
        
          
      9. 
            2
            

            

                  it { is_expected.to belong_to(:category) }
          
        10. 
        
        
      
        
        
          
      10. 
            2
            

            

                  it { is_expected.to belong_to(:book) }
          
        11. 
        
        
      
        
        
          
      11. 
            
            

            

                end
          
        12. 
        
        
      
        
        
          
      12. 
            
            

            

              end
          
        13. 
        
        
      
        
        
          
      13. 
            
            

            

            end
          
        14. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/models/category_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      7 relevant lines.
      7 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            RSpec.describe Category, type: :model do
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

              describe 'category' do
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

                context 'when validations' do
          
        4. 
        
        
      
        
        
          
      4. 
            2
            

            

                  it { is_expected.to validate_presence_of(:name) }
          
        5. 
        
        
      
        
        
          
      5. 
            
            

            

                end
          
        6. 
        
        
      
        
        
          
      6. 
            
            

            

            
          
        7. 
        
        
      
        
        
          
      7. 
            1
            

            

                context 'when associations' do
          
        8. 
        
        
      
        
        
          
      8. 
            2
            

            

                  it { is_expected.to have_many(:books_categories).dependent(:destroy) }
          
        9. 
        
        
      
        
        
          
      9. 
            2
            

            

                  it { is_expected.to have_many(:books).through(:books_categories) }
          
        10. 
        
        
      
        
        
          
      10. 
            
            

            

                end
          
        11. 
        
        
      
        
        
          
      11. 
            
            

            

              end
          
        12. 
        
        
      
        
        
          
      12. 
            
            

            

            end
          
        13. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/models/order_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      6 relevant lines.
      6 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            require 'rails_helper'
          
        2. 
        
        
      
        
        
          
      2. 
            
            

            

            
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

            RSpec.describe Order, type: :model do
          
        4. 
        
        
      
        
        
          
      4. 
            1
            

            

              describe 'order' do
          
        5. 
        
        
      
        
        
          
      5. 
            1
            

            

                context 'when associations' do
          
        6. 
        
        
      
        
        
          
      6. 
            2
            

            

                  it { is_expected.to have_many(:order_books).dependent(:destroy) }
          
        7. 
        
        
      
        
        
          
      7. 
            2
            

            

                  it { is_expected.to have_many(:books).through(:order_books) }
          
        8. 
        
        
      
        
        
          
      8. 
            
            

            

                end
          
        9. 
        
        
      
        
        
          
      9. 
            
            

            

              end
          
        10. 
        
        
      
        
        
          
      10. 
            
            

            

            end
          
        11. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/models/review_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      14 relevant lines.
      14 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            require 'rails_helper'
          
        2. 
        
        
      
        
        
          
      2. 
            
            

            

            
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

            RSpec.describe Review, type: :model do
          
        4. 
        
        
      
        
        
          
      4. 
            1
            

            

              describe 'review' do
          
        5. 
        
        
      
        
        
          
      5. 
            1
            

            

                context 'when validations' do
          
        6. 
        
        
      
        
        
          
      6. 
            2
            

            

                  it { is_expected.to validate_presence_of(:title) }
          
        7. 
        
        
      
        
        
          
      7. 
            2
            

            

                  it { is_expected.to validate_presence_of(:body) }
          
        8. 
        
        
      
        
        
          
      8. 
            2
            

            

                  it { is_expected.to validate_presence_of(:rating) }
          
        9. 
        
        
      
        
        
          
      9. 
            2
            

            

                  it { is_expected.to validate_presence_of(:verified) }
          
        10. 
        
        
      
        
        
          
      10. 
            2
            

            

                  it { is_expected.to allow_values('a' * Constants::VALIDATES_TITLE_LENGTH_MAX).for(:title) }
          
        11. 
        
        
      
        
        
          
      11. 
            2
            

            

                  it { is_expected.to allow_values('a' * Constants::VALIDATES_TEXT_LENGTH_MAX).for(:body) }
          
        12. 
        
        
      
        
        
          
      12. 
            2
            

            

                  it { is_expected.to allow_values(1, 2, 3, 4, 5).for(:rating) }
          
        13. 
        
        
      
        
        
          
      13. 
            
            

            

                end
          
        14. 
        
        
      
        
        
          
      14. 
            
            

            

            
          
        15. 
        
        
      
        
        
          
      15. 
            1
            

            

                context 'when associations' do
          
        16. 
        
        
      
        
        
          
      16. 
            2
            

            

                  it { is_expected.to belong_to(:book) }
          
        17. 
        
        
      
        
        
          
      17. 
            2
            

            

                  it { is_expected.to belong_to(:user) }
          
        18. 
        
        
      
        
        
          
      18. 
            
            

            

                end
          
        19. 
        
        
      
        
        
          
      19. 
            
            

            

              end
          
        20. 
        
        
      
        
        
          
      20. 
            
            

            

            end
          
        21. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/models/shipping_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      20 relevant lines.
      20 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            RSpec.describe Shipping, type: :model do
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

              describe 'shipping' do
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

                context 'when validations' do
          
        4. 
        
        
      
        
        
          
      4. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::Name.first_name).for(:first_name) }
          
        5. 
        
        
      
        
        
          
      5. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::Name.first_name).for(:last_name) }
          
        6. 
        
        
      
        
        
          
      6. 
            2
            

            

                  it { is_expected.to allow_values('+919367788755', '8989829304', '+16308520397', '786-307-3615').for(:phone) }
          
        7. 
        
        
      
        
        
          
      7. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::AddressUK.country).for(:country) }
          
        8. 
        
        
      
        
        
          
      8. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::AddressUK.city).for(:city) }
          
        9. 
        
        
      
        
        
          
      9. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::AddressUA.zip_code).for(:zip) }
          
        10. 
        
        
      
        
        
          
      10. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::Address.street_address).for(:address) }
          
        11. 
        
        
      
        
        
          
      11. 
            
            

            

                end
          
        12. 
        
        
      
        
        
          
      12. 
            
            

            

            
          
        13. 
        
        
      
        
        
          
      13. 
            1
            

            

                context 'when not validations' do
          
        14. 
        
        
      
        
        
          
      14. 
            2
            

            

                  it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:first_name) }
          
        15. 
        
        
      
        
        
          
      15. 
            2
            

            

                  it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:last_name) }
          
        16. 
        
        
      
        
        
          
      16. 
            2
            

            

                  it { is_expected.not_to allow_values('789', '123765', '1-1-1', '+982').for(:phone) }
          
        17. 
        
        
      
        
        
          
      17. 
            2
            

            

                  it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:country) }
          
        18. 
        
        
      
        
        
          
      18. 
            2
            

            

                  it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:city) }
          
        19. 
        
        
      
        
        
          
      19. 
            2
            

            

                  it { is_expected.not_to allow_values('1' * Constants::VALIDATES_ZIP_LENGTH_MAX.next).for(:zip) }
          
        20. 
        
        
      
        
        
          
      20. 
            2
            

            

                  it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:address) }
          
        21. 
        
        
      
        
        
          
      21. 
            
            

            

                end
          
        22. 
        
        
      
        
        
          
      22. 
            
            

            

            
          
        23. 
        
        
      
        
        
          
      23. 
            1
            

            

                context 'when associations' do
          
        24. 
        
        
      
        
        
          
      24. 
            2
            

            

                  it { is_expected.to belong_to(:user) }
          
        25. 
        
        
      
        
        
          
      25. 
            
            

            

                end
          
        26. 
        
        
      
        
        
          
      26. 
            
            

            

              end
          
        27. 
        
        
      
        
        
          
      27. 
            
            

            

            end
          
        28. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/models/user_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      8 relevant lines.
      8 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            RSpec.describe User, type: :model do
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

              describe 'author' do
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

                context 'when validations' do
          
        4. 
        
        
      
        
        
          
      4. 
            2
            

            

                  it { is_expected.to validate_presence_of(:email) }
          
        5. 
        
        
      
        
        
          
      5. 
            2
            

            

                  it { is_expected.to validate_presence_of(:password) }
          
        6. 
        
        
      
        
        
          
      6. 
            
            

            

                end
          
        7. 
        
        
      
        
        
          
      7. 
            
            

            

            
          
        8. 
        
        
      
        
        
          
      8. 
            1
            

            

                context 'with associations' do
          
        9. 
        
        
      
        
        
          
      9. 
            2
            

            

                  it { is_expected.to have_one(:billing) }
          
        10. 
        
        
      
        
        
          
      10. 
            2
            

            

                  it { is_expected.to have_one(:shipping) }
          
        11. 
        
        
      
        
        
          
      11. 
            
            

            

                end
          
        12. 
        
        
      
        
        
          
      12. 
            
            

            

              end
          
        13. 
        
        
      
        
        
          
      13. 
            
            

            

            end
          
        14. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/queryes/book_query_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      45 relevant lines.
      45 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            require 'rails_helper'
          
        2. 
        
        
      
        
        
          
      2. 
            
            

            

            
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

            RSpec.describe BookQuery do
          
        4. 
        
        
      
        
        
          
      4. 
            1
            

            

              shared_examples 'sort test' do
          
        5. 
        
        
      
        
        
          
      5. 
            5
            

            

                it 'sort' do
          
        6. 
        
        
      
        
        
          
      6. 
            5
            

            

                  books
          
        7. 
        
        
      
        
        
          
      7. 
            5
            

            

                  expect(test).to eq(result)
          
        8. 
        
        
      
        
        
          
      8. 
            
            

            

                end
          
        9. 
        
        
      
        
        
          
      9. 
            
            

            

              end
          
        10. 
        
        
      
        
        
          
      10. 
            
            

            

            
          
        11. 
        
        
      
        
        
          
      11. 
            3
            

            

              let(:titles) { %w[Adam Zimbabwe] }
          
        12. 
        
        
      
        
        
          
      12. 
            1
            

            

              let(:books_dates) do
          
        13. 
        
        
      
        
        
          
      13. 
            1
            

            

                ['Thu, 25 Aug 2022 15:25:38.761014000 UTC +00:00', 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00']
          
        14. 
        
        
      
        
        
          
      14. 
            
            

            

              end
          
        15. 
        
        
      
        
        
          
      15. 
            
            

            

            
          
        16. 
        
        
      
        
        
          
      16. 
            1
            

            

              describe 'all books sort' do
          
        17. 
        
        
      
        
        
          
      17. 
            1
            

            

                context 'when sort by title A to Z' do
          
        18. 
        
        
      
        
        
          
      18. 
            1
            

            

                  let(:books) do
          
        19. 
        
        
      
        
        
          
      19. 
            1
            

            

                    create(:book, title: titles.first)
          
        20. 
        
        
      
        
        
          
      20. 
            1
            

            

                    create(:book, title: titles.second)
          
        21. 
        
        
      
        
        
          
      21. 
            
            

            

                  end
          
        22. 
        
        
      
        
        
          
      22. 
            
            

            

            
          
        23. 
        
        
      
        
        
          
      23. 
            2
            

            

                  let(:result) { titles.second }
          
        24. 
        
        
      
        
        
          
      24. 
            2
            

            

                  let(:test) { described_class.query({ sort: 'title DESC' }).first.title }
          
        25. 
        
        
      
        
        
          
      25. 
            
            

            

            
          
        26. 
        
        
      
        
        
          
      26. 
            1
            

            

                  include_examples 'sort test'
          
        27. 
        
        
      
        
        
          
      27. 
            
            

            

                end
          
        28. 
        
        
      
        
        
          
      28. 
            
            

            

            
          
        29. 
        
        
      
        
        
          
      29. 
            1
            

            

                context 'when sort title Z to A' do
          
        30. 
        
        
      
        
        
          
      30. 
            1
            

            

                  let(:books) do
          
        31. 
        
        
      
        
        
          
      31. 
            1
            

            

                    create(:book, title: titles.first)
          
        32. 
        
        
      
        
        
          
      32. 
            1
            

            

                    create(:book, title: titles.second)
          
        33. 
        
        
      
        
        
          
      33. 
            
            

            

                  end
          
        34. 
        
        
      
        
        
          
      34. 
            
            

            

            
          
        35. 
        
        
      
        
        
          
      35. 
            2
            

            

                  let(:result) { titles.first }
          
        36. 
        
        
      
        
        
          
      36. 
            2
            

            

                  let(:test) { described_class.query({ sort: 'title' }).first.title }
          
        37. 
        
        
      
        
        
          
      37. 
            
            

            

            
          
        38. 
        
        
      
        
        
          
      38. 
            1
            

            

                  include_examples 'sort test'
          
        39. 
        
        
      
        
        
          
      39. 
            
            

            

                end
          
        40. 
        
        
      
        
        
          
      40. 
            
            

            

            
          
        41. 
        
        
      
        
        
          
      41. 
            1
            

            

                context 'when sort by price High to Low' do
          
        42. 
        
        
      
        
        
          
      42. 
            1
            

            

                  let(:books) do
          
        43. 
        
        
      
        
        
          
      43. 
            1
            

            

                    create(:book, price_cents: 75)
          
        44. 
        
        
      
        
        
          
      44. 
            1
            

            

                    create(:book, price_cents: 23)
          
        45. 
        
        
      
        
        
          
      45. 
            
            

            

                  end
          
        46. 
        
        
      
        
        
          
      46. 
            
            

            

            
          
        47. 
        
        
      
        
        
          
      47. 
            2
            

            

                  let(:result) { 75 }
          
        48. 
        
        
      
        
        
          
      48. 
            2
            

            

                  let(:test) { described_class.query({ sort: 'price_cents DESC' }).first.price_cents }
          
        49. 
        
        
      
        
        
          
      49. 
            
            

            

            
          
        50. 
        
        
      
        
        
          
      50. 
            1
            

            

                  include_examples 'sort test'
          
        51. 
        
        
      
        
        
          
      51. 
            
            

            

                end
          
        52. 
        
        
      
        
        
          
      52. 
            
            

            

            
          
        53. 
        
        
      
        
        
          
      53. 
            1
            

            

                context 'when sort price Low to High' do
          
        54. 
        
        
      
        
        
          
      54. 
            1
            

            

                  let(:books) do
          
        55. 
        
        
      
        
        
          
      55. 
            1
            

            

                    create(:book, price_cents: 75)
          
        56. 
        
        
      
        
        
          
      56. 
            1
            

            

                    create(:book, price_cents: 23)
          
        57. 
        
        
      
        
        
          
      57. 
            
            

            

                  end
          
        58. 
        
        
      
        
        
          
      58. 
            
            

            

            
          
        59. 
        
        
      
        
        
          
      59. 
            2
            

            

                  let(:result) { 23 }
          
        60. 
        
        
      
        
        
          
      60. 
            2
            

            

                  let(:test) { described_class.query({ sort: 'price_cents' }).first.price_cents }
          
        61. 
        
        
      
        
        
          
      61. 
            
            

            

            
          
        62. 
        
        
      
        
        
          
      62. 
            1
            

            

                  include_examples 'sort test'
          
        63. 
        
        
      
        
        
          
      63. 
            
            

            

                end
          
        64. 
        
        
      
        
        
          
      64. 
            
            

            

            
          
        65. 
        
        
      
        
        
          
      65. 
            1
            

            

                context 'when sort by Newest' do
          
        66. 
        
        
      
        
        
          
      66. 
            1
            

            

                  let(:books) do
          
        67. 
        
        
      
        
        
          
      67. 
            1
            

            

                    create(:book, created_at: books_dates.first)
          
        68. 
        
        
      
        
        
          
      68. 
            1
            

            

                    create(:book, created_at: books_dates.second)
          
        69. 
        
        
      
        
        
          
      69. 
            
            

            

                  end
          
        70. 
        
        
      
        
        
          
      70. 
            
            

            

            
          
        71. 
        
        
      
        
        
          
      71. 
            2
            

            

                  let(:result) { books_dates.first }
          
        72. 
        
        
      
        
        
          
      72. 
            2
            

            

                  let(:test) { described_class.query({ sort: 'created_at DESC' }).first.created_at }
          
        73. 
        
        
      
        
        
          
      73. 
            
            

            

            
          
        74. 
        
        
      
        
        
          
      74. 
            1
            

            

                  include_examples 'sort test'
          
        75. 
        
        
      
        
        
          
      75. 
            
            

            

                end
          
        76. 
        
        
      
        
        
          
      76. 
            
            

            

              end
          
        77. 
        
        
      
        
        
          
      77. 
            
            

            

            end
          
        78. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/support/configs/capybara.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      19 relevant lines.
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
      19 lines covered and
>>>>>>> a5d032d (Fix)
      0 lines missed.
=======
      7 lines covered and
      12 lines missed.
>>>>>>> 845dac1 (Manifest_cache true)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> b15044a (Manifest_cache true)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
      7 lines covered and
      12 lines missed.
=======
<<<<<<< HEAD
      19 lines covered and
      0 lines missed.
=======
      7 lines covered and
      12 lines missed.
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
=======
      19 lines covered and
      0 lines missed.
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 59d75f9 (Featire specs)
=======
=======
      7 lines covered and
      12 lines missed.
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 96aecde (Manifest_cache true)
=======
=======
      19 lines covered and
      0 lines missed.
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
=======
=======
      7 lines covered and
      12 lines missed.
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2722d07 (Manifest_cache true)
=======
=======
      19 lines covered and
      0 lines missed.
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> e54deeb (Featire specs)
=======
=======
      7 lines covered and
      12 lines missed.
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
=======
      19 lines covered and
      0 lines missed.
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
=======
      19 lines covered and
      0 lines missed.
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 3b03895 (Featire specs)
=======
=======
      7 lines covered and
      12 lines missed.
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2c640cf (Manifest_cache true)
=======
=======
      19 lines covered and
      0 lines missed.
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
=======
      19 lines covered and
      0 lines missed.
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
=======
=======
      7 lines covered and
      12 lines missed.
>>>>>>> 998f08d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b15044a (Manifest_cache true)
=======
=======
      19 lines covered and
      0 lines missed.
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
      19 lines covered and
      0 lines missed.
>>>>>>> 7c4ea7f (Fix)
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
            RSpec.describe 'Author' do
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
            Capybara.configure do |config|
=======
            
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9620751 (Featire specs)
=======
=======
            
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 59d75f9 (Featire specs)
=======
=======
            
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
=======
=======
            
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> e54deeb (Featire specs)
=======
=======
            
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 3b03895 (Featire specs)
=======
=======
            
>>>>>>> 4552227 (Featire specs)
>>>>>>> 94841b5 (Featire specs)
          
        2. 
        
        
      
        
        
          
      2. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      3. 
>>>>>>> 02a399d (Manifest_cache true)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> 4552227 (Featire specs)
=======
          
      4. 
>>>>>>> 998f08d (Manifest_cache true)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              include_context 'with api request authentication helper methods'
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
              config.asset_host = 'http://localhost:3000'
=======
            Capybara.configure do |config|
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9620751 (Featire specs)
=======
=======
            Capybara.configure do |config|
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 3b03895 (Featire specs)
=======
=======
=======
>>>>>>> 7c4ea7f (Fix)
            Capybara.configure do |config|
>>>>>>> 94841b5 (Featire specs)
          
        5. 
        
        
      
        
        
          
      5. 
            1
            

            

              config.asset_host = 'http://localhost:3000'
<<<<<<< HEAD
>>>>>>> 4552227 (Featire specs)
          
        6. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
          
      6. 
=======
          
      7. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
      8. 
>>>>>>> 4552227 (Featire specs)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
              include_context 'with api request global before and after hooks'
          
        9. 
        
        
      
        
        
          
      9. 
            
            

            

            
          
        10. 
        
        
      
        
        
          
      10. 
            2
            

            

              let(:first_name) { FFaker::Name.first_name }
          
        11. 
        
        
      
        
        
          
      11. 
            2
            

            

              let(:last_name) { FFaker::Name.last_name }
          
        12. 
        
        
      
        
        
          
      12. 
            
            

            

            
          
        13. 
        
        
      
        
        
          
      13. 
            2
            

            

              let(:new_name) { FFaker::Name.first_name }
          
        14. 
        
        
      
        
        
          
      14. 
            2
            

            

              let(:old_name) { author.first_name }
          
        15. 
        
        
      
        
        
          
      15. 
            
            

            

            
          
        16. 
        
        
      
        
        
          
      16. 
            4
            

            

              let(:author) { create(:author) }
          
        17. 
        
        
      
        
        
          
      17. 
            
            

            

            
          
        18. 
        
        
      
        
        
          
      18. 
            1
            

            

              before do
          
        19. 
        
        
      
        
        
          
      19. 
            4
            

            

                sign_in(create(:admin_user), :admin_user)
          
        20. 
        
        
      
        
        
          
      20. 
            
            

            

              end
          
        21. 
        
        
      
        
        
          
      21. 
            
            

            

            
          
        22. 
        
        
      
        
        
          
      22. 
            1
            

            

              it 'can create an author' do
          
        23. 
        
        
      
        
        
          
      23. 
            1
            

            

                visit 'admin/authors'
          
        24. 
        
        
      
        
        
          
      24. 
            
            

            

            
          
        25. 
        
        
      
        
        
          
      25. 
            1
            

            

                click_link('New Author')
          
        26. 
        
        
      
        
        
          
      26. 
            
            

            

            
          
        27. 
        
        
      
        
        
          
      27. 
            1
            

            

                fill_in 'author[first_name]', with: first_name
          
        28. 
        
        
      
        
        
          
      28. 
            1
            

            

                fill_in 'author[last_name]', with: last_name
          
        29. 
        
        
      
        
        
          
      29. 
            
            

            

            
          
        30. 
        
        
      
        
        
          
      30. 
            2
            

            

                expect { click_button('Create Author') }.to change(Author, :count).from(0).to(1)
          
        31. 
        
        
      
        
        
          
      31. 
            
            

            

              end
          
        32. 
        
        
      
        
        
          
      32. 
            
            

            

            
          
        33. 
        
        
      
        
        
          
      33. 
            1
            

            

              it 'can delete an author' do
          
        34. 
        
        
      
        
        
          
      34. 
            1
            

            

                author
          
        35. 
        
        
      
        
        
          
      35. 
            
            

            

            
          
        36. 
        
        
      
        
        
          
      36. 
            1
            

            

                visit 'admin/authors'
          
        37. 
        
        
      
        
        
          
      37. 
            
            

            

            
          
        38. 
        
        
      
        
        
          
      38. 
            2
            

            

                expect { click_link('Delete') }.to change(Author, :count).from(1).to(0)
          
        39. 
        
        
      
        
        
          
      39. 
            
            

            

              end
          
        40. 
        
        
      
        
        
          
      40. 
            
            

            

            
          
        41. 
        
        
      
        
        
          
      41. 
            1
            

            

              it 'can view an author' do
          
        42. 
        
        
      
        
        
          
      42. 
            1
            

            

                author
          
        43. 
        
        
      
        
        
          
      43. 
            
            

            

            
          
        44. 
        
        
      
        
        
          
      44. 
            1
            

            

                visit 'admin/authors'
          
        45. 
        
        
      
        
        
          
      45. 
            
            

            

            
          
        46. 
        
        
      
        
        
          
      46. 
            1
            

            

                click_link('View')
          
        47. 
        
        
      
        
        
          
      47. 
            
            

            

            
          
        48. 
        
        
      
        
        
          
      48. 
            1
            

            

                expect(page).to have_content(author.first_name)
          
        49. 
        
        
      
        
        
          
      49. 
            
            

            

              end
          
        50. 
        
        
      
        
        
          
      50. 
            
            

            

            
          
        51. 
        
        
      
        
        
          
      51. 
            1
            

            

              it 'can edit an author' do
          
        52. 
        
        
      
        
        
          
      52. 
            1
            

            

                author
          
        53. 
        
        
      
        
        
          
      53. 
            
            

            

            
          
        54. 
        
        
      
        
        
          
      54. 
            1
            

            

                visit 'admin/authors'
          
        55. 
        
        
      
        
        
          
      55. 
            
            

            

            
          
        56. 
        
        
      
        
        
          
      56. 
            1
            

            

                click_link('Edit')
          
        57. 
        
        
      
        
        
          
      57. 
            
            

            

            
          
        58. 
        
        
      
        
        
          
      58. 
            1
            

            

                fill_in 'author[first_name]', with: new_name
          
        59. 
        
        
      
        
        
          
      59. 
            
            

            

            
          
        60. 
        
        
      
        
        
          
      60. 
            4
            

            

                expect { click_button('Update Author') }.to change { author.reload.first_name }.from(old_name).to(new_name)
          
        61. 
        
        
      
        
        
          
      61. 
            
            

            

              end
          
        62. 
        
        
      
        
        
          
      62. 
            
            

            

            end
          
        63. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/feature/admin/book_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      32 relevant lines.
      32 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            RSpec.describe 'Book' do
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

              include_context 'with api request authentication helper methods'
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

              include_context 'with api request global before and after hooks'
          
        4. 
        
        
      
        
        
          
      4. 
            
            

            

            
          
        5. 
        
        
      
        
        
          
      5. 
>>>>>>> c7a726c5 (Rebased)
            5
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
          
      6. 
            5
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
=======
=======
          
      7. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      8. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
          
      9. 
            5
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      10. 
<<<<<<< HEAD
            5
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      11. 
            5
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      12. 
            5
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      13. 
            5
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      14. 
            5
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      15. 
            5
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      16. 
            1
>>>>>>> 5b7749a (Fix)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                rating { FFaker::Number.rand(0..5) }
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                rating { FFaker::Number.rand(0..5) }
=======
              let(:category_one) { FactoryBot.create(:category) }
>>>>>>> d0dc1f1 (Featire specs)
=======
              let(:category_one) { FactoryBot.create(:category) }
>>>>>>> 752f0c0 (Featire specs)
=======
              let(:category_one) { FactoryBot.create(:category) }
>>>>>>> 4e81ea2 (Featire specs)
=======
              let(:category_one) { FactoryBot.create(:category) }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
              let(:category_one) { FactoryBot.create(:category) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
              let(:category_one) { FactoryBot.create(:category) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
              let(:category_one) { FactoryBot.create(:category) }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
              let(:category_one) { FactoryBot.create(:category) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
              let(:category_one) { FactoryBot.create(:category) }
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
              let(:category_one) { FactoryBot.create(:category) }
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
                book
          
        17. 
        
        
      
        
        
          
      17. 
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      18. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
=======
          
      19. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 37e48018 (Featire specs)
=======
=======
          
      20. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
=======
          
      21. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
          
      22. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      23. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
          
      24. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
          
      25. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
          
      26. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            5
            

            

<<<<<<< HEAD
<<<<<<< HEAD
                quantity { 1 }
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 009401d (Featire specs)
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
              let(:book) { create(:book) }
=======
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
              let(:book) { create(:book) }
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
              let(:book) { create(:book) }
=======
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
              let(:book) { create(:book) }
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
              let(:category_one) { FactoryBot.create(:category) }
>>>>>>> 610b6138 (Featire specs)
          
        27. 
        
        
      
        
        
          
      27. 
            
            

            

              end
          
        28. 
        
        
      
        
        
          
      28. 
            
            

            

            end
          
        29. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/factories/orders.rb
      
    
      
      
  77.78%


      lines covered
    
      

    

    
      
      9 relevant lines.
      7 lines covered and
      2 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            FactoryBot.define do
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

              factory :order do
          
        3. 
        
        
      
        
        
          
      3. 
            5
            

            

                status { 'created' }
          
        4. 
        
        
      
        
        
          
      4. 
            
            

            

            
          
        5. 
        
        
      
        
        
          
      5. 
            1
            

            

                transient do
          
        6. 
        
        
      
        
        
          
      6. 
            1
            

            

                  books_count { 1 }
          
        7. 
        
        
      
        
        
          
      7. 
            
            

            

                end
          
        8. 
        
        
      
        
        
          
      8. 
            
            

            

            
          
        9. 
        
        
      
        
        
          
      9. 
            1
            

            

                after :create do |order, books_count|
          
        10. 
        
        
      
        
        
          
      10. 
            4
            

            

                  order.books do
          
        11. 
        
        
      
        
        
          
      11. 
            
            

            

                    Array.new(books_count) do
          
        12. 
        
        
      
        
        
          
      12. 
            
            

            

                      association(:order, books: [instance])
          
        13. 
        
        
      
        
        
          
      13. 
            
            

            

                    end
          
        14. 
        
        
      
        
        
          
      14. 
            
            

            

                  end
          
        15. 
        
        
      
        
        
          
      15. 
            
            

            

                end
          
        16. 
        
        
      
        
        
          
      16. 
            
            

            

              end
          
        17. 
        
        
      
        
        
          
      17. 
            
            

            

            end
          
        18. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/factories/reviews.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      5 relevant lines.
      5 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            FactoryBot.define do
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

              factory :review do
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

                title { FFaker::Lorem.words(5) }
          
        4. 
        
        
      
        
        
          
      4. 
            1
            

            

                rating { FFaker::Number.rand(0..5) }
>>>>>>> 5b7749a (Fix)
          
        5. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      5. 
            1
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      6. 
            1
=======
          
      7. 
            3
<<<<<<< HEAD
=======
            

            

              let(:category_two) { FactoryBot.create(:category) }
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 610b6138 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 37e48018 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      8. 
            3
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      9. 
            3
=======
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e1ecabbe (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 4e81ea2 (Featire specs)
=======
<<<<<<< HEAD
          
      10. 
            3
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      11. 
            3
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
            

            

<<<<<<< HEAD
=======
=======
=======
          
      12. 
            3
>>>>>>> 7a02bbe (Featire specs)
=======
          
      13. 
            3
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
          
      14. 
            3
>>>>>>> 4552227 (Featire specs)
=======
          
      15. 
            3
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
=======
          
      16. 
            1
>>>>>>> 5b7749a (Fix)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
                body { FFaker::Lorem.words(500) }
          
        17. 
        
        
      
        
        
          
      17. 
            
            

            

              end
          
        18. 
        
        
      
        
        
          
      18. 
            
            

            

            end
          
        19. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/factories/shippings.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      8 relevant lines.
      8 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            FactoryBot.define do
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

              factory :shipping do
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

                user
          
        4. 
        
        
      
        
        
          
      4. 
            1
            

            

                address { FFaker::AddressUA.street_address }
          
        5. 
        
        
      
        
        
          
      5. 
            1
            

            

                city { FFaker::AddressUA.city }
          
        6. 
        
        
      
        
        
          
      6. 
            1
            

            

                zip { FFaker::AddressUA.zip_code }
          
        7. 
        
        
      
        
        
          
      7. 
            1
            

            

                country { FFaker::AddressUA.country }
          
        8. 
        
        
      
        
        
          
      8. 
            1
            

            

                phone { FFaker::PhoneNumberUA.home_phone_number }
          
        9. 
        
        
      
        
        
          
      9. 
            
            

            

              end
          
        10. 
        
        
      
        
        
          
      10. 
            
            

            

            end
          
        11. 
        
        
      
    
      
  
      

      

      
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9a49b7b (Rebased)
<<<<<<< HEAD
>>>>>>> 490b01d6 (Manifest_cache true)
=======
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
        
      
  
      
    
      spec/factories/users.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      2 relevant lines.
      2 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            FactoryBot.define do
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

              factory :user do
          
        3. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
          
      3. 
=======
          
      4. 
            1
=======
          
      5. 
            13
>>>>>>> 67ab5299 (Fix)
            

            

                email { FFaker::Internet.email }
          
        6. 
        
        
      
        
        
          
      6. 
            20
            

            

                password { 'password' }
          
        7. 
        
        
      
        
        
          
      7. 
            20
            

            

                confirmed_at { Time.zone.now }
          
        8. 
        
        
      
        
        
          
      8. 
>>>>>>> 75fa7e1b (Rebased)
            
            

            

              end
          
        9. 
        
        
      
        
        
          
      9. 
            
            

            

            end
          
        10. 
        
        
      
    
      
  
      

      

      
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 75fa7e1b (Rebased)
=======
>>>>>>> 67ab5299 (Fix)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
>>>>>>> 1214e1f (Add login registration pages)
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
        
      
<<<<<<< HEAD
>>>>>>> 9bfbd88 (Featire specs)
  
      
    
      spec/factories/reviews.rb
      
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9bfbd88 (Featire specs)
  
      
    
      spec/factories/reviews.rb
      
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
        
      
>>>>>>> c033601 (Rebased)
  
      
    
      spec/feature/admin/author_spec.rb
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9a49b7b (Rebased)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
    
      
=======
        
      
  
      
    
      spec/feature/admin/author_spec.rb
      
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
    
      
      
  100.0%


      lines covered
    
      

    

    
      
<<<<<<< HEAD
      5 relevant lines.
      5 lines covered and
=======
<<<<<<< HEAD
<<<<<<< HEAD
      5 relevant lines.
      5 lines covered and
=======
      31 relevant lines.
      31 lines covered and
>>>>>>> 9a49b7b (Rebased)
=======
      31 relevant lines.
      31 lines covered and
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

<<<<<<< HEAD
            FactoryBot.define do
=======
<<<<<<< HEAD
<<<<<<< HEAD
            FactoryBot.define do
=======
            RSpec.describe 'Author' do
>>>>>>> 9a49b7b (Rebased)
=======
            RSpec.describe 'Author' do
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

<<<<<<< HEAD
              factory :review do
=======
<<<<<<< HEAD
<<<<<<< HEAD
              factory :review do
=======
              include_context 'with api request authentication helper methods'
>>>>>>> 9a49b7b (Rebased)
=======
              include_context 'with api request authentication helper methods'
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
                title { FFaker::Lorem.words(5) }
<<<<<<< HEAD
=======
=======
              include_context 'with api request global before and after hooks'
>>>>>>> 9a49b7b (Rebased)
=======
=======
            RSpec.describe 'Books', type: :feature do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
            RSpec.describe 'Books', type: :feature do
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
=======
            RSpec.describe 'Books', type: :feature do
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
            RSpec.describe 'Books', type: :feature do
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
            RSpec.describe 'Books', type: :feature do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
            RSpec.describe 'Books', type: :feature do
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
=======
            RSpec.describe 'Books', type: :feature do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
=======
                title { FFaker::Lorem.words(5) }
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> 13fca83d (Rebased)
=======
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376a (Featire specs)
=======
=======
=======
=======
            RSpec.describe 'Books', type: :feature do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0ea (Featire specs)
=======
=======
=======
            RSpec.describe 'Books', type: :feature do
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
>>>>>>> 4bf888bf (Featire specs)
          
        4. 
        
        
      
        
        
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 365d41ed (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 13fca83d (Rebased)
=======
>>>>>>> f136376a (Featire specs)
=======
>>>>>>> 1ca9c0ea (Featire specs)
=======
>>>>>>> 4bf888bf (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 13fca83d (Rebased)
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376a (Featire specs)
=======
=======
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0ea (Featire specs)
=======
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> 4bf888bf (Featire specs)
          
      4. 
            1
=======
          
      5. 
            5
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      6. 
            5
>>>>>>> 752f0c0 (Featire specs)
=======
          
      7. 
            5
>>>>>>> 4e81ea2 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                rating { FFaker::Number.rand(0..5) }
=======
              let(:category_one) { FactoryBot.create(:category) }
>>>>>>> d0dc1f1 (Featire specs)
=======
              let(:category_one) { FactoryBot.create(:category) }
>>>>>>> 752f0c0 (Featire specs)
=======
              let(:category_one) { FactoryBot.create(:category) }
>>>>>>> 4e81ea2 (Featire specs)
          
        8. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      8. 
            1
=======
          
      9. 
            3
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      10. 
            3
>>>>>>> 752f0c0 (Featire specs)
=======
          
      11. 
            3
>>>>>>> 4e81ea2 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5b7749a (Fix)
                body { FFaker::Lorem.words(500) }
          
        12. 
        
        
      
        
        
          
      12. 
            
            

            

              end
          
        13. 
        
        
      
        
        
          
      13. 
            
            

            

            end
          
        14. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/factories/shippings.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      8 relevant lines.
      8 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            FactoryBot.define do
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

              factory :shipping do
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

                user
          
        4. 
        
        
      
        
        
          
      4. 
            1
            

            

                address { FFaker::AddressUA.street_address }
          
        5. 
        
        
      
        
        
          
      5. 
            1
            

            

                city { FFaker::AddressUA.city }
          
        6. 
        
        
      
        
        
          
      6. 
            1
            

            

                zip { FFaker::AddressUA.zip_code }
          
        7. 
        
        
      
        
        
          
      7. 
            1
            

            

                country { FFaker::AddressUA.country }
          
        8. 
        
        
      
        
        
          
      8. 
            1
            

            

                phone { FFaker::PhoneNumberUA.home_phone_number }
          
        9. 
        
        
      
        
        
          
      9. 
            
            

            

              end
          
        10. 
        
        
      
        
        
          
      10. 
            
            

            

            end
          
        11. 
        
        
      
    
      
  
      

      

      
>>>>>>> aca90e3 (Rebased)
        
      
  
      
    
      spec/factories/users.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      5 relevant lines.
      5 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            FactoryBot.define do
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

              factory :user do
          
        3. 
        
        
      
        
        
          
      3. 
            17
            

            

                email { FFaker::Internet.email }
          
        4. 
        
        
      
        
        
          
      4. 
            24
            

            

                password { 'password' }
          
        5. 
        
        
      
        
        
          
      5. 
            24
            

            

                confirmed_at { Time.zone.now }
          
        6. 
        
        
      
        
        
          
      6. 
            
            

            

              end
          
        7. 
        
        
      
        
        
          
      7. 
            
            

            

            end
          
        8. 
        
        
      
    
      
  
      

      

      
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
=======
=======
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
=======
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 557c1b8 (Fix)
>>>>>>> 1214e1f (Add login registration pages)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
        
      
=======
        
      
>>>>>>> aca90e3 (Rebased)
  
      
    
      spec/feature/admin/author_spec.rb
      
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
    
      
=======
        
      
  
      
    
      spec/feature/admin/author_spec.rb
      
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      31 relevant lines.
      31 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            RSpec.describe 'Author' do
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

              include_context 'with api request authentication helper methods'
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

              include_context 'with api request global before and after hooks'
          
        4. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> 9a49b7b (Rebased)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
          
      4. 
            
            

            

            
          
        5. 
        
        
      
        
        
          
      5. 
            2
            

            

              let(:first_name) { FFaker::Name.first_name }
          
        6. 
        
        
      
        
        
          
      6. 
            2
            

            

              let(:last_name) { FFaker::Name.last_name }
          
        7. 
        
        
      
        
        
          
      7. 
            
            

            

            
          
        8. 
        
        
      
        
        
          
      8. 
            2
            

            

              let(:new_name) { FFaker::Name.first_name }
          
        9. 
        
        
      
        
        
          
      9. 
            2
            

            

              let(:old_name) { author.first_name }
          
        10. 
        
        
      
        
        
          
      10. 
            
            

            

            
          
        11. 
        
        
      
        
        
          
      11. 
            4
            

            

              let(:author) { create(:author) }
          
        12. 
        
        
      
        
        
          
      12. 
            
            

            

            
          
        13. 
        
        
      
        
        
          
      13. 
            1
            

            

              before do
          
        14. 
        
        
      
        
        
          
      14. 
            4
            

            

                sign_in(create(:admin_user), :admin_user)
          
        15. 
        
        
      
        
        
          
      15. 
            
            

            

              end
          
        16. 
        
        
      
        
        
          
      16. 
            
            

            

            
          
        17. 
        
        
      
        
        
          
      17. 
            1
            

            

              it 'can create an author' do
          
        18. 
        
        
      
        
        
          
      18. 
            1
            

            

                visit 'admin/authors'
          
        19. 
        
        
      
        
        
          
      19. 
            
            

            

            
          
        20. 
        
        
      
        
        
          
      20. 
            1
            

            

                click_link('New Author')
          
        21. 
        
        
      
        
        
          
      21. 
            
            

            

            
          
        22. 
        
        
      
        
        
          
      22. 
            1
            

            

                fill_in 'author[first_name]', with: first_name
          
        23. 
        
        
      
        
        
          
      23. 
            1
            

            

                fill_in 'author[last_name]', with: last_name
          
        24. 
        
        
      
        
        
          
      24. 
            
            

            

            
          
        25. 
        
        
      
        
        
          
      25. 
            2
            

            

                expect { click_button('Create Author') }.to change(Author, :count).from(0).to(1)
          
        26. 
        
        
      
        
        
          
      26. 
            
            

            

              end
          
        27. 
        
        
      
        
        
          
      27. 
            
            

            

            
          
        28. 
        
        
      
        
        
          
      28. 
            1
            

            

              it 'can delete an author' do
          
        29. 
        
        
      
        
        
          
      29. 
            1
            

            

                author
          
        30. 
        
        
      
        
        
          
      30. 
            
            

            

            
          
        31. 
        
        
      
        
        
          
      31. 
            1
            

            

                visit 'admin/authors'
          
        32. 
        
        
      
        
        
          
      32. 
            
            

            

            
          
        33. 
        
        
      
        
        
          
      33. 
            2
            

            

                expect { click_link('Delete') }.to change(Author, :count).from(1).to(0)
          
        34. 
        
        
      
        
        
          
      34. 
            
            

            

              end
          
        35. 
        
        
      
        
        
          
      35. 
            
            

            

            
          
        36. 
        
        
      
        
        
          
      36. 
            1
            

            

              it 'can view an author' do
          
        37. 
        
        
      
        
        
          
      37. 
            1
            

            

                author
          
        38. 
        
        
      
        
        
          
      38. 
            
            

            

            
          
        39. 
        
        
      
        
        
          
      39. 
            1
            

            

                visit 'admin/authors'
          
        40. 
        
        
      
        
        
          
      40. 
            
            

            

            
          
        41. 
        
        
      
        
        
          
      41. 
            1
            

            

                click_link('View')
          
        42. 
        
        
      
        
        
          
      42. 
            
            

            

            
          
        43. 
        
        
      
        
        
          
      43. 
            1
            

            

                expect(page).to have_content(author.first_name)
          
        44. 
        
        
      
        
        
          
      44. 
            
            

            

              end
          
        45. 
        
        
      
        
        
          
      45. 
            
            

            

            
          
        46. 
        
        
      
        
        
          
      46. 
            1
            

            

              it 'can edit an author' do
          
        47. 
        
        
      
        
        
          
      47. 
            1
            

            

                author
          
        48. 
        
        
      
        
        
          
      48. 
            
            

            

            
          
        49. 
        
        
      
        
        
          
      49. 
            1
            

            

                visit 'admin/authors'
          
        50. 
        
        
      
        
        
          
      50. 
            
            

            

            
          
        51. 
        
        
      
        
        
          
      51. 
            1
            

            

                click_link('Edit')
          
        52. 
        
        
      
        
        
          
      52. 
            
            

            

            
          
        53. 
        
        
      
        
        
          
      53. 
            1
            

            

                fill_in 'author[first_name]', with: new_name
          
        54. 
        
        
      
        
        
          
      54. 
            
            

            

            
          
        55. 
        
        
      
        
        
          
      55. 
            4
            

            

                expect { click_button('Update Author') }.to change { author.reload.first_name }.from(old_name).to(new_name)
          
        56. 
        
        
      
        
        
          
      56. 
            
            

            

              end
          
        57. 
        
        
      
        
        
          
      57. 
            
            

            

            end
          
        58. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/feature/admin/book_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      43 relevant lines.
      43 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            RSpec.describe 'Book' do
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

              include_context 'with api request authentication helper methods'
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

              include_context 'with api request global before and after hooks'
          
        4. 
        
        
      
        
        
          
      4. 
            
            

            

            
          
        5. 
        
        
      
        
        
          
      5. 
            7
            

            

              let(:book) { create(:book) }
<<<<<<< HEAD
=======
=======
              let(:category_two) { FactoryBot.create(:category) }
>>>>>>> d0dc1f1 (Featire specs)
=======
              let(:category_two) { FactoryBot.create(:category) }
>>>>>>> 752f0c0 (Featire specs)
=======
              let(:category_two) { FactoryBot.create(:category) }
>>>>>>> 4e81ea2 (Featire specs)
=======
              let(:category_two) { FactoryBot.create(:category) }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
              let(:category_two) { FactoryBot.create(:category) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
              include_context 'with api request global before and after hooks'
          
        6. 
        
        
      
        
        
          
      6. 
            
            

            

            
          
        7. 
        
        
      
        
        
          
      7. 
            2
            

            

              let(:first_name) { FFaker::Name.first_name }
          
        8. 
        
        
      
        
        
          
      8. 
            2
            

            

              let(:last_name) { FFaker::Name.last_name }
          
        9. 
        
        
      
        
        
          
      9. 
            
            

            

            
          
        10. 
        
        
      
        
        
          
      10. 
            2
            

            

              let(:new_name) { FFaker::Name.first_name }
          
        11. 
        
        
      
        
        
          
      11. 
            2
            

            

              let(:old_name) { author.first_name }
          
        12. 
        
        
      
        
        
          
      12. 
            
            

            

            
          
        13. 
        
        
      
        
        
          
      13. 
            4
            

            

              let(:author) { create(:author) }
          
        14. 
        
        
      
        
        
          
      14. 
            
            

            

            
          
        15. 
        
        
      
        
        
          
      15. 
            1
            

            

              before do
          
        16. 
        
        
      
        
        
          
      16. 
            4
            

            

                sign_in(create(:admin_user), :admin_user)
          
        17. 
        
        
      
        
        
          
      17. 
            
            

            

              end
          
        18. 
        
        
      
        
        
          
      18. 
            
            

            

            
          
        19. 
        
        
      
        
        
          
      19. 
            1
            

            

              it 'can create an author' do
          
        20. 
        
        
      
        
        
          
      20. 
            1
            

            

                visit 'admin/authors'
          
        21. 
        
        
      
        
        
          
      21. 
            
            

            

            
          
        22. 
        
        
      
        
        
          
      22. 
            1
            

            

                click_link('New Author')
          
        23. 
        
        
      
        
        
          
      23. 
            
            

            

            
          
        24. 
        
        
      
        
        
          
      24. 
            1
            

            

                fill_in 'author[first_name]', with: first_name
          
        25. 
        
        
      
        
        
          
      25. 
            1
            

            

                fill_in 'author[last_name]', with: last_name
          
        26. 
        
        
      
        
        
          
      26. 
            
            

            

            
          
        27. 
        
        
      
        
        
          
      27. 
            2
            

            

                expect { click_button('Create Author') }.to change(Author, :count).from(0).to(1)
          
        28. 
        
        
      
        
        
          
      28. 
            
            

            

              end
          
        29. 
        
        
      
        
        
          
      29. 
            
            

            

            
          
        30. 
        
        
      
        
        
          
      30. 
            1
            

            

              it 'can delete an author' do
          
        31. 
        
        
      
        
        
          
      31. 
            1
            

            

                author
          
        32. 
        
        
      
        
        
          
      32. 
            
            

            

            
          
        33. 
        
        
      
        
        
          
      33. 
            1
            

            

                visit 'admin/authors'
          
        34. 
        
        
      
        
        
          
      34. 
            
            

            

            
          
        35. 
        
        
      
        
        
          
      35. 
            2
            

            

                expect { click_link('Delete') }.to change(Author, :count).from(1).to(0)
          
        36. 
        
        
      
        
        
          
      36. 
            
            

            

              end
          
        37. 
        
        
      
        
        
          
      37. 
            
            

            

            
          
        38. 
        
        
      
        
        
          
      38. 
            1
            

            

              it 'can view an author' do
          
        39. 
        
        
      
        
        
          
      39. 
            1
            

            

                author
          
        40. 
        
        
      
        
        
          
      40. 
            
            

            

            
          
        41. 
        
        
      
        
        
          
      41. 
            1
            

            

                visit 'admin/authors'
          
        42. 
        
        
      
        
        
          
      42. 
            
            

            

            
          
        43. 
        
        
      
        
        
          
      43. 
            1
            

            

                click_link('View')
          
        44. 
        
        
      
        
        
          
      44. 
            
            

            

            
          
        45. 
        
        
      
        
        
          
      45. 
            1
            

            

                expect(page).to have_content(author.first_name)
          
        46. 
        
        
      
        
        
          
      46. 
            
            

            

              end
          
        47. 
        
        
      
        
        
          
      47. 
            
            

            

            
          
        48. 
        
        
      
        
        
          
      48. 
            1
            

            

              it 'can edit an author' do
          
        49. 
        
        
      
        
        
          
      49. 
            1
            

            

                author
          
        50. 
        
        
      
        
        
          
      50. 
            
            

            

            
          
        51. 
        
        
      
        
        
          
      51. 
            1
            

            

                visit 'admin/authors'
          
        52. 
        
        
      
        
        
          
      52. 
            
            

            

            
          
        53. 
        
        
      
        
        
          
      53. 
            1
            

            

                click_link('Edit')
          
        54. 
        
        
      
        
        
          
      54. 
            
            

            

            
          
        55. 
        
        
      
        
        
          
      55. 
            1
            

            

                fill_in 'author[first_name]', with: new_name
          
        56. 
        
        
      
        
        
          
      56. 
            
            

            

            
          
        57. 
        
        
      
        
        
          
      57. 
            4
            

            

                expect { click_button('Update Author') }.to change { author.reload.first_name }.from(old_name).to(new_name)
          
        58. 
        
        
      
        
        
          
      58. 
            
            

            

              end
          
        59. 
        
        
      
        
        
          
      59. 
            
            

            

            end
          
        60. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/feature/admin/book_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      43 relevant lines.
      43 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            RSpec.describe 'Book' do
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

              include_context 'with api request authentication helper methods'
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

              include_context 'with api request global before and after hooks'
          
        4. 
        
        
      
        
        
          
      4. 
            
            

            

            
          
        5. 
        
        
      
        
        
          
      5. 
            7
            

            

              let(:book) { create(:book) }
<<<<<<< HEAD
=======
              let(:category_two) { FactoryBot.create(:category) }
>>>>>>> d0dc1f1 (Featire specs)
=======
              let(:category_two) { FactoryBot.create(:category) }
>>>>>>> 752f0c0 (Featire specs)
=======
              let(:category_two) { FactoryBot.create(:category) }
>>>>>>> 4e81ea2 (Featire specs)
=======
              let(:category_two) { FactoryBot.create(:category) }
>>>>>>> 08edf50 (Featire specs)
=======
              let(:category_two) { FactoryBot.create(:category) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
              let(:category_two) { FactoryBot.create(:category) }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
              let(:category_two) { FactoryBot.create(:category) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
              let(:category_two) { FactoryBot.create(:category) }
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
              let(:category_two) { FactoryBot.create(:category) }
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
=======
              let(:book) { create(:book) }
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 37e48018 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
        6. 
        
        
      
        
        
          
      6. 
            1
            

            

              let(:params) do
          
        7. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      7. 
            1
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      8. 
            1
=======
          
      9. 
            4
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
=======
>>>>>>> 3e9f99d (Featire specs)
>>>>>>> 3cf8dd4 (Featire specs)
=======
          
      10. 
            4
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
=======
>>>>>>> 416166f (Featire specs)
          
      11. 
            4
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      12. 
            4
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      13. 
            4
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 37e48018 (Featire specs)
=======
          
      14. 
            4
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
          
      15. 
            4
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      16. 
            4
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      17. 
            4
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      18. 
            1
>>>>>>> 5b7749a (Fix)
=======
          
      19. 
            1
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
          
      20. 
            4
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      21. 
            4
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
          
      22. 
            4
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            

            

                { title: FFaker::Book.title,
          
        23. 
        
        
      
        
        
          
      23. 
            
            

            

                  description: FFaker::Book.description,
          
        24. 
        
        
      
        
        
          
      24. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                  price_cents: FFaker::Number.rand(1..100),
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
                  price_cents: FFaker::Number.rand(1..100),
=======
                  price: FFaker::Number.rand(1..100),
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
                  price: FFaker::Number.rand(1..100),
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
=======
=======
                  price: FFaker::Number.rand(1..100),
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                  price: FFaker::Number.rand(1..100),
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
                  price: FFaker::Number.rand(1..100),
>>>>>>> 4e81ea2 (Featire specs)
=======
                  price: FFaker::Number.rand(1..100),
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                  price: FFaker::Number.rand(1..100),
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
                  price: FFaker::Number.rand(1..100),
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  price: FFaker::Number.rand(1..100),
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                  price: FFaker::Number.rand(1..100),
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
                  price: FFaker::Number.rand(1..100),
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
                  price: FFaker::Number.rand(1..100),
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
                  price_cents: FFaker::Number.rand(1..100),
>>>>>>> 5b7749a (Fix)
=======
                  price_cents: FFaker::Number.rand(1..100),
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
                  price: FFaker::Number.rand(1..100),
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
=======
                  price: FFaker::Number.rand(1..100),
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 37e48018 (Featire specs)
=======
=======
                  price: FFaker::Number.rand(1..100),
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
=======
                  price: FFaker::Number.rand(1..100),
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
                  price: FFaker::Number.rand(1..100),
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  price: FFaker::Number.rand(1..100),
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
                  price: FFaker::Number.rand(1..100),
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
                  price: FFaker::Number.rand(1..100),
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
                  price: FFaker::Number.rand(1..100),
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
        25. 
        
        
      
        
        
          
      25. 
            
            

            

                  dimensions: FFaker::Book.cover,
          
        26. 
        
        
      
        
        
          
      26. 
            
            

            

                  year_of_publication: FFaker::Number.rand(1900..2022),
          
        27. 
        
        
      
        
        
          
      27. 
            
            

            

                  materials: 'Soft cover',
          
        28. 
        
        
      
        
        
          
      28. 
            
            

            

                  quantity: FFaker::Number.rand(2..5) }
          
        29. 
        
        
      
        
        
          
      29. 
            
            

            

              end
          
        30. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
=======
>>>>>>> c7a726c5 (Rebased)
          
      30. 
            
            

            

            
          
        31. 
        
        
      
        
        
          
      31. 
            1
            

            

              before do
          
        32. 
        
        
      
        
        
<<<<<<< HEAD
          
      32. 
            6
=======
          
      33. 
            4
>>>>>>> c7a726c5 (Rebased)
            

            

                sign_in(create(:admin_user), :admin_user)
          
        34. 
        
        
      
        
        
          
      34. 
            
            

            

            
          
        35. 
        
        
      
        
        
<<<<<<< HEAD
          
      35. 
            6
=======
          
      36. 
            4
>>>>>>> c7a726c5 (Rebased)
            

            

                book
          
        37. 
        
        
      
        
        
          
      37. 
            
            

            

            
          
        38. 
        
        
      
        
        
<<<<<<< HEAD
          
      38. 
            6
=======
          
      39. 
            4
>>>>>>> c7a726c5 (Rebased)
            

            

                visit 'admin/books'
          
        40. 
        
        
      
        
        
          
      40. 
            
            

            

              end
          
        41. 
        
        
      
        
        
          
      41. 
            
            

            

            
          
        42. 
        
        
      
        
        
          
      42. 
            1
            

            

<<<<<<< HEAD
              it 'can create an book' do
=======
              it 'can create an category' do
>>>>>>> c7a726c5 (Rebased)
          
        43. 
        
        
      
        
        
          
      43. 
            1
            

            

                click_link('New Book')
          
        44. 
        
        
      
        
        
          
      44. 
            
            

            

            
          
        45. 
        
        
      
        
        
          
      45. 
            1
            

            

                fill_in 'book[title]', with: params[:title]
          
        46. 
        
        
      
        
        
          
      46. 
            1
            

            

                fill_in 'book[description]', with: params[:description]
          
        47. 
        
        
      
        
        
          
      47. 
            1
            

            

                fill_in 'book[year_of_publication]', with: params[:year_of_publication]
<<<<<<< HEAD
          
        48. 
        
        
      
        
        
          
      48. 
            1
            

            

                fill_in 'book[price_cents]', with: params[:price_cents]
          
        49. 
        
        
      
        
        
          
      49. 
            1
            

            

                fill_in 'book[materials]', with: params[:materials]
          
        50. 
        
        
      
        
        
          
      50. 
            1
            

            

                fill_in 'book[dimensions]', with: params[:dimensions]
          
        51. 
        
        
      
        
        
          
      51. 
            1
            

            

                fill_in 'book[quantity]', with: params[:quantity]
          
        52. 
        
        
      
        
        
          
      52. 
            
            

            

            
          
        53. 
        
        
      
        
        
          
      53. 
            1
            

            

                click_button('Create Book')
          
        54. 
        
        
      
        
        
          
      54. 
            
            

            

            
          
        55. 
        
        
      
        
        
          
      55. 
            1
            

            

                expect(page).to have_content(params[:title])
          
        56. 
        
        
      
        
        
          
      56. 
            
            

            

              end
          
        57. 
        
        
      
        
        
          
      57. 
            
            

            

            
          
        58. 
        
        
      
        
        
          
      58. 
            1
            

            

              it 'can delete an book' do
          
        59. 
        
        
      
        
        
          
      59. 
            1
            

            

                click_link('Delete')
          
        60. 
        
        
      
        
        
          
      60. 
            
            

            

            
          
        61. 
        
        
      
        
        
          
      61. 
            1
            

            

                expect(page).not_to have_content(book.title)
          
        62. 
        
        
      
        
        
          
      62. 
            
            

            

              end
          
        63. 
        
        
      
        
        
          
      63. 
            
            

            

            
          
        64. 
        
        
      
        
        
          
      64. 
            1
            

            

              it 'can view an book' do
          
        65. 
        
        
      
        
        
          
      65. 
            1
            

            

                click_link('View')
          
        66. 
        
        
      
        
        
          
      66. 
            
            

            

            
          
        67. 
        
        
      
        
        
          
      67. 
            1
            

            

                expect(page).to have_content(book.title)
          
        68. 
        
        
      
        
        
          
      68. 
            
            

            

              end
          
        69. 
        
        
      
        
        
          
      69. 
            
            

            

            
          
        70. 
        
        
      
        
        
          
      70. 
            1
            

            

              it 'can edit an book' do
          
        71. 
        
        
      
        
        
          
      71. 
            1
            

            

                click_link('Edit')
          
        72. 
        
        
      
        
        
          
      72. 
            
            

            

            
          
        73. 
        
        
      
        
        
          
      73. 
            1
            

            

                fill_in 'book[title]', with: 'New title'
          
        74. 
        
        
      
        
        
          
      74. 
            
            

            

            
          
        75. 
        
        
      
        
        
          
      75. 
            1
            

            

                click_button('Update Book')
          
        76. 
        
        
      
        
        
          
      76. 
            
            

            

            
          
        77. 
        
        
      
        
        
          
      77. 
            1
            

            

                expect(page).to have_content('New title')
          
        78. 
        
        
      
        
        
          
      78. 
            
            

            

              end
          
        79. 
        
        
      
        
        
          
      79. 
            
            

            

            
          
        80. 
        
        
      
        
        
          
      80. 
            1
            

            

              context 'when image' do
          
        81. 
        
        
      
        
        
          
      81. 
            1
            

            

                before do
          
        82. 
        
        
      
        
        
          
      82. 
            2
            

            

                  click_link('Edit')
          
        83. 
        
        
      
        
        
          
      83. 
            
            

            

            
          
        84. 
        
        
      
        
        
          
      84. 
            2
            

            

                  page.attach_file('book[images][]', './app/assets/images/Web-Book-Cover.png')
          
        85. 
        
        
      
        
        
          
      85. 
            
            

            

            
          
        86. 
        
        
      
        
        
          
      86. 
            2
            

            

                  click_on 'Update Book'
          
        87. 
        
        
      
        
        
          
      87. 
            
            

            

                end
          
        88. 
        
        
      
        
        
          
      88. 
            
            

            

            
          
        89. 
        
        
      
        
        
          
      89. 
            1
            

            

                it 'can add images to book' do
          
        90. 
        
        
      
        
        
          
      90. 
            1
            

            

                  expect(book.reload.images.count).to eq(1)
          
        91. 
        
        
      
        
        
          
      91. 
            
            

            

                end
          
        92. 
        
        
      
        
        
          
      92. 
            
            

            

            
          
        93. 
        
        
      
        
        
          
      93. 
            1
            

            

                it 'can delete images from book' do
          
        94. 
        
        
      
        
        
          
      94. 
            1
            

            

                  click_link('Edit')
          
        95. 
        
        
      
        
        
          
      95. 
            
            

            

            
          
        96. 
        
        
      
        
        
          
      96. 
            1
            

            

                  click_link('Delete')
          
        97. 
        
        
      
        
        
          
      97. 
            
            

            

            
          
        98. 
        
        
      
        
        
          
      98. 
            1
            

            

                  expect(book.reload.images.count).to eq(0)
          
        99. 
        
        
      
        
        
          
      99. 
            
            

            

                end
          
        100. 
        
        
      
        
        
          
      100. 
            
            

            

              end
          
        101. 
        
        
      
        
        
          
      101. 
            
            

            

            end
          
        102. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/feature/admin/category_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      25 relevant lines.
      25 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            RSpec.describe 'Category' do
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

              include_context 'with api request authentication helper methods'
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

              include_context 'with api request global before and after hooks'
          
        4. 
        
        
      
        
        
          
      4. 
            
            

            

            
          
        5. 
        
        
      
        
        
          
      5. 
            2
            

            

              let(:category_name) { FFaker::Book.genre }
          
        6. 
        
        
      
        
        
          
      6. 
            
            

            

            
          
        7. 
        
        
      
        
        
          
      7. 
            5
            

            

              let(:category) { create(:category) }
          
        8. 
        
        
      
        
        
          
      8. 
            
            

            

            
          
        9. 
        
        
      
        
        
          
      9. 
            1
            

            

              before do
          
        10. 
        
        
      
        
        
          
      10. 
            4
            

            

                sign_in(create(:admin_user), :admin_user)
          
        11. 
        
        
      
        
        
          
      11. 
            
            

            

            
          
        12. 
        
        
      
        
        
          
      12. 
            4
            

            

                category
          
        13. 
        
        
      
        
        
          
      13. 
            
            

            

            
          
        14. 
        
        
      
        
        
          
      14. 
            4
            

            

                visit 'admin/categories'
          
        15. 
        
        
      
        
        
          
      15. 
            
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      16. 
            7
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      17. 
            7
>>>>>>> 752f0c0 (Featire specs)
=======
          
      18. 
            7
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      19. 
            7
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      20. 
            7
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      21. 
            7
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      22. 
            7
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      23. 
            7
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      24. 
            7
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              end
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              end
=======
              let(:book) { FactoryBot.create(:book) }
>>>>>>> d0dc1f1 (Featire specs)
=======
              let(:book) { FactoryBot.create(:book) }
>>>>>>> 752f0c0 (Featire specs)
=======
              let(:book) { FactoryBot.create(:book) }
>>>>>>> 4e81ea2 (Featire specs)
=======
              let(:book) { FactoryBot.create(:book) }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
              let(:book) { FactoryBot.create(:book) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
              let(:book) { FactoryBot.create(:book) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
              let(:book) { FactoryBot.create(:book) }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
              let(:book) { FactoryBot.create(:book) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
              let(:book) { FactoryBot.create(:book) }
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
              let(:book) { FactoryBot.create(:book) }
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
              end
>>>>>>> 5b7749a (Fix)
          
        25. 
        
        
      
        
        
          
      25. 
            
            

            

            
          
        26. 
        
        
      
        
        
          
      26. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              it 'can create an category' do
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              it 'can create an category' do
=======
              describe '#show book' do
>>>>>>> d0dc1f1 (Featire specs)
=======
              describe '#show book' do
>>>>>>> 752f0c0 (Featire specs)
=======
              describe '#show book' do
>>>>>>> 4e81ea2 (Featire specs)
=======
              describe '#show book' do
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
              describe '#show book' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
              describe '#show book' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
              describe '#show book' do
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
              describe '#show book' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
              describe '#show book' do
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
              describe '#show book' do
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
              it 'can create an category' do
>>>>>>> 5b7749a (Fix)
          
        27. 
        
        
      
        
        
          
      27. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                click_link('New Category')
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                click_link('New Category')
=======
                it 'show books info' do
>>>>>>> d0dc1f1 (Featire specs)
=======
                it 'show books info' do
>>>>>>> 752f0c0 (Featire specs)
=======
                it 'show books info' do
>>>>>>> 4e81ea2 (Featire specs)
=======
                it 'show books info' do
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                it 'show books info' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
                it 'show books info' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                it 'show books info' do
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                it 'show books info' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
                it 'show books info' do
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
                it 'show books info' do
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
                click_link('New Category')
>>>>>>> 5b7749a (Fix)
          
        28. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      28. 
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      29. 
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      30. 
            1
            

            

                  visit "books/#{book.id}"
          
        31. 
        
        
      
        
        
          
      31. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      32. 
>>>>>>> 5b7749a (Fix)
            
            

            

            
          
        33. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      33. 
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      34. 
=======
          
      35. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      36. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
      37. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      38. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      39. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      40. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      41. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      42. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      43. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      44. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      45. 
>>>>>>> 5b7749a (Fix)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                fill_in 'category[name]', with: category_name
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                fill_in 'category[name]', with: category_name
=======
                  expect(page).to have_content(book.title)
>>>>>>> d0dc1f1 (Featire specs)
=======
                  expect(page).to have_content(book.title)
>>>>>>> 752f0c0 (Featire specs)
=======
                  expect(page).to have_content(book.title)
>>>>>>> 4e81ea2 (Featire specs)
=======
                  expect(page).to have_content(book.title)
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                  expect(page).to have_content(book.title)
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
                  expect(page).to have_content(book.title)
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  expect(page).to have_content(book.title)
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                  expect(page).to have_content(book.title)
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
                  expect(page).to have_content(book.title)
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
                  expect(page).to have_content(book.title)
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
                fill_in 'category[name]', with: category_name
>>>>>>> 5b7749a (Fix)
          
        46. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      46. 
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      47. 
=======
          
      48. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      49. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
      50. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      51. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      52. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      53. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      54. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      55. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      56. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      57. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      58. 
>>>>>>> 5b7749a (Fix)
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
            
          
        59. 
        
        
      
        
        
          
      59. 
            1
            

            

                click_button('Create Category')
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
                end
>>>>>>> d0dc1f1 (Featire specs)
=======
                end
>>>>>>> 752f0c0 (Featire specs)
=======
                end
>>>>>>> 4e81ea2 (Featire specs)
=======
                end
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                end
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
                end
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                end
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                end
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
                end
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
                end
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
          
        60. 
        
        
      
        
        
          
      60. 
            
            

            

            
          
        61. 
        
        
      
        
        
          
      61. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                expect(page).to have_content(category_name)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                expect(page).to have_content(category_name)
=======
                it 'clicked Beck to results' do
>>>>>>> d0dc1f1 (Featire specs)
=======
                it 'clicked Beck to results' do
>>>>>>> 752f0c0 (Featire specs)
=======
                it 'clicked Beck to results' do
>>>>>>> 4e81ea2 (Featire specs)
=======
                it 'clicked Beck to results' do
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                it 'clicked Beck to results' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
                it 'clicked Beck to results' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                it 'clicked Beck to results' do
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                it 'clicked Beck to results' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
                it 'clicked Beck to results' do
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
                it 'clicked Beck to results' do
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
                expect(page).to have_content(category_name)
>>>>>>> 5b7749a (Fix)
          
        62. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      62. 
            
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      63. 
            
=======
          
      64. 
            1
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      65. 
            1
>>>>>>> 752f0c0 (Featire specs)
=======
          
      66. 
            1
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      67. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      68. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      69. 
            1
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      70. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      71. 
            1
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      72. 
            1
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      73. 
            
>>>>>>> 5b7749a (Fix)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              end
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              end
=======
                  visit "books/#{book.id}"
>>>>>>> d0dc1f1 (Featire specs)
=======
                  visit "books/#{book.id}"
>>>>>>> 752f0c0 (Featire specs)
=======
                  visit "books/#{book.id}"
>>>>>>> 4e81ea2 (Featire specs)
=======
                  visit "books/#{book.id}"
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                  visit "books/#{book.id}"
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
                  visit "books/#{book.id}"
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  visit "books/#{book.id}"
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                  visit "books/#{book.id}"
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
                  visit "books/#{book.id}"
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
                  visit "books/#{book.id}"
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
              end
>>>>>>> 5b7749a (Fix)
          
        74. 
        
        
      
        
        
          
      74. 
            
            

            

            
          
        75. 
        
        
      
        
        
          
      75. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              it 'can delete an category' do
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              it 'can delete an category' do
=======
                  find('a', class: 'general-back-link').click
>>>>>>> d0dc1f1 (Featire specs)
=======
                  find('a', class: 'general-back-link').click
>>>>>>> 752f0c0 (Featire specs)
=======
                  find('a', class: 'general-back-link').click
>>>>>>> 4e81ea2 (Featire specs)
=======
                  find('a', class: 'general-back-link').click
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                  find('a', class: 'general-back-link').click
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
                  find('a', class: 'general-back-link').click
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  find('a', class: 'general-back-link').click
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                  find('a', class: 'general-back-link').click
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
                  find('a', class: 'general-back-link').click
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
                  find('a', class: 'general-back-link').click
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
              it 'can delete an category' do
>>>>>>> 5b7749a (Fix)
          
        76. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
          
      76. 
            1
            

            

                click_link('Delete')
          
        77. 
        
        
      
        
        
          
      77. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      78. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      79. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
      80. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      81. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      82. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      83. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      84. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      85. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      86. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      87. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
            
            

            

            
          
        88. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      88. 
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      89. 
=======
          
      90. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      91. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
      92. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      93. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      94. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      95. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      96. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      97. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      98. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      99. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      100. 
>>>>>>> 5b7749a (Fix)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                expect(page).not_to have_content(category.name)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                expect(page).not_to have_content(category.name)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
                  expect(page).to have_content('Catalog')
=======
>>>>>>> c7a726c5 (Rebased)
          
        101. 
        
        
      
        
        
          
      101. 
            1
            

            

<<<<<<< HEAD
                end
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
                expect(page).not_to have_content(category.name)
>>>>>>> 5b7749a (Fix)
=======
                fill_in 'book[price_cents]', with: params[:price_cents]
>>>>>>> c7a726c5 (Rebased)
          
        102. 
        
        
      
        
        
          
      102. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              end
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              end
=======
            
>>>>>>> d0dc1f1 (Featire specs)
=======
            
>>>>>>> 752f0c0 (Featire specs)
=======
            
>>>>>>> 4e81ea2 (Featire specs)
=======
            
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
            
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
            
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
            
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
            
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
            
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
            
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
              end
>>>>>>> 5b7749a (Fix)
=======
                fill_in 'book[materials]', with: params[:materials]
>>>>>>> c7a726c5 (Rebased)
          
        103. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      103. 
            
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      104. 
            
=======
          
      105. 
            1
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      106. 
            1
>>>>>>> 752f0c0 (Featire specs)
=======
          
      107. 
            1
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      108. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      109. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      110. 
            1
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      111. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      112. 
            1
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      113. 
            1
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      114. 
            
>>>>>>> 5b7749a (Fix)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
            
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
            
=======
                context 'when test read more' do
>>>>>>> d0dc1f1 (Featire specs)
=======
                context 'when test read more' do
>>>>>>> 752f0c0 (Featire specs)
=======
                context 'when test read more' do
>>>>>>> 4e81ea2 (Featire specs)
=======
                context 'when test read more' do
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                context 'when test read more' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
                context 'when test read more' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                context 'when test read more' do
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                context 'when test read more' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
                context 'when test read more' do
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
                context 'when test read more' do
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
            
>>>>>>> 5b7749a (Fix)
=======
                fill_in 'book[dimensions]', with: params[:dimensions]
>>>>>>> c7a726c5 (Rebased)
          
        115. 
        
        
      
        
        
          
      115. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              it 'can view an category' do
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              it 'can view an category' do
=======
                  it 'show read more' do
>>>>>>> d0dc1f1 (Featire specs)
=======
                  it 'show read more' do
>>>>>>> 752f0c0 (Featire specs)
=======
                  it 'show read more' do
>>>>>>> 4e81ea2 (Featire specs)
=======
                  it 'show read more' do
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                  it 'show read more' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
                  it 'show read more' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it 'show read more' do
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                  it 'show read more' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
                  it 'show read more' do
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
                  it 'show read more' do
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
              it 'can view an category' do
>>>>>>> 5b7749a (Fix)
=======
                fill_in 'book[quantity]', with: params[:quantity]
          
        116. 
        
        
      
        
        
          
      116. 
            
            

            

            
          
        117. 
        
        
      
        
        
          
      117. 
            1
            

            

                click_button('Create Book')
          
        118. 
        
        
      
        
        
          
      118. 
            
            

            

            
          
        119. 
        
        
      
        
        
          
      119. 
            1
            

            

                expect(page).to have_content(params[:title])
          
        120. 
        
        
      
        
        
          
      120. 
            
            

            

              end
          
        121. 
        
        
      
        
        
          
      121. 
            
            

            

            
          
        122. 
        
        
      
        
        
          
      122. 
            1
            

            

              it 'can delete an book' do
          
        123. 
        
        
      
        
        
          
      123. 
            1
            

            

                click_link('Delete')
          
        124. 
        
        
      
        
        
          
      124. 
            
            

            

            
          
        125. 
        
        
      
        
        
          
      125. 
            1
            

            

                expect(page).not_to have_content(book.title)
          
        126. 
        
        
      
        
        
          
      126. 
            
            

            

              end
          
        127. 
        
        
      
        
        
          
      127. 
            
            

            

            
          
        128. 
        
        
      
        
        
          
      128. 
            1
            

            

              it 'can view an book' do
          
        129. 
        
        
      
        
        
          
      129. 
            1
            

            

                click_link('View')
          
        130. 
        
        
      
        
        
          
      130. 
            
            

            

            
          
        131. 
        
        
      
        
        
          
      131. 
            1
            

            

                expect(page).to have_content(book.title)
          
        132. 
        
        
      
        
        
          
      132. 
            
            

            

              end
          
        133. 
        
        
      
        
        
          
      133. 
            
            

            

            
          
        134. 
        
        
      
        
        
          
      134. 
            1
            

            

              it 'can edit an book' do
          
        135. 
        
        
      
        
        
          
      135. 
            1
            

            

                click_link('Edit')
          
        136. 
        
        
      
        
        
          
      136. 
            
            

            

            
          
        137. 
        
        
      
        
        
          
      137. 
            1
            

            

                fill_in 'book[title]', with: 'New title'
          
        138. 
        
        
      
        
        
          
      138. 
            
            

            

            
          
        139. 
        
        
      
        
        
          
      139. 
            1
            

            

                click_button('Update Book')
          
        140. 
        
        
      
        
        
          
      140. 
            
            

            

            
          
        141. 
        
        
      
        
        
          
      141. 
            1
            

            

                expect(page).to have_content('New title')
          
        142. 
        
        
      
        
        
          
      142. 
            
            

            

              end
          
        143. 
        
        
      
        
        
          
      143. 
            
            

            

            end
          
        144. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/feature/admin/category_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      25 relevant lines.
      25 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            RSpec.describe 'Category' do
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

              include_context 'with api request authentication helper methods'
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

              include_context 'with api request global before and after hooks'
          
        4. 
        
        
      
        
        
          
      4. 
            
            

            

            
          
        5. 
        
        
      
        
        
          
      5. 
            2
            

            

              let(:category_name) { FFaker::Book.genre }
          
        6. 
        
        
      
        
        
          
      6. 
            
            

            

            
          
        7. 
        
        
      
        
        
          
      7. 
            5
            

            

              let(:category) { create(:category) }
          
        8. 
        
        
      
        
        
          
      8. 
            
            

            

            
          
        9. 
        
        
      
        
        
          
      9. 
            1
            

            

              before do
          
        10. 
        
        
      
        
        
          
      10. 
            4
            

            

                sign_in(create(:admin_user), :admin_user)
          
        11. 
        
        
      
        
        
          
      11. 
            
            

            

            
          
        12. 
        
        
      
        
        
          
      12. 
            4
            

            

                category
          
        13. 
        
        
      
        
        
          
      13. 
            
            

            

            
          
        14. 
        
        
      
        
        
          
      14. 
            4
            

            

                visit 'admin/categories'
          
        15. 
        
        
      
        
        
          
      15. 
            
            

            

              end
          
        16. 
        
        
      
        
        
          
      16. 
            
            

            

            
          
        17. 
        
        
      
        
        
          
      17. 
            1
            

            

              it 'can create an category' do
          
        18. 
        
        
      
        
        
          
      18. 
            1
            

            

                click_link('New Category')
          
        19. 
        
        
      
        
        
          
      19. 
            
            

            

            
          
        20. 
        
        
      
        
        
          
      20. 
            1
            

            

                fill_in 'category[name]', with: category_name
          
        21. 
        
        
      
        
        
          
      21. 
            
            

            

            
          
        22. 
        
        
      
        
        
          
      22. 
            1
            

            

                click_button('Create Category')
          
        23. 
        
        
      
        
        
          
      23. 
            
            

            

            
          
        24. 
        
        
      
        
        
          
      24. 
            1
            

            

                expect(page).to have_content(category_name)
          
        25. 
        
        
      
        
        
          
      25. 
            
            

            

              end
          
        26. 
        
        
      
        
        
          
      26. 
            
            

            

            
          
        27. 
        
        
      
        
        
          
      27. 
            1
            

            

              it 'can delete an category' do
          
        28. 
        
        
      
        
        
          
      28. 
            1
            

            

                click_link('Delete')
          
        29. 
        
        
      
        
        
          
      29. 
            
            

            

            
          
        30. 
        
        
      
        
        
          
      30. 
            1
            

            

                expect(page).not_to have_content(category.name)
          
        31. 
        
        
      
        
        
          
      31. 
            
            

            

              end
          
        32. 
        
        
      
        
        
          
      32. 
            
            

            

            
          
        33. 
        
        
      
        
        
          
      33. 
            1
            

            

              it 'can view an category' do
>>>>>>> c7a726c5 (Rebased)
          
        34. 
        
        
      
        
        
          
      34. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                click_link('View')
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                click_link('View')
=======
                    visit "books/#{book.id}"
>>>>>>> d0dc1f1 (Featire specs)
=======
                    visit "books/#{book.id}"
>>>>>>> 752f0c0 (Featire specs)
=======
                    visit "books/#{book.id}"
>>>>>>> 4e81ea2 (Featire specs)
=======
                    visit "books/#{book.id}"
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                    visit "books/#{book.id}"
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
                    visit "books/#{book.id}"
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                    visit "books/#{book.id}"
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                    visit "books/#{book.id}"
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
                    visit "books/#{book.id}"
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
                    visit "books/#{book.id}"
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
                click_link('View')
>>>>>>> 5b7749a (Fix)
=======
                click_link('View')
>>>>>>> c7a726c5 (Rebased)
          
        35. 
        
        
      
        
        
          
      35. 
            
            

            

            
          
        36. 
        
        
      
        
        
          
      36. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                expect(page).to have_content(category.name)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                expect(page).to have_content(category.name)
=======
                    expect(page).to have_content('Read More')
>>>>>>> d0dc1f1 (Featire specs)
=======
                    expect(page).to have_content('Read More')
>>>>>>> 752f0c0 (Featire specs)
=======
                    expect(page).to have_content('Read More')
>>>>>>> 4e81ea2 (Featire specs)
=======
                    expect(page).to have_content('Read More')
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                    expect(page).to have_content('Read More')
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
                    expect(page).to have_content('Read More')
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                    expect(page).to have_content('Read More')
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                    expect(page).to have_content('Read More')
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
                    expect(page).to have_content('Read More')
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
                    expect(page).to have_content('Read More')
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
                expect(page).to have_content(category.name)
>>>>>>> 5b7749a (Fix)
=======
                expect(page).to have_content(category.name)
>>>>>>> c7a726c5 (Rebased)
          
        37. 
        
        
      
        
        
          
      37. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              end
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              end
=======
                  end
>>>>>>> d0dc1f1 (Featire specs)
=======
                  end
>>>>>>> 752f0c0 (Featire specs)
=======
                  end
>>>>>>> 4e81ea2 (Featire specs)
=======
                  end
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                  end
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
                  end
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  end
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                  end
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
                  end
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
                  end
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
              end
>>>>>>> 5b7749a (Fix)
=======
              end
>>>>>>> c7a726c5 (Rebased)
          
        38. 
        
        
      
        
        
          
      38. 
            
            

            

            
          
        39. 
        
        
      
        
        
          
      39. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              it 'can edit an category' do
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              it 'can edit an category' do
=======
                  it 'clicked read more', js: true do
>>>>>>> d0dc1f1 (Featire specs)
=======
                  it 'clicked read more', js: true do
>>>>>>> 752f0c0 (Featire specs)
=======
                  it 'clicked read more', js: true do
>>>>>>> 4e81ea2 (Featire specs)
=======
                  it 'clicked read more', js: true do
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                  it 'clicked read more', js: true do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
                  it 'clicked read more', js: true do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it 'clicked read more', js: true do
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                  it 'clicked read more', js: true do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
                  it 'clicked read more', js: true do
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
                  it 'clicked read more', js: true do
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
              it 'can edit an category' do
>>>>>>> 5b7749a (Fix)
=======
              it 'can edit an category' do
>>>>>>> c7a726c5 (Rebased)
          
        40. 
        
        
      
        
        
          
      40. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                click_link('Edit')
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                click_link('Edit')
=======
                    visit "books/#{book.id}"
>>>>>>> d0dc1f1 (Featire specs)
=======
                    visit "books/#{book.id}"
>>>>>>> 752f0c0 (Featire specs)
=======
                    visit "books/#{book.id}"
>>>>>>> 4e81ea2 (Featire specs)
=======
                    visit "books/#{book.id}"
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                    visit "books/#{book.id}"
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
                    visit "books/#{book.id}"
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                    visit "books/#{book.id}"
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                    visit "books/#{book.id}"
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
                    visit "books/#{book.id}"
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
                    visit "books/#{book.id}"
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
                click_link('Edit')
>>>>>>> 5b7749a (Fix)
=======
                click_link('Edit')
>>>>>>> c7a726c5 (Rebased)
          
        41. 
        
        
      
        
        
          
      41. 
            
            

            

            
          
        42. 
        
        
      
        
        
          
      42. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                fill_in 'category[name]', with: 'New Genre'
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                fill_in 'category[name]', with: 'New Genre'
=======
                    click_link 'Read More'
>>>>>>> d0dc1f1 (Featire specs)
=======
                    click_link 'Read More'
>>>>>>> 752f0c0 (Featire specs)
=======
                    click_link 'Read More'
>>>>>>> 4e81ea2 (Featire specs)
=======
                    click_link 'Read More'
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                    click_link 'Read More'
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
                    click_link 'Read More'
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                    click_link 'Read More'
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                    click_link 'Read More'
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
                    click_link 'Read More'
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
                    click_link 'Read More'
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
                fill_in 'category[name]', with: 'New Genre'
>>>>>>> 5b7749a (Fix)
=======
                fill_in 'category[name]', with: 'New Genre'
>>>>>>> c7a726c5 (Rebased)
          
        43. 
        
        
      
        
        
          
      43. 
            
            

            

            
          
        44. 
        
        
      
        
        
          
      44. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                click_button('Update Category')
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                click_button('Update Category')
=======
                    expect(page).not_to have_content('Read More')
>>>>>>> d0dc1f1 (Featire specs)
=======
                    expect(page).not_to have_content('Read More')
>>>>>>> 752f0c0 (Featire specs)
=======
                    expect(page).not_to have_content('Read More')
>>>>>>> 4e81ea2 (Featire specs)
=======
                    expect(page).not_to have_content('Read More')
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                    expect(page).not_to have_content('Read More')
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
                    expect(page).not_to have_content('Read More')
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                    expect(page).not_to have_content('Read More')
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                    expect(page).not_to have_content('Read More')
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
                    expect(page).not_to have_content('Read More')
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
                    expect(page).not_to have_content('Read More')
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
                click_button('Update Category')
>>>>>>> 5b7749a (Fix)
=======
                click_button('Update Category')
>>>>>>> c7a726c5 (Rebased)
          
        45. 
        
        
      
        
        
          
      45. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
            
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
            
=======
                  end
>>>>>>> d0dc1f1 (Featire specs)
=======
                  end
>>>>>>> 752f0c0 (Featire specs)
=======
                  end
>>>>>>> 4e81ea2 (Featire specs)
=======
                  end
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                  end
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
                  end
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  end
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                  end
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
                  end
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
                  end
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
            
>>>>>>> 5b7749a (Fix)
=======
            
>>>>>>> c7a726c5 (Rebased)
          
        46. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      46. 
            1
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      47. 
            1
=======
          
      48. 
            
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      49. 
            
>>>>>>> 752f0c0 (Featire specs)
=======
          
      50. 
            
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      51. 
            
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      52. 
            
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      53. 
            
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      54. 
            
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      55. 
            
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      56. 
            
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      57. 
            1
>>>>>>> 5b7749a (Fix)
=======
          
      58. 
            1
>>>>>>> c7a726c5 (Rebased)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                expect(page).to have_content('New Genre')
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                expect(page).to have_content('New Genre')
=======
                end
>>>>>>> d0dc1f1 (Featire specs)
=======
                end
>>>>>>> 752f0c0 (Featire specs)
=======
                end
>>>>>>> 4e81ea2 (Featire specs)
=======
                end
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                end
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
                end
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                end
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                end
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
                end
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
                end
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
                expect(page).to have_content('New Genre')
>>>>>>> 5b7749a (Fix)
=======
                expect(page).to have_content('New Genre')
>>>>>>> c7a726c5 (Rebased)
          
        59. 
        
        
      
        
        
          
      59. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
=======
>>>>>>> c7a726c5 (Rebased)
              end
          
        60. 
        
        
      
        
        
          
      60. 
            
            

            

            end
          
        61. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/feature/billing_spec.rb
      
    
      
      
  73.08%


      lines covered
    
      

    

    
      
      26 relevant lines.
      19 lines covered and
      7 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            RSpec.describe 'Billing', type: :feature do
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

              include_context 'with api request authentication helper methods'
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

              include_context 'with api request global before and after hooks'
          
        4. 
        
        
      
        
        
          
      4. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
=======
>>>>>>> c7a726c5 (Rebased)
            
          
        5. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
=======
>>>>>>> c7a726c5 (Rebased)
          
      5. 
            2
            

            

              let(:user) { create(:user) }
          
        6. 
        
        
      
        
        
          
      6. 
            1
            

            

              let(:attributes_for) { attributes_for(:billing) }
          
        7. 
        
        
      
        
        
          
      7. 
            
            

            

            
          
        8. 
        
        
      
        
        
          
      8. 
            1
            

            

              describe '#fill_in', js: true do
          
        9. 
        
        
      
        
        
          
      9. 
            1
            

            

                it 'fill in billing' do
          
        10. 
        
        
      
        
        
          
      10. 
            1
            

            

                  sign_in(user)
          
        11. 
        
        
      
        
        
          
      11. 
            
            

            

            
          
        12. 
        
        
      
        
        
          
      12. 
            1
            

            

                  visit edit_user_path(user.id)
          
        13. 
        
        
      
        
        
          
      13. 
            
            

            

            
          
        14. 
        
        
      
        
        
          
      14. 
            1
            

            

                  within('div#billing.col-md-5.mb-40') do
          
        15. 
        
        
      
        
        
          
      15. 
            1
            

            

                    find_all('div', class: 'form-group')[0] do
          
        16. 
        
        
      
        
        
          
      16. 
            
            

            

                      fill_in :first_name, with: attributes_for[:first_name]
          
        17. 
        
        
      
        
        
          
      17. 
            
            

            

                    end
          
        18. 
        
        
      
        
        
          
      18. 
            1
            

            

                    find_all('div', class: 'form-group')[1] do
          
        19. 
        
        
      
        
        
          
      19. 
            
            

            

                      fill_in :last_name, with: attributes_for[:last_name]
          
        20. 
        
        
      
        
        
          
      20. 
            
            

            

                    end
          
        21. 
        
        
      
        
        
          
      21. 
            1
            

            

                    find_all('div', class: 'form-group')[2] do
          
        22. 
        
        
      
        
        
          
      22. 
            
            

            

                      fill_in :address, with: attributes_for[:address]
          
        23. 
        
        
      
        
        
          
      23. 
            
            

            

                    end
          
        24. 
        
        
      
        
        
          
      24. 
            1
            

            

                    find_all('div', class: 'form-group')[3] do
          
        25. 
        
        
      
        
        
          
      25. 
            
            

            

                      fill_in :city, with: attributes_for[:city]
          
        26. 
        
        
      
        
        
          
      26. 
            
            

            

                    end
          
        27. 
        
        
      
        
        
          
      27. 
            1
            

            

                    find_all('div', class: 'form-group')[4] do
          
        28. 
        
        
      
        
        
          
      28. 
            
            

            

                      fill_in :zip, with: attributes_for[:zip]
          
        29. 
        
        
      
        
        
          
      29. 
            
            

            

                    end
          
        30. 
        
        
      
        
        
          
      30. 
            1
            

            

                    find_all('div', class: 'form-group')[5] do
          
        31. 
        
        
      
        
        
          
      31. 
            
            

            

                      fill_in :country, with: attributes_for[:country]
          
        32. 
        
        
      
        
        
          
      32. 
            
            

            

                    end
          
        33. 
        
        
      
        
        
          
      33. 
            1
            

            

                    find_all('div', class: 'form-group')[6] do
          
        34. 
        
        
      
        
        
          
      34. 
            
            

            

                      fill_in :phone, with: attributes_for[:phone]
          
        35. 
        
        
      
        
        
          
      35. 
            
            

            

                    end
          
        36. 
        
        
      
        
        
          
      36. 
            1
            

            

                    click_on I18n.t('settings.save')
          
        37. 
        
        
      
        
        
          
      37. 
            
            

            

                  end
          
        38. 
        
        
      
        
        
          
      38. 
            
            

            

            
          
        39. 
        
        
      
        
        
          
      39. 
            1
            

            

                  expect(page).to have_content(I18n.t('settings.message.update'))
          
        40. 
        
        
      
        
        
          
      40. 
            
            

            

                end
          
        41. 
        
        
      
        
        
          
      41. 
            
            

            

              end
          
        42. 
        
        
      
        
        
          
      42. 
            
            

            

            end
          
        43. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/feature/book_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      104 relevant lines.
      104 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            RSpec.describe 'Book', type: :feature do
          
        2. 
        
        
      
        
        
          
      2. 
            5
            

            

              let(:category_one) { create(:category) }
          
        3. 
        
        
      
        
        
          
      3. 
            3
            

            

              let(:category_two) { create(:category) }
          
        4. 
        
        
      
        
        
          
      4. 
            1
            

            

              let(:params) do
          
        5. 
        
        
      
        
        
          
      5. 
            4
            

            

                { title: FFaker::Book.title,
          
        6. 
        
        
      
        
        
          
      6. 
            
            

            

                  description: FFaker::Book.description,
          
        7. 
        
        
      
        
        
          
      7. 
            
            

            

                  price_cents: FFaker::Number.rand(1..100),
          
        8. 
        
        
      
        
        
          
      8. 
            
            

            

                  dimensions: FFaker::Book.cover,
          
        9. 
        
        
      
        
        
          
      9. 
            
            

            

                  year_of_publication: FFaker::Number.rand(1900..2022),
          
        10. 
        
        
      
        
        
          
      10. 
            
            

            

                  materials: 'Soft cover',
          
        11. 
        
        
      
        
        
          
      11. 
            
            

            

                  quantity: FFaker::Number.rand(2..5) }
          
        12. 
        
        
      
        
        
          
      12. 
            
            

            

              end
          
        13. 
        
        
      
        
        
          
      13. 
            7
            

            

              let(:book) { create(:book).decorate }
          
        14. 
        
        
      
        
        
          
      14. 
            
            

            

            
          
        15. 
        
        
      
        
        
          
      15. 
            1
            

            

              describe '#show book' do
          
        16. 
        
        
      
        
        
          
      16. 
            1
            

            

                it 'show books info' do
          
        17. 
        
        
      
        
        
          
      17. 
            1
            

            

                  visit "books/#{book.id}"
          
        18. 
        
        
      
        
        
          
      18. 
            
            

            

            
          
        19. 
        
        
      
        
        
          
      19. 
            1
            

            

                  expect(page).to have_content(book.title)
          
        20. 
        
        
      
        
        
          
      20. 
            
            

            

                end
          
        21. 
        
        
      
        
        
          
      21. 
            
            

            

            
          
        22. 
        
        
      
        
        
          
      22. 
            1
            

            

                it 'clicked Beck to results' do
          
        23. 
        
        
      
        
        
          
      23. 
            1
            

            

                  visit "books/#{book.id}"
          
        24. 
        
        
      
        
        
          
      24. 
            
            

            

            
          
        25. 
        
        
      
        
        
          
      25. 
            1
            

            

                  find('a', class: 'general-back-link').click
          
        26. 
        
        
      
        
        
          
      26. 
            
            

            

            
          
        27. 
        
        
      
        
        
          
      27. 
            1
            

            

                  expect(page).to have_content(I18n.t('catalog_page.title'))
          
        28. 
        
        
      
        
        
          
      28. 
            
            

            

                end
          
        29. 
        
        
      
        
        
          
      29. 
            
            

            

            
          
        30. 
        
        
      
        
        
          
      30. 
            1
            

            

                context 'when test read more' do
          
        31. 
        
        
      
        
        
          
      31. 
            1
            

            

                  it 'show read more' do
          
        32. 
        
        
      
        
        
          
      32. 
            1
            

            

                    visit "books/#{book.id}"
          
        33. 
        
        
      
        
        
          
      33. 
            
            

            

            
          
        34. 
        
        
      
        
        
          
      34. 
            1
            

            

                    expect(page).to have_content(I18n.t('book_page.read_more'))
          
        35. 
        
        
      
        
        
          
      35. 
            
            

            

                  end
          
        36. 
        
        
      
        
        
          
      36. 
            
            

            

            
          
        37. 
        
        
      
        
        
          
      37. 
            1
            

            

                  it 'clicked read more', js: true do
          
        38. 
        
        
      
        
        
          
      38. 
            1
            

            

                    visit "books/#{book.id}"
          
        39. 
        
        
      
        
        
          
      39. 
            
            

            

            
          
        40. 
        
        
      
        
        
          
      40. 
            1
            

            

<<<<<<< HEAD
                    click_link I18n.t('book_page.read_more')
=======
                    click_link 'Read More'
>>>>>>> c7a726c5 (Rebased)
          
        41. 
        
        
      
        
        
          
      41. 
            
            

            

            
          
        42. 
        
        
      
        
        
          
      42. 
            1
            

            

                    expect(page).not_to have_content(I18n.t('book_page.read_more'))
          
        43. 
        
        
      
        
        
          
      43. 
            
            

            

                  end
          
        44. 
        
        
      
        
        
          
      44. 
            
            

            

                end
          
        45. 
        
        
      
        
        
          
      45. 
            
            

            

            
          
        46. 
        
        
      
        
        
          
      46. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      47. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      48. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
      49. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      50. 
>>>>>>> 08edf50 (Featire specs)
=======
          
      51. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      52. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
      53. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      54. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      55. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
=======
>>>>>>> c7a726c5 (Rebased)
            1
            

            

                context 'when quantity changes', js: true do
          
        56. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      56. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      57. 
=======
          
      58. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      59. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
      60. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      61. 
>>>>>>> 08edf50 (Featire specs)
=======
          
      62. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      63. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
      64. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      65. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      66. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      67. 
>>>>>>> 5b7749a (Fix)
=======
          
      68. 
>>>>>>> c7a726c5 (Rebased)
            1
            

            

                  before do
          
        69. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
=======
>>>>>>> c7a726c5 (Rebased)
          
      69. 
            2
            

            

                    visit "books/#{book.id}"
          
        70. 
        
        
      
        
        
          
      70. 
            
            

            

            
          
        71. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c7a726c5 (Rebased)
          
      71. 
            2
            

            

                    find('a', class: 'inc').click
          
        72. 
        
        
      
        
        
          
      72. 
            
            

            

                  end
          
        73. 
        
        
      
        
        
          
      73. 
            
            

            

            
          
        74. 
        
        
      
        
        
          
      74. 
            1
            

            

<<<<<<< HEAD
                  it 'increase quantity' do
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                  it 'increase quantity' do
=======
                  it 'increase quantity', js: true do
>>>>>>> 752f0c0 (Featire specs)
=======
                  it 'increase quantity', js: true do
>>>>>>> 4e81ea2 (Featire specs)
=======
                  it 'increase quantity', js: true do
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
          
        75. 
        
        
      
        
        
          
      75. 
            1
            

            

                    expect(page).to have_content("€#{Money.new(book.price_cents * 2)}")
          
        76. 
        
        
      
        
        
          
      76. 
            
            

            

                  end
          
        77. 
        
        
      
        
        
          
      77. 
            
            

            

            
          
        78. 
        
        
      
        
        
          
      78. 
            1
            

            

<<<<<<< HEAD
                  it 'decrease quantity' do
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                  it 'decrease quantity' do
=======
                  it 'decrease quantity', js: true do
>>>>>>> 752f0c0 (Featire specs)
=======
                  it 'decrease quantity', js: true do
>>>>>>> 4e81ea2 (Featire specs)
=======
                  it 'decrease quantity', js: true do
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
          
        79. 
        
        
      
        
        
          
      79. 
            1
            

            

                    find('a', class: 'dec').click
          
        80. 
        
        
      
        
        
          
      80. 
            1
            

            

                    expect(page).to have_content("€#{book.price}")
          
        81. 
        
        
      
        
        
          
      81. 
            
            

            

                  end
          
        82. 
        
        
      
        
        
          
      82. 
            
            

            

                end
          
        83. 
        
        
      
        
        
          
      83. 
            
            

            

              end
          
        84. 
        
        
      
        
        
          
      84. 
            
            

            

            
          
        85. 
        
        
      
        
        
          
      85. 
            1
            

            

              describe '#catalog' do
          
        86. 
        
        
      
        
        
          
      86. 
            1
            

            

                describe 'filter by category' do
          
        87. 
        
        
      
        
        
          
      87. 
            1
            

            

                  before do
          
        88. 
        
        
      
        
        
          
      88. 
            2
            

            

                    category_one.books.create(params)
          
        89. 
        
        
      
        
        
          
      89. 
            2
            

            

                    visit books_path
          
        90. 
        
        
      
        
        
          
      90. 
            
            

            

                  end
          
        91. 
        
        
      
        
        
          
      91. 
            
            

            

            
          
        92. 
        
        
      
        
        
          
      92. 
            1
            

            

                  after do
          
        93. 
        
        
      
        
        
          
      93. 
            2
            

            

                    category_one.destroy
          
        94. 
        
        
      
        
        
          
      94. 
            
            

            

                  end
          
        95. 
        
        
      
        
        
          
      95. 
            
            

            

            
          
        96. 
        
        
      
        
        
          
      96. 
            1
            

            

                  it 'show book count for category' do
          
        97. 
        
        
      
        
        
          
      97. 
            1
            

            

                    expect(page).to have_content(category_one.books.size)
          
        98. 
        
        
      
        
        
          
      98. 
            
            

            

                  end
          
        99. 
        
        
      
        
        
          
      99. 
            
            

            

            
          
        100. 
        
        
      
        
        
          
      100. 
            1
            

            

                  it 'filter book by category' do
          
        101. 
        
        
      
        
        
          
      101. 
            1
            

            

                    within 'ul', class: 'list-inline pt-10 mb-25 mr-240', id: 'filter' do
          
        102. 
        
        
      
        
        
          
      102. 
            1
            

            

                      click_on category_one.name
          
        103. 
        
        
      
        
        
          
      103. 
            
            

            

                    end
          
        104. 
        
        
      
        
        
          
      104. 
            
            

            

            
          
        105. 
        
        
      
        
        
          
      105. 
            1
            

            

                    expect(page).to have_content(category_one.books.first.title)
          
        106. 
        
        
      
        
        
          
      106. 
            
            

            

                  end
          
        107. 
        
        
      
        
        
          
      107. 
            
            

            

                end
          
        108. 
        
        
      
        
        
          
      108. 
            
            

            

            
          
        109. 
        
        
      
        
        
          
      109. 
            1
            

            

                describe 'filter by all books' do
          
        110. 
        
        
      
        
        
          
      110. 
            1
            

            

                  before do
          
        111. 
        
        
      
        
        
          
      111. 
            2
            

            

                    category_one.books.create(params)
          
        112. 
        
        
      
        
        
          
      112. 
            2
            

            

                    category_two.books.create(params)
          
        113. 
        
        
      
        
        
          
      113. 
            
            

            

            
          
        114. 
        
        
      
        
        
          
      114. 
            2
            

            

                    visit books_path
          
        115. 
        
        
      
        
        
          
      115. 
            
            

            

            
          
        116. 
        
        
      
        
        
          
      116. 
            2
            

            

                    click_on I18n.t('catalog_page.all')
          
        117. 
        
        
      
        
        
          
      117. 
            
            

            

                  end
          
        118. 
        
        
      
        
        
          
      118. 
            
            

            

            
          
        119. 
        
        
      
        
        
          
      119. 
            1
            

            

                  after do
          
        120. 
        
        
      
        
        
          
      120. 
            2
            

            

                    category_one.destroy
          
        121. 
        
        
      
        
        
          
      121. 
            2
            

            

                    category_two.destroy
          
        122. 
        
        
      
        
        
          
      122. 
            
            

            

                  end
          
        123. 
        
        
      
        
        
          
      123. 
            
            

            

            
          
        124. 
        
        
      
        
        
          
      124. 
            1
            

            

                  it 'shown books for first category' do
          
        125. 
        
        
      
        
        
          
      125. 
            1
            

            

                    expect(page).to have_content(category_one.books.first.title)
          
        126. 
        
        
      
        
        
          
      126. 
            
            

            

                  end
          
        127. 
        
        
      
        
        
          
      127. 
            
            

            

            
          
        128. 
        
        
      
        
        
          
      128. 
            1
            

            

                  it 'shown books for second category' do
          
        129. 
        
        
      
        
        
          
      129. 
            1
            

            

                    expect(page).to have_content(category_two.books.first.title)
          
        130. 
        
        
      
        
        
          
      130. 
            
            

            

                  end
          
        131. 
        
        
      
        
        
          
      131. 
            
            

            

                end
          
        132. 
        
        
      
        
        
          
      132. 
            
            

            

              end
          
        133. 
        
        
      
        
        
          
      133. 
            
            

            

            
          
        134. 
        
        
      
        
        
          
      134. 
            1
            

            

              describe 'load_more' do
          
        135. 
        
        
      
        
        
          
      135. 
            1
            

            

                before do
          
        136. 
        
        
      
        
        
          
      136. 
            3
            

            

<<<<<<< HEAD
                  24.times do
=======
<<<<<<< HEAD
                  (BooksController::PAGINATION_PER_PAGE * 2).times do
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                  (BooksController::PAGINATION_PER_PAGE * 2).times do
=======
                  (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do
>>>>>>> 752f0c0 (Featire specs)
=======
                  (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do
>>>>>>> 4e81ea2 (Featire specs)
=======
                  (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 9bfbd88 (Featire specs)
          
        137. 
        
        
      
        
        
          
      137. 
            72
            

            

                    books << create(:book)
          
        138. 
        
        
      
        
        
          
      138. 
            
            

            

                  end
          
        139. 
        
        
      
        
        
          
      139. 
            
            

            

                end
          
        140. 
        
        
      
        
        
          
      140. 
            
            

            

            
          
        141. 
        
        
      
        
        
          
      141. 
            4
            

            

                let(:books) { [] }
          
        142. 
        
        
      
        
        
          
      142. 
            
            

            

            
          
        143. 
        
        
      
        
        
          
      143. 
            1
            

            

                it 'show books without view more button' do
          
        144. 
        
        
      
        
        
          
      144. 
            1
            

            

                  visit books_path
          
        145. 
        
        
      
        
        
          
      145. 
            
            

            

            
          
        146. 
        
        
      
        
        
          
      146. 
            1
            

            

                  find('a', id: 'view_more', class: 'view_more').click
          
        147. 
        
        
      
        
        
          
      147. 
            
            

            

            
          
        148. 
        
        
      
        
        
          
      148. 
            1
            

            

                  expect(page).not_to have_css('a', class: 'view_more hidden', id: 'view_more')
          
        149. 
        
        
      
        
        
          
      149. 
            
            

            

                end
          
        150. 
        
        
      
        
        
          
      150. 
            
            

            

            
          
        151. 
        
        
      
        
        
          
      151. 
            1
            

            

                context 'when view more' do
          
        152. 
        
        
      
        
        
          
      152. 
            1
            

            

                  it 'show books with view more button' do
          
        153. 
        
        
      
        
        
          
      153. 
            1
            

            

                    visit books_path
          
        154. 
        
        
      
        
        
          
      154. 
            
            

            

            
          
        155. 
        
        
      
        
        
          
      155. 
            1
            

            

                    expect(page).to have_css('a', class: 'view_more')
          
        156. 
        
        
      
        
        
          
      156. 
            
            

            

                  end
          
        157. 
        
        
      
        
        
          
      157. 
            
            

            

            
          
        158. 
        
        
      
        
        
          
      158. 
            1
            

            

                  it 'show loaded books', js: true do
          
        159. 
        
        
      
        
        
          
      159. 
            1
            

            

                    visit books_path
          
        160. 
        
        
      
        
        
          
      160. 
            
            

            

            
          
        161. 
        
        
      
        
        
          
      161. 
            1
            

            

                    find('a', class: 'view_more').click
          
        162. 
        
        
      
        
        
          
      162. 
            
            

            

            
          
        163. 
        
        
      
        
        
          
      163. 
            1
            

            

                    expect(page).to have_content(books.last.title)
          
        164. 
        
        
      
        
        
          
      164. 
            
            

            

                  end
          
        165. 
        
        
      
        
        
          
      165. 
            
            

            

                end
          
        166. 
        
        
      
        
        
          
      166. 
            
            

            

              end
          
        167. 
        
        
      
        
        
          
      167. 
            
            

            

            
          
        168. 
        
        
      
        
        
          
      168. 
            1
            

            

              describe 'sort' do
          
        169. 
        
        
      
        
        
          
      169. 
            1
            

            

                shared_examples 'sort test' do
          
        170. 
        
        
      
        
        
          
      170. 
            5
            

            

                  it 'sort books' do
          
        171. 
        
        
      
        
        
          
      171. 
            5
            

            

                    create(:book, title: 'Zimbabwe', price_cents: 75,
          
        172. 
        
        
      
        
        
          
      172. 
            
            

            

                                  created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
          
        173. 
        
        
      
        
        
          
      173. 
            5
            

            

                    create(:book, title: 'Anna', price_cents: 23,
          
        174. 
        
        
      
        
        
          
      174. 
            
            

            

<<<<<<< HEAD
                                  created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00')
=======
<<<<<<< HEAD
                                             created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                                             created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
=======
                                      created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
>>>>>>> 752f0c0 (Featire specs)
=======
                                      created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
>>>>>>> 4e81ea2 (Featire specs)
=======
                                      created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 9bfbd88 (Featire specs)
          
        175. 
        
        
      
        
        
          
      175. 
            
            

            

            
          
        176. 
        
        
      
        
        
          
      176. 
            5
            

            

                    visit books_path
          
        177. 
        
        
      
        
        
          
      177. 
            
            

            

            
          
        178. 
        
        
      
        
        
          
      178. 
            5
            

            

                    find('a', class: 'dropdown-toggle lead small', text: I18n.t('catalog_page.sorting.newer_first'),
          
        179. 
        
        
      
        
        
          
      179. 
            
            

            

                              id: 'menu').click
          
        180. 
        
        
      
        
        
          
      180. 
            
            

            

            
          
        181. 
        
        
      
        
        
          
      181. 
            5
            

            

                    within 'ul', class: 'dropdown-menu', id: 'sort' do
          
        182. 
        
        
      
        
        
          
      182. 
            5
            

            

                      click_link button
          
        183. 
        
        
      
        
        
          
      183. 
            
            

            

                    end
          
        184. 
        
        
      
        
        
          
      184. 
            5
            

            

                    expect(find('.col-xs-6.col-sm-3', match: :first)).to have_content(book_title)
          
        185. 
        
        
      
        
        
          
      185. 
            
            

            

                  end
          
        186. 
        
        
      
        
        
          
      186. 
            
            

            

                end
          
        187. 
        
        
      
        
        
          
      187. 
            
            

            

            
          
        188. 
        
        
      
        
        
          
      188. 
            1
            

            

                context 'when sort by title A to Z' do
          
        189. 
        
        
      
        
        
          
      189. 
            2
            

            

                  let(:button) { I18n.t('catalog_page.sorting.title.asc') }
          
        190. 
        
        
      
        
        
          
      190. 
            2
            

            

                  let(:book_title) { 'Anna' }
          
        191. 
        
        
      
        
        
          
      191. 
            
            

            

            
          
        192. 
        
        
      
        
        
          
      192. 
            1
            

            

                  include_examples 'sort test'
          
        193. 
        
        
      
        
        
          
      193. 
            
            

            

                end
          
        194. 
        
        
      
        
        
          
      194. 
            
            

            

            
          
        195. 
        
        
      
        
        
          
      195. 
            1
            

            

                context 'when sort by title Z to A' do
          
        196. 
        
        
      
        
        
          
      196. 
            2
            

            

                  let(:button) { I18n.t('catalog_page.sorting.title.desc') }
          
        197. 
        
        
      
        
        
          
      197. 
            2
            

            

                  let(:book_title) { 'Zimbabwe' }
          
        198. 
        
        
      
        
        
          
      198. 
            
            

            

            
          
        199. 
        
        
      
        
        
          
      199. 
            1
            

            

                  include_examples 'sort test'
          
        200. 
        
        
      
        
        
          
      200. 
            
            

            

                end
          
        201. 
        
        
      
        
        
          
      201. 
            
            

            

            
          
        202. 
        
        
      
        
        
          
      202. 
            1
            

            

                context 'when sort by price High to Low' do
          
        203. 
        
        
      
        
        
          
      203. 
            2
            

            

                  let(:button) { I18n.t('catalog_page.sorting.price.desc') }
          
        204. 
        
        
      
        
        
          
      204. 
            2
            

            

                  let(:book_title) { 'Zimbabwe' }
          
        205. 
        
        
      
        
        
          
      205. 
            
            

            

            
          
        206. 
        
        
      
        
        
          
      206. 
            1
            

            

                  include_examples 'sort test'
          
        207. 
        
        
      
        
        
          
      207. 
            
            

            

                end
          
        208. 
        
        
      
        
        
          
      208. 
            
            

            

            
          
        209. 
        
        
      
        
        
          
      209. 
            1
            

            

                context 'when sort by price Low to High' do
          
        210. 
        
        
      
        
        
          
      210. 
            2
            

            

                  let(:button) { I18n.t('catalog_page.sorting.price.asc') }
          
        211. 
        
        
      
        
        
          
      211. 
            2
            

            

                  let(:book_title) { 'Anna' }
          
        212. 
        
        
      
        
        
          
      212. 
            
            

            

            
          
        213. 
        
        
      
        
        
          
      213. 
            1
            

            

                  include_examples 'sort test'
          
        214. 
        
        
      
        
        
          
      214. 
            
            

            

                end
          
        215. 
        
        
      
        
        
          
      215. 
            
            

            

            
          
        216. 
        
        
      
        
        
          
      216. 
            1
            

            

                context 'when sort by newest' do
          
        217. 
        
        
      
        
        
          
      217. 
            2
            

            

                  let(:button) { I18n.t('catalog_page.sorting.newer_first') }
          
        218. 
        
        
      
        
        
          
      218. 
            2
            

            

                  let(:book_title) { 'Zimbabwe' }
          
        219. 
        
        
      
        
        
          
      219. 
            
            

            

            
          
        220. 
        
        
      
        
        
          
      220. 
            1
            

            

                  include_examples 'sort test'
          
        221. 
        
        
      
        
        
          
      221. 
            
            

            

                end
          
        222. 
        
        
      
        
        
          
      222. 
            
            

            

              end
          
        223. 
        
        
      
        
        
          
      223. 
            
            

            

            end
          
        224. 
        
        
      
    
      
  
      

      

      
<<<<<<< HEAD
=======
        
      
  
      
    
      spec/feature/cart_spec.rb
      
    
      
      
  96.55%


      lines covered
    
      

    

    
      
      29 relevant lines.
      28 lines covered and
      1 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            require 'rails_helper'
          
        2. 
        
        
      
        
        
          
      2. 
            
            

            

            
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

            RSpec.describe 'Cart', type: :feature, js: true do
          
        4. 
        
        
      
        
        
          
      4. 
            5
            

            

              let(:book) { FactoryBot.create(:book) }
          
        5. 
        
        
      
        
        
          
      5. 
            
            

            

            
          
        6. 
        
        
      
        
        
          
      6. 
            1
            

            

              before do
          
        7. 
        
        
      
        
        
          
      7. 
            4
            

            

                book
          
        8. 
        
        
      
        
        
          
      8. 
            4
            

            

                visit book_path(book.id)
          
        9. 
        
        
      
        
        
          
      9. 
            
            

            

            
          
        10. 
        
        
      
        
        
          
      10. 
            4
            

            

                click_button I18n.t('book_page.add_to_card')
          
        11. 
        
        
      
        
        
          
      11. 
            
            

            

              end
          
        12. 
        
        
      
        
        
          
      12. 
            
            

            

            
          
        13. 
        
        
      
        
        
          
      13. 
            1
            

            

              describe '#add_book_to_order' do
          
        14. 
        
        
      
        
        
          
      14. 
            1
            

            

                it 'add book to order' do
          
        15. 
        
        
      
        
        
          
      15. 
            1
            

            

                  within('span', class: 'shop-icon') do
          
        16. 
        
        
      
        
        
          
      16. 
            1
            

            

                    expect(page).to have_content(1)
          
        17. 
        
        
      
        
        
          
      17. 
            
            

            

                  end
          
        18. 
        
        
      
        
        
          
      18. 
            
            

            

                end
          
        19. 
        
        
      
        
        
          
      19. 
            
            

            

              end
          
        20. 
        
        
      
        
        
          
      20. 
            
            

            

            
          
        21. 
        
        
      
        
        
          
      21. 
            1
            

            

              describe '#quantity_change' do
          
        22. 
        
        
      
        
        
          
      22. 
            1
            

            

                it 'book quantity inc' do
          
        23. 
        
        
      
        
        
          
      23. 
            1
            

            

                  visit orders_path
          
        24. 
        
        
      
        
        
          
      24. 
            
            

            

            
          
        25. 
        
        
      
        
        
          
      25. 
            1
            

            

                  within("a#inc#{book.id}.input-link") do
          
        26. 
        
        
      
        
        
          
      26. 
            1
            

            

                    find('i.fa.fa-plus.line-heaght-40').click
          
        27. 
        
        
      
        
        
          
      27. 
            
            

            

                  end
          
        28. 
        
        
      
        
        
          
      28. 
            
            

            

            
          
        29. 
        
        
      
        
        
          
      29. 
            1
            

            

                  sleep(2)
          
        30. 
        
        
      
        
        
          
      30. 
            
            

            

            
          
        31. 
        
        
      
        
        
          
      31. 
            1
            

            

                  expect(find_field("counter#{book.id}").value).to eq('2')
          
        32. 
        
        
      
        
        
          
      32. 
            
            

            

                end
          
        33. 
        
        
      
        
        
          
      33. 
            
            

            

            
          
        34. 
        
        
      
        
        
          
      34. 
            1
            

            

                it 'book quantity dec' do
          
        35. 
        
        
      
        
        
          
      35. 
            1
            

            

                  visit orders_path
          
        36. 
        
        
      
        
        
          
      36. 
            
            

            

            
          
        37. 
        
        
      
        
        
          
      37. 
            1
            

            

                  within("a#dec#{book.id}.input-link") do
          
        38. 
        
        
      
        
        
          
      38. 
            1
            

            

                    find('i.fa.fa-minus.line-heaght-40').click
          
        39. 
        
        
      
        
        
          
      39. 
            
            

            

                  end
          
        40. 
        
        
      
        
        
          
      40. 
            
            

            

            
          
        41. 
        
        
      
        
        
          
      41. 
            1
            

            

                  sleep(2)
          
        42. 
        
        
      
        
        
          
      42. 
            
            

            

            
          
        43. 
        
        
      
        
        
          
      43. 
            1
            

            

                  expect(find_field("counter#{book.id}").value).to eq('0')
          
        44. 
        
        
      
        
        
          
      44. 
            
            

            

                end
          
        45. 
        
        
      
        
        
          
      45. 
            
            

            

              end
          
        46. 
        
        
      
        
        
          
      46. 
            
            

            

            
          
        47. 
        
        
      
        
        
          
      47. 
            1
            

            

              describe '#remove_book_from_cart' do
          
        48. 
        
        
      
        
        
          
      48. 
            1
            

            

                it 'book quantity change' do
          
        49. 
        
        
      
        
        
          
      49. 
            1
            

            

                  visit orders_path
          
        50. 
        
        
      
        
        
          
      50. 
            
            

            

            
          
        51. 
        
        
      
        
        
          
      51. 
            1
            

            

                  find('button.close.general-cart-close').click
          
        52. 
        
        
      
        
        
          
      52. 
            
            

            

            
          
        53. 
        
        
      
        
        
          
      53. 
            
            

            

                  expect(page).to have_content(I18n.t('order.messages.delete'))
          
        54. 
        
        
      
        
        
          
      54. 
            
            

            

                end
          
        55. 
        
        
      
        
        
          
      55. 
            
            

            

              end
          
        56. 
        
        
      
        
        
          
      56. 
            
            

            

            end
          
        57. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/feature/coupon_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      30 relevant lines.
      30 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            require 'rails_helper'
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

            require_relative '../support/shared_context'
          
        3. 
        
        
      
        
        
          
      3. 
            
            

            

            
          
        4. 
        
        
      
        
        
          
      4. 
            1
            

            

            RSpec.describe 'Coupon', type: :feature, js: true do
          
        5. 
        
        
      
        
        
          
      5. 
            1
            

            

              include_context 'with api request authentication helper methods'
          
        6. 
        
        
      
        
        
          
      6. 
            1
            

            

              include_context 'with api request global before and after hooks'
          
        7. 
        
        
      
        
        
          
      7. 
            
            

            

            
          
        8. 
        
        
      
        
        
          
      8. 
            5
            

            

              let(:user) { FactoryBot.create(:user) }
          
        9. 
        
        
      
        
        
          
      9. 
            4
            

            

              let(:coupon) { FactoryBot.create(:coupon, discount: 0.15) }
          
        10. 
        
        
      
        
        
          
      10. 
            5
            

            

              let(:order) { FactoryBot.create(:order, user_id: user.id, books_count: 0) }
          
        11. 
        
        
      
        
        
          
      11. 
            5
            

            

              let(:book) { FactoryBot.create(:book, price_cents: 1234) }
          
        12. 
        
        
      
        
        
          
      12. 
            5
            

            

              let(:order_book) { FactoryBot.create(:order_book, order: order, book: book) }
          
        13. 
        
        
      
        
        
          
      13. 
            
            

            

            
          
        14. 
        
        
      
        
        
          
      14. 
            1
            

            

              before do
          
        15. 
        
        
      
        
        
          
      15. 
            4
            

            

                sign_in(user)
          
        16. 
        
        
      
        
        
          
      16. 
            4
            

            

                order
          
        17. 
        
        
      
        
        
          
      17. 
            4
            

            

                order_book
          
        18. 
        
        
      
        
        
          
      18. 
            4
            

            

                visit orders_path
          
        19. 
        
        
      
        
        
          
      19. 
            
            

            

              end
          
        20. 
        
        
      
        
        
          
      20. 
            
            

            

            
          
        21. 
        
        
      
        
        
          
      21. 
            1
            

            

              describe '#valid coupon' do
          
        22. 
        
        
      
        
        
          
      22. 
            1
            

            

                before do
          
        23. 
        
        
      
        
        
          
      23. 
            3
            

            

                  fill_in 'input', with: coupon.code
          
        24. 
        
        
      
        
        
          
      24. 
            
            

            

            
          
        25. 
        
        
      
        
        
          
      25. 
            3
            

            

                  click_button I18n.t('order.apply')
          
        26. 
        
        
      
        
        
          
      26. 
            
            

            

                end
          
        27. 
        
        
      
        
        
          
      27. 
            
            

            

            
          
        28. 
        
        
      
        
        
          
      28. 
            1
            

            

                it 'sub price' do
          
        29. 
        
        
      
        
        
          
      29. 
            1
            

            

                  expect(page).to have_content("SubTotal:\n€ 12.34")
          
        30. 
        
        
      
        
        
          
      30. 
            
            

            

                end
          
        31. 
        
        
      
        
        
          
      31. 
            
            

            

            
          
        32. 
        
        
      
        
        
          
      32. 
            1
            

            

                it 'use coupon' do
          
        33. 
        
        
      
        
        
          
      33. 
            1
            

            

                  expect(page).to have_content("Coupon:\n€ 1.85")
          
        34. 
        
        
      
        
        
          
      34. 
            
            

            

                end
          
        35. 
        
        
      
        
        
          
      35. 
            
            

            

            
          
        36. 
        
        
      
        
        
          
      36. 
            1
            

            

                it 'count price with coupon' do
          
        37. 
        
        
      
        
        
          
      37. 
            1
            

            

                  expect(page).to have_content('Order Total: € 10.49')
          
        38. 
        
        
      
        
        
          
      38. 
            
            

            

                end
          
        39. 
        
        
      
        
        
          
      39. 
            
            

            

              end
          
        40. 
        
        
      
        
        
          
      40. 
            
            

            

            
          
        41. 
        
        
      
        
        
          
      41. 
            1
            

            

              describe '#invalid coupon' do
          
        42. 
        
        
      
        
        
          
      42. 
            1
            

            

                it 'show error message' do
          
        43. 
        
        
      
        
        
          
      43. 
            1
            

            

                  fill_in 'input', with: 'dasdasdqe1243wasad'
          
        44. 
        
        
      
        
        
          
      44. 
            
            

            

            
          
        45. 
        
        
      
        
        
          
      45. 
            1
            

            

                  click_button I18n.t('order.apply')
          
        46. 
        
        
      
        
        
          
      46. 
            
            

            

            
          
        47. 
        
        
      
        
        
          
      47. 
            1
            

            

                  expect(page).to have_content(I18n.t('order.coupon.error'))
          
        48. 
        
        
      
        
        
          
      48. 
            
            

            

                end
          
        49. 
        
        
      
        
        
          
      49. 
            
            

            

              end
          
        50. 
        
        
      
        
        
          
      50. 
            
            

            

            end
          
        51. 
        
        
      
    
      
  
      

      

      
>>>>>>> 366b257 (Fix)
        
      
  
      
    
      spec/feature/home_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      49 relevant lines.
      49 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            RSpec.describe 'Home', type: :feature do
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

              include_context 'with api request authentication helper methods'
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

              include_context 'with api request global before and after hooks'
          
        4. 
        
        
      
        
        
          
      4. 
            
            

            

            
          
        5. 
        
        
      
        
        
          
      5. 
            1
            

            

              describe 'Get Started' do
          
        6. 
        
        
      
        
        
          
      6. 
            1
            

            

                it 'on click move to catalog page' do
          
        7. 
        
        
      
        
        
          
      7. 
            1
            

            

                  visit root_path
          
        8. 
        
        
      
        
        
          
      8. 
            
            

            

            
          
        9. 
        
        
      
        
        
          
      9. 
            1
            

            

                  click_on 'Get Started'
          
        10. 
        
        
      
        
        
          
      10. 
            
            

            

            
          
        11. 
        
        
      
        
        
          
      11. 
            1
            

            

                  expect(page).to have_content('Catalog')
          
        12. 
        
        
      
        
        
          
      12. 
            
            

            

                end
          
        13. 
        
        
      
        
        
          
      13. 
            
            

            

              end
          
        14. 
        
        
      
        
        
          
      14. 
            
            

            

            
          
        15. 
        
        
      
        
        
          
      15. 
            1
            

            

              describe 'navbar' do
          
        16. 
        
        
      
        
        
          
      16. 
            2
            

            

                let(:books_category) { create(:books_category) }
          
        17. 
        
        
      
        
        
          
      17. 
            
            

            

            
          
        18. 
        
        
      
        
        
          
      18. 
            1
            

            

                it 'on click home move to root-path' do
          
        19. 
        
        
      
        
        
          
      19. 
            1
            

            

                  visit books_path
          
        20. 
        
        
      
        
        
          
      20. 
            
            

            

            
          
        21. 
        
        
      
        
        
          
      21. 
            1
            

            

                  find('a', id: 'root').click
          
        22. 
        
        
      
        
        
          
      22. 
            
            

            

            
          
        23. 
        
        
      
        
        
          
      23. 
            1
            

            

                  expect(page).to have_content('Get Started')
          
        24. 
        
        
      
        
        
          
      24. 
            
            

            

                end
          
        25. 
        
        
      
        
        
          
      25. 
            
            

            

            
          
        26. 
        
        
      
        
        
          
      26. 
            1
            

            

                it 'on click category name move to root-path with books that belong to this category' do
          
        27. 
        
        
      
        
        
          
      27. 
            1
            

            

                  books_category
          
        28. 
        
        
      
        
        
          
      28. 
            
            

            

            
          
        29. 
        
        
      
        
        
          
      29. 
            1
            

            

                  visit root_path
          
        30. 
        
        
      
        
        
          
      30. 
            
            

            

            
          
        31. 
        
        
      
        
        
          
      31. 
            1
            

            

                  find('a', class: 'dropdown-toggle', text: 'Shop').click
          
        32. 
        
        
      
        
        
          
      32. 
            
            

            

            
          
        33. 
        
        
      
        
        
          
      33. 
            1
            

            

                  within('ul', id: 'nav') do
          
        34. 
        
        
      
        
        
          
      34. 
            1
            

            

                    find('a', class: 'collapse-link', text: books_category.category.name).click
          
        35. 
        
        
      
        
        
          
      35. 
            
            

            

                  end
          
        36. 
        
        
      
        
        
          
      36. 
            
            

            

            
          
        37. 
        
        
      
        
        
          
      37. 
            1
            

            

                  expect(page).to have_content(books_category.category.books.first.title)
          
        38. 
        
        
      
        
        
          
      38. 
            
            

            

                end
          
        39. 
        
        
      
        
        
          
      39. 
            
            

            

            
          
        40. 
        
        
      
        
        
          
      40. 
            1
            

            

                context 'when guest' do
          
        41. 
        
        
      
        
        
          
      41. 
            1
            

            

                  it 'on click login go to login page' do
          
        42. 
        
        
      
        
        
          
      42. 
            1
            

            

                    visit root_path
          
        43. 
        
        
      
        
        
          
      43. 
            
            

            

            
          
        44. 
        
        
      
        
        
          
      44. 
            1
            

            

                    within 'div', class: 'visible-xs' do
          
        45. 
        
        
      
        
        
          
      45. 
            1
            

            

                      click_link I18n.t('header.log_in')
          
        46. 
        
        
      
        
        
          
      46. 
            
            

            

                    end
          
        47. 
        
        
      
        
        
          
      47. 
            
            

            

            
          
        48. 
        
        
      
        
        
          
      48. 
            1
            

            

                    expect(page).to have_content(I18n.t('header.log_in'))
          
        49. 
        
        
      
        
        
          
      49. 
            
            

            

                  end
          
        50. 
        
        
      
        
        
          
      50. 
            
            

            

            
          
        51. 
        
        
      
        
        
          
      51. 
            1
            

            

                  it 'on click sing up go to sing up page' do
          
        52. 
        
        
      
        
        
          
      52. 
            1
            

            

                    visit root_path
          
        53. 
        
        
      
        
        
          
      53. 
            
            

            

            
          
        54. 
        
        
      
        
        
          
      54. 
            1
            

            

                    within 'div', class: 'visible-xs' do
          
        55. 
        
        
      
        
        
          
      55. 
            1
            

            

                      click_link I18n.t('header.sing_up')
          
        56. 
        
        
      
        
        
          
      56. 
            
            

            

                    end
          
        57. 
        
        
      
        
        
          
      57. 
            
            

            

            
          
        58. 
        
        
      
        
        
          
      58. 
            1
            

            

                    expect(page).to have_content(I18n.t('header.sing_up'))
          
        59. 
        
        
      
        
        
          
      59. 
            
            

            

                  end
          
        60. 
        
        
      
        
        
          
      60. 
            
            

            

                end
          
        61. 
        
        
      
        
        
          
      61. 
            
            

            

            
          
        62. 
        
        
      
        
        
          
      62. 
            1
            

            

                context 'when user', js: true do
          
        63. 
        
        
      
        
        
          
      63. 
            4
            

            

                  let(:user) { create(:user) }
          
        64. 
        
        
      
        
        
          
      64. 
            
            

            

            
          
        65. 
        
        
      
        
        
          
      65. 
            1
            

            

                  before do
          
        66. 
        
        
      
        
        
          
      66. 
            3
            

            

                    sign_in(user)
          
        67. 
        
        
      
        
        
          
      67. 
            
            

            

                  end
          
        68. 
        
        
      
        
        
          
      68. 
            
            

            

            
          
        69. 
        
        
      
        
        
          
      69. 
            1
            

            

                  it 'on click account show settings' do
          
        70. 
        
        
      
        
        
          
      70. 
            1
            

            

                    visit root_path
          
        71. 
        
        
      
        
        
          
      71. 
            
            

            

            
          
        72. 
        
        
      
        
        
          
      72. 
            1
            

            

                    click_on I18n.t('header.account')
          
        73. 
        
        
      
        
        
          
      73. 
            
            

            

            
          
        74. 
        
        
      
        
        
          
      74. 
            1
            

            

                    expect(page).to have_content(I18n.t('header.settings'))
          
        75. 
        
        
      
        
        
          
      75. 
            
            

            

                  end
          
        76. 
        
        
      
        
        
          
      76. 
            
            

            

            
          
        77. 
        
        
      
        
        
          
      77. 
            1
            

            

                  it 'on click account show log_out' do
          
        78. 
        
        
      
        
        
          
      78. 
            1
            

            

                    visit root_path
          
        79. 
        
        
      
        
        
          
      79. 
            
            

            

            
          
        80. 
        
        
      
        
        
          
      80. 
            1
            

            

                    click_on I18n.t('header.account')
          
        81. 
        
        
      
        
        
          
      81. 
            
            

            

            
          
        82. 
        
        
      
        
        
          
      82. 
            1
            

            

                    expect(page).to have_content(I18n.t('header.log_out'))
          
        83. 
        
        
      
        
        
          
      83. 
            
            

            

                  end
          
        84. 
        
        
      
        
        
          
      84. 
            
            

            

            
          
        85. 
        
        
      
        
        
          
      85. 
            1
            

            

                  it 'log_out' do
          
        86. 
        
        
      
        
        
          
      86. 
            1
            

            

                    visit root_path
          
        87. 
        
        
      
        
        
          
      87. 
            
            

            

            
          
        88. 
        
        
      
        
        
          
      88. 
            1
            

            

                    click_on I18n.t('header.account')
          
        89. 
        
        
      
        
        
          
      89. 
            
            

            

            
          
        90. 
        
        
      
        
        
          
      90. 
            1
            

            

                    click_on(I18n.t('header.log_out'), match: :first)
          
        91. 
        
        
      
        
        
          
      91. 
            
            

            

            
          
        92. 
        
        
      
        
        
          
      92. 
            1
            

            

                    expect(page).to have_content(I18n.t('devise.sessions.signed_out'))
          
        93. 
        
        
      
        
        
          
      93. 
            
            

            

                  end
          
        94. 
        
        
      
        
        
          
      94. 
            
            

            

                end
          
        95. 
        
        
      
        
        
          
      95. 
            
            

            

              end
          
        96. 
        
        
      
        
        
          
      96. 
            
            

            

            end
          
        97. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/feature/login_spec.rb
      
    
      
<<<<<<< HEAD
>>>>>>> a5d032d (Fix)
=======
>>>>>>> c7a726c5 (Rebased)
      
  100.0%


      lines covered
    
      

    

    
      
<<<<<<< HEAD
<<<<<<< HEAD
      31 relevant lines.
      31 lines covered and
=======
=======
>>>>>>> c7a726c5 (Rebased)
      19 relevant lines.
      19 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            RSpec.describe 'Login', type: :feature do
          
        2. 
        
        
      
        
        
          
      2. 
            3
            

            

              let(:user_second) { create(:user, email: 'test.rspec@rspec.ua') }
          
        3. 
        
        
      
        
        
          
      3. 
            
            

            

            
          
        4. 
        
        
      
        
        
          
      4. 
            1
            

            

              describe '#login' do
          
        5. 
        
        
      
        
        
          
      5. 
            1
            

            

                before do
          
        6. 
        
        
      
        
        
          
      6. 
            2
            

            

                  visit new_user_session_path
          
        7. 
        
        
      
        
        
          
      7. 
            
            

            

                end
          
        8. 
        
        
      
        
        
          
      8. 
            
            

            

            
          
        9. 
        
        
      
        
        
          
      9. 
            1
            

            

                context 'when successfully login' do
          
        10. 
        
        
      
        
        
          
      10. 
            1
            

            

                  it 'login' do
          
        11. 
        
        
      
        
        
          
      11. 
            1
            

            

                    within 'form', class: 'new_user', id: 'new_user' do
          
        12. 
        
        
      
        
        
          
      12. 
            1
            

            

                      fill_in 'user_email', with: user_second.email
          
        13. 
        
        
      
        
        
          
      13. 
            1
            

            

                      fill_in 'user_password', with: user_second.password
          
        14. 
        
        
      
        
        
          
      14. 
            
            

            

            
          
        15. 
        
        
      
        
        
          
      15. 
            1
            

            

                      click_on I18n.t('header.log_in')
          
        16. 
        
        
      
        
        
          
      16. 
            
            

            

                    end
          
        17. 
        
        
      
        
        
          
      17. 
            
            

            

            
          
        18. 
        
        
      
        
        
          
      18. 
            1
            

            

                    expect(page).to have_text I18n.t('devise.sessions.signed_in')
          
        19. 
        
        
      
        
        
          
      19. 
            
            

            

                  end
          
        20. 
        
        
      
        
        
          
      20. 
            
            

            

                end
          
        21. 
        
        
      
        
        
          
      21. 
            
            

            

            
          
        22. 
        
        
      
        
        
          
      22. 
            1
            

            

                context 'when unsuccessfully login' do
          
        23. 
        
        
      
        
        
          
      23. 
            1
            

            

                  it 'didn`t login' do
          
        24. 
        
        
      
        
        
          
      24. 
            1
            

            

                    within 'form', class: 'new_user', id: 'new_user' do
          
        25. 
        
        
      
        
        
          
      25. 
            1
            

            

                      fill_in 'user_email', with: user_second.email
          
        26. 
        
        
      
        
        
          
      26. 
            1
            

            

                      fill_in 'user_password', with: 'wrong_password'
          
        27. 
        
        
      
        
        
          
      27. 
            
            

            

            
          
        28. 
        
        
      
        
        
          
      28. 
            1
            

            

                      click_on I18n.t('header.log_in')
          
        29. 
        
        
      
        
        
          
      29. 
            
            

            

                    end
          
        30. 
        
        
      
        
        
          
      30. 
            
            

            

            
          
        31. 
        
        
      
        
        
          
      31. 
            1
            

            

                    expect(page).to have_text 'Invalid Email or password.'
          
        32. 
        
        
      
        
        
          
      32. 
            
            

            

                  end
          
        33. 
        
        
      
        
        
          
      33. 
            
            

            

                end
          
        34. 
        
        
      
        
        
          
      34. 
            
            

            

              end
          
        35. 
        
        
      
        
        
          
      35. 
            
            

            

            end
          
        36. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/feature/new_password_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      13 relevant lines.
      13 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            require_relative '../rails_helper'
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

            require_relative '../support/shared_context'
          
        3. 
        
        
      
        
        
          
      3. 
            
            

            

            
          
        4. 
        
        
      
        
        
          
      4. 
            1
            

            

            RSpec.describe 'New Password', type: :feature do
          
        5. 
        
        
      
        
        
          
      5. 
            3
            

            

              let(:user) { FactoryBot.create(:user) }
          
        6. 
        
        
      
        
        
          
      6. 
            
            

            

            
          
        7. 
        
        
      
        
        
          
      7. 
            1
            

            

              describe '#new_password' do
          
        8. 
        
        
      
        
        
          
      8. 
            1
            

            

                it 'change password' do
          
        9. 
        
        
      
        
        
          
      9. 
            1
            

            

                  user.reset_password('newPassword', 'newPassword')
          
        10. 
        
        
      
        
        
          
      10. 
            
            

            

            
          
        11. 
        
        
      
        
        
          
      11. 
            1
            

            

                  expect(user.password).to eq('newPassword')
          
        12. 
        
        
      
        
        
          
      12. 
            
            

            

                end
          
        13. 
        
        
      
        
        
          
      13. 
            
            

            

            
          
        14. 
        
        
      
        
        
          
      14. 
            1
            

            

                it 'not validate password' do
          
        15. 
        
        
      
        
        
          
      15. 
            1
            

            

                  visit new_user_password_path
          
        16. 
        
        
      
        
        
          
      16. 
            
            

            

            
          
        17. 
        
        
      
        
        
          
      17. 
            1
            

            

                  fill_in 'email', with: user.email
          
        18. 
        
        
      
        
        
          
      18. 
            
            

            

            
          
        19. 
        
        
      
        
        
          
      19. 
            1
            

            

                  click_on I18n.t('login.send_instructions')
          
        20. 
        
        
      
        
        
          
      20. 
            
            

            

            
          
        21. 
        
        
      
        
        
          
      21. 
            1
            

            

                  expect(page).to have_content(I18n.t('devise.passwords.send_instructions'))
          
        22. 
        
        
      
        
        
          
      22. 
            
            

            

                end
          
        23. 
        
        
      
        
        
          
      23. 
            
            

            

              end
          
        24. 
        
        
      
        
        
          
      24. 
            
            

            

            end
          
        25. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/feature/registration_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      29 relevant lines.
      29 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            RSpec.describe 'Registration', type: :feature do
          
        2. 
        
        
      
        
        
          
      2. 
            3
            

            

              let(:user) { create(:user, email: 'test.rspec@rspec.ua') }
          
        3. 
        
        
      
        
        
          
      3. 
            
            

            

            
          
        4. 
        
        
      
        
        
          
      4. 
            1
            

            

              describe '#sing_up' do
          
        5. 
        
        
      
        
        
          
      5. 
            1
            

            

                before do
          
        6. 
        
        
      
        
        
          
      6. 
            3
            

            

                  visit new_user_registration_path
          
        7. 
        
        
      
        
        
          
      7. 
            
            

            

                end
          
        8. 
        
        
      
        
        
          
      8. 
            
            

            

            
          
        9. 
        
        
      
        
        
          
      9. 
            1
            

            

                context 'when successfully sing_up' do
          
        10. 
        
        
      
        
        
          
      10. 
            1
            

            

                  it 'sing_up users' do
          
        11. 
        
        
      
        
        
          
      11. 
            1
            

            

                    within 'form', class: 'new_user', id: 'new_user' do
          
        12. 
        
        
      
        
        
          
      12. 
            1
            

            

                      fill_in 'user_email', with: 'email-test@rspec.com'
          
        13. 
        
        
      
        
        
          
      13. 
            1
            

            

                      fill_in 'user_password', with: user.password
          
        14. 
        
        
      
        
        
          
      14. 
            1
            

            

                      fill_in 'user_password_confirmation', with: user.password
          
        15. 
        
        
      
        
        
          
      15. 
            
            

            

            
          
        16. 
        
        
      
        
        
          
      16. 
            1
            

            

                      click_on I18n.t('header.sing_up')
          
        17. 
        
        
      
        
        
          
      17. 
            
            

            

                    end
          
        18. 
        
        
      
        
        
          
      18. 
            
            

            

            
          
        19. 
        
        
      
        
        
          
      19. 
            1
            

            

                    expect(page).to have_text I18n.t('devise.registrations.signed_up_but_unconfirmed')
          
        20. 
        
        
      
        
        
          
      20. 
            
            

            

                  end
          
        21. 
        
        
      
        
        
          
      21. 
            
            

            

                end
          
        22. 
        
        
      
        
        
          
      22. 
            
            

            

            
          
        23. 
        
        
      
        
        
          
      23. 
            1
            

            

                context 'when users is already exits' do
          
        24. 
        
        
      
        
        
          
      24. 
            1
            

            

                  it 'sing_up users' do
          
        25. 
        
        
      
        
        
          
      25. 
            1
            

            

                    within 'form', class: 'new_user', id: 'new_user' do
          
        26. 
        
        
      
        
        
          
      26. 
            1
            

            

                      fill_in 'user_email', with: user.email
          
        27. 
        
        
      
        
        
          
      27. 
            1
            

            

                      fill_in 'user_password', with: user.password
          
        28. 
        
        
      
        
        
          
      28. 
            1
            

            

                      fill_in 'user_password_confirmation', with: user.password
          
        29. 
        
        
      
        
        
          
      29. 
            
            

            

            
          
        30. 
        
        
      
        
        
          
      30. 
            1
            

            

                      click_on I18n.t('header.sing_up')
          
        31. 
        
        
      
        
        
          
      31. 
            
            

            

                    end
          
        32. 
        
        
      
        
        
          
      32. 
            
            

            

            
          
        33. 
        
        
      
        
        
          
      33. 
            1
            

            

                    expect(page).to have_text('Email has already been taken')
          
        34. 
        
        
      
        
        
          
      34. 
            
            

            

                  end
          
        35. 
        
        
      
        
        
          
      35. 
            
            

            

                end
          
        36. 
        
        
      
        
        
          
      36. 
            
            

            

            
          
        37. 
        
        
      
        
        
          
      37. 
            1
            

            

                context 'when unsuccessfully sing_up' do
          
        38. 
        
        
      
        
        
          
      38. 
            1
            

            

                  it 'didn`t sing_up' do
          
        39. 
        
        
      
        
        
          
      39. 
            1
            

            

                    within 'form', class: 'new_user', id: 'new_user' do
          
        40. 
        
        
      
        
        
          
      40. 
            1
            

            

                      fill_in 'user_email', with: FFaker::Internet.email
          
        41. 
        
        
      
        
        
          
      41. 
            1
            

            

                      fill_in 'user_password', with: 'password'
          
        42. 
        
        
      
        
        
          
      42. 
            1
            

            

                      fill_in 'user_password_confirmation', with: 'wrong'
          
        43. 
        
        
      
        
        
          
      43. 
            
            

            

            
          
        44. 
        
        
      
        
        
          
      44. 
            1
            

            

                      click_on I18n.t('header.sing_up')
          
        45. 
        
        
      
        
        
          
      45. 
            
            

            

                    end
          
        46. 
        
        
      
        
        
          
      46. 
            
            

            

            
          
        47. 
        
        
      
        
        
          
      47. 
            1
            

            

                    expect(page).to have_text '1 error prohibited this user from being saved'
          
        48. 
        
        
      
        
        
          
      48. 
            
            

            

                  end
          
        49. 
        
        
      
        
        
          
      49. 
            
            

            

                end
          
        50. 
        
        
      
        
        
          
      50. 
            
            

            

              end
          
        51. 
        
        
      
        
        
          
      51. 
            
            

            

            end
          
        52. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/feature/review_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
<<<<<<< HEAD
      28 relevant lines.
      28 lines covered and
=======
      30 relevant lines.
      30 lines covered and
>>>>>>> c7a726c5 (Rebased)
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

<<<<<<< HEAD
            RSpec.describe 'Review', type: :feature do
=======
            require_relative '../rails_helper'
>>>>>>> c7a726c5 (Rebased)
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

<<<<<<< HEAD
              include_context 'with api request authentication helper methods'
=======
            require_relative '../support/shared_context'
>>>>>>> c7a726c5 (Rebased)
          
        3. 
        
        
      
        
        
<<<<<<< HEAD
          
      3. 
            1
            

            

              include_context 'with api request global before and after hooks'
          
        4. 
        
        
      
        
        
          
      4. 
=======
          
      5. 
>>>>>>> c7a726c5 (Rebased)
            
            

            

            
          
        6. 
        
        
      
        
        
<<<<<<< HEAD
          
      6. 
            3
=======
          
      7. 
            1
>>>>>>> c7a726c5 (Rebased)
            

            

<<<<<<< HEAD
              let(:user) { create(:user).decorate }
=======
            RSpec.describe 'Review', type: :feature do
>>>>>>> c7a726c5 (Rebased)
          
        8. 
        
        
      
        
        
<<<<<<< HEAD
          
      8. 
            3
=======
          
      9. 
            1
>>>>>>> c7a726c5 (Rebased)
            

            

<<<<<<< HEAD
              let(:book) { create(:book).decorate }
=======
              include_context 'with api request authentication helper methods'
          
        10. 
        
        
      
        
        
          
      10. 
            1
            

            

              include_context 'with api request global before and after hooks'
>>>>>>> c7a726c5 (Rebased)
          
        11. 
        
        
      
        
        
          
      11. 
            
            

            

            
          
        12. 
        
        
      
        
        
<<<<<<< HEAD
          
      12. 
            1
=======
          
      13. 
            3
>>>>>>> c7a726c5 (Rebased)
            

            

<<<<<<< HEAD
              before do
=======
              let(:user) { FactoryBot.create(:user).decorate }
>>>>>>> c7a726c5 (Rebased)
          
        14. 
        
        
      
        
        
<<<<<<< HEAD
          
      14. 
            2
=======
          
      15. 
            3
>>>>>>> c7a726c5 (Rebased)
            

            

<<<<<<< HEAD
                sign_in(user)
=======
              let(:book) { FactoryBot.create(:book).decorate }
>>>>>>> c7a726c5 (Rebased)
          
        16. 
        
        
      
        
        
          
      16. 
            
            

            

            
          
        17. 
        
        
      
        
        
<<<<<<< HEAD
          
      17. 
=======
          
      18. 
            1
            

            

              before do
          
        19. 
        
        
      
        
        
          
      19. 
>>>>>>> c7a726c5 (Rebased)
            2
            

            

<<<<<<< HEAD
                visit book_path(book)
          
        20. 
        
        
      
        
        
          
      20. 
            
            

            

              end
=======
                sign_in(user)
>>>>>>> c7a726c5 (Rebased)
          
        21. 
        
        
      
        
        
          
      21. 
            
            

            

            
          
        22. 
        
        
      
        
        
<<<<<<< HEAD
          
      22. 
            1
            

            

              shared_examples 'review' do
          
        23. 
        
        
      
        
        
          
      23. 
=======
          
      24. 
>>>>>>> c7a726c5 (Rebased)
            2
            

            

<<<<<<< HEAD
                it 'review' do
=======
                visit book_path(book)
>>>>>>> c7a726c5 (Rebased)
          
        25. 
        
        
      
        
        
<<<<<<< HEAD
          
      25. 
            2
=======
          
      26. 
            
>>>>>>> c7a726c5 (Rebased)
            

            

<<<<<<< HEAD
                  find('i', id: rating).click
=======
              end
>>>>>>> c7a726c5 (Rebased)
          
        27. 
        
        
      
        
        
<<<<<<< HEAD
          
      27. 
=======
          
      28. 
>>>>>>> c7a726c5 (Rebased)
            
            

            

            
          
        29. 
        
        
      
        
        
<<<<<<< HEAD
=======
          
      29. 
            1
            

            

              shared_examples 'review' do
          
        30. 
        
        
      
        
        
>>>>>>> c7a726c5 (Rebased)
          
      30. 
            2
            

            

<<<<<<< HEAD
                  fill_in :title, with: FFaker::Lorem.sentence(title_words)
=======
                it 'review' do
>>>>>>> c7a726c5 (Rebased)
          
        31. 
        
        
      
        
        
          
      31. 
            2
            

            

<<<<<<< HEAD
                  fill_in :body, with: FFaker::Lorem.sentence(body_words)
=======
                  find('i', id: rating).click
>>>>>>> c7a726c5 (Rebased)
          
        32. 
        
        
      
        
        
          
      32. 
            
            

            

            
          
        33. 
        
        
      
        
        
          
      33. 
            2
            

            

<<<<<<< HEAD
                  click_on I18n.t('review.post')
=======
                  fill_in :title, with: FFaker::Lorem.sentence(title_words)
>>>>>>> c7a726c5 (Rebased)
          
        34. 
        
        
      
        
        
<<<<<<< HEAD
          
      34. 
=======
          
      35. 
            2
            

            

                  fill_in :body, with: FFaker::Lorem.sentence(body_words)
          
        36. 
        
        
      
        
        
          
      36. 
>>>>>>> c7a726c5 (Rebased)
            
            

            

            
          
        37. 
        
        
      
        
        
<<<<<<< HEAD
          
      37. 
=======
          
      38. 
>>>>>>> c7a726c5 (Rebased)
            2
            

            

<<<<<<< HEAD
                  expect(page).to have_content(result)
          
        39. 
        
        
      
        
        
          
      39. 
            
            

            

                end
=======
                  click_on I18n.t('review.post')
>>>>>>> c7a726c5 (Rebased)
          
        40. 
        
        
      
        
        
          
      40. 
            
            

            

<<<<<<< HEAD
=======
            
          
        41. 
        
        
      
        
        
          
      41. 
            2
            

            

                  expect(page).to have_content(result)
          
        42. 
        
        
      
        
        
          
      42. 
            
            

            

                end
          
        43. 
        
        
      
        
        
          
      43. 
            
            

            

>>>>>>> c7a726c5 (Rebased)
              end
          
        44. 
        
        
      
        
        
<<<<<<< HEAD
          
      44. 
=======
          
      45. 
>>>>>>> c7a726c5 (Rebased)
            
            

            

            
          
        46. 
        
        
      
        
        
<<<<<<< HEAD
          
      46. 
=======
          
      47. 
>>>>>>> c7a726c5 (Rebased)
            1
            

            

              describe '#post review', js: true do
          
        48. 
        
        
      
        
        
<<<<<<< HEAD
          
      48. 
=======
          
      49. 
>>>>>>> c7a726c5 (Rebased)
            1
            

            

                context 'when review posted' do
          
        50. 
        
        
      
        
        
<<<<<<< HEAD
          
      50. 
=======
          
      51. 
>>>>>>> c7a726c5 (Rebased)
            2
            

            

                  let(:rating) { "star#{rand(1..5)}" }
          
        52. 
        
        
      
        
        
<<<<<<< HEAD
          
      52. 
=======
          
      53. 
>>>>>>> c7a726c5 (Rebased)
            2
            

            

<<<<<<< HEAD
                  let(:title_words) { 3 }
=======
                  let(:title_words) { 5 }
>>>>>>> c7a726c5 (Rebased)
          
        54. 
        
        
      
        
        
<<<<<<< HEAD
          
      54. 
=======
          
      55. 
>>>>>>> c7a726c5 (Rebased)
            2
            

            

<<<<<<< HEAD
                  let(:body_words) { 5 }
=======
                  let(:body_words) { 10 }
>>>>>>> c7a726c5 (Rebased)
          
        56. 
        
        
      
        
        
<<<<<<< HEAD
          
      56. 
=======
          
      57. 
>>>>>>> c7a726c5 (Rebased)
            2
            

            

                  let(:result) { user.name_or_email }
          
        58. 
        
        
      
        
        
<<<<<<< HEAD
          
      58. 
            
            

            

            
          
        59. 
        
        
      
        
        
          
      59. 
            1
            

            

                  include_examples 'review'
          
        60. 
        
        
      
        
        
          
      60. 
            
            

            

                end
          
        61. 
        
        
      
        
        
=======
>>>>>>> c7a726c5 (Rebased)
          
      61. 
            
            

            

            
          
        62. 
        
        
      
        
        
          
      62. 
            1
            

            

<<<<<<< HEAD
                context 'when review not been posted' do
          
        63. 
        
        
      
        
        
          
      63. 
            2
            

            

                  let(:rating) { "star#{rand(1..5)}" }
          
        64. 
        
        
      
        
        
          
      64. 
            2
            

            

                  let(:title_words) { 80 }
          
        65. 
        
        
      
        
        
          
      65. 
            2
            

            

                  let(:body_words) { 30 }
          
        66. 
        
        
      
        
        
          
      66. 
            2
            

            

                  let(:result) { 'Title is too long (maximum is 80 characters)' }
          
        67. 
        
        
      
        
        
          
      67. 
            
            

            

            
          
        68. 
        
        
      
        
        
          
      68. 
            1
            

            

=======
>>>>>>> c7a726c5 (Rebased)
                  include_examples 'review'
          
        69. 
        
        
      
        
        
<<<<<<< HEAD
          
      69. 
=======
          
      70. 
>>>>>>> c7a726c5 (Rebased)
            
            

            

                end
          
        71. 
        
        
      
        
        
<<<<<<< HEAD
=======
          
      71. 
            
            

            

            
          
        72. 
        
        
      
        
        
          
      72. 
            1
            

            

                context 'when review not been posted' do
          
        73. 
        
        
      
        
        
          
      73. 
            2
            

            

                  let(:rating) { "star#{rand(1..5)}" }
          
        74. 
        
        
      
        
        
          
      74. 
            2
            

            

                  let(:title_words) { 80 }
          
        75. 
        
        
      
        
        
          
      75. 
            2
            

            

                  let(:body_words) { 30 }
          
        76. 
        
        
      
        
        
          
      76. 
            2
            

            

                  let(:result) { 'Title is too long (maximum is 80 characters)' }
          
        77. 
        
        
      
        
        
>>>>>>> c7a726c5 (Rebased)
          
      77. 
            
            

            

<<<<<<< HEAD
=======
            
          
        78. 
        
        
      
        
        
          
      78. 
            1
            

            

                  include_examples 'review'
          
        79. 
        
        
      
        
        
          
      79. 
            
            

            

                end
          
        80. 
        
        
      
        
        
          
      80. 
            
            

            

>>>>>>> c7a726c5 (Rebased)
              end
          
        81. 
        
        
      
        
        
<<<<<<< HEAD
          
      81. 
=======
          
      82. 
>>>>>>> c7a726c5 (Rebased)
            
            

            

            end
          
        83. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/feature/settings_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      34 relevant lines.
      34 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            RSpec.describe 'Settings', type: :feature do
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

              include_context 'with api request authentication helper methods'
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

              include_context 'with api request global before and after hooks'
          
        4. 
        
        
      
        
        
          
      4. 
            
            

            

            
          
        5. 
        
        
      
        
        
          
      5. 
            4
            

            

              let(:user) { create(:user) }
          
        6. 
        
        
      
        
        
          
      6. 
            
            

            

            
          
        7. 
        
        
      
        
        
          
      7. 
            1
            

            

              before do
          
        8. 
        
        
      
        
        
          
      8. 
            3
            

            

                sign_in(user)
          
        9. 
        
        
      
        
        
          
      9. 
            
            

            

            
          
        10. 
        
        
      
        
        
          
      10. 
            3
            

            

                visit edit_user_path(user.id)
          
        11. 
        
        
      
        
        
          
      11. 
            
            

            

            
          
        12. 
        
        
      
        
        
          
      12. 
            3
            

            

                click_link I18n.t('settings.privacy')
          
        13. 
        
        
      
        
        
          
      13. 
            
            

            

              end
          
        14. 
        
        
      
        
        
          
      14. 
            
            

            

            
          
        15. 
        
        
      
        
        
          
      15. 
            1
            

            

              describe '#email_change' do
          
        16. 
        
        
      
        
        
          
      16. 
            1
            

            

                it 'change email' do
          
        17. 
        
        
      
        
        
          
      17. 
            1
            

            

                  within('div', id: 'email') do
          
        18. 
        
        
      
        
        
          
      18. 
            1
            

            

                    fill_in :email, with: FFaker::Internet.email
          
        19. 
        
        
      
        
        
          
      19. 
            
            

            

            
          
        20. 
        
        
      
        
        
          
      20. 
            1
            

            

                    click_on I18n.t('settings.save')
          
        21. 
        
        
      
        
        
          
      21. 
            
            

            

                  end
          
        22. 
        
        
      
        
        
          
      22. 
            
            

            

            
          
        23. 
        
        
      
        
        
          
      23. 
            1
            

            

                  user.confirm
          
        24. 
        
        
      
        
        
          
      24. 
            
            

            

            
          
        25. 
        
        
      
        
        
          
      25. 
            1
            

            

                  expect(page).to have_content(I18n.t('settings.message.update'))
          
        26. 
        
        
      
        
        
          
      26. 
            
            

            

                end
          
        27. 
        
        
      
        
        
          
      27. 
            
            

            

              end
          
        28. 
        
        
      
        
        
          
      28. 
            
            

            

            
          
        29. 
        
        
      
        
        
          
      29. 
            1
            

            

              describe '#password_change' do
          
        30. 
        
        
      
        
        
          
      30. 
            1
            

            

                context 'when error' do
          
        31. 
        
        
      
        
        
          
      31. 
            1
            

            

                  it 'didnt change password' do
          
        32. 
        
        
      
        
        
          
      32. 
            1
            

            

                    within('div', id: 'password') do
          
        33. 
        
        
      
        
        
          
      33. 
            1
            

            

                      fill_in :current_password, with: user.password
          
        34. 
        
        
      
        
        
          
      34. 
            1
            

            

                      fill_in :password, with: 'newPassword'
          
        35. 
        
        
      
        
        
          
      35. 
            1
            

            

                      fill_in :password_confirmation, with: 'incorrectPassword'
          
        36. 
        
        
      
        
        
          
      36. 
            
            

            

            
          
        37. 
        
        
      
        
        
          
      37. 
            1
            

            

                      click_on I18n.t('settings.save')
          
        38. 
        
        
      
        
        
          
      38. 
            
            

            

                    end
          
        39. 
        
        
      
        
        
          
      39. 
            
            

            

            
          
        40. 
        
        
      
        
        
          
      40. 
            1
            

            

                    user.confirm
          
        41. 
        
        
      
        
        
          
      41. 
            
            

            

            
          
        42. 
        
        
      
        
        
          
      42. 
            1
            

            

                    expect(page).to have_content(I18n.t('settings.error.error'))
          
        43. 
        
        
      
        
        
          
      43. 
            
            

            

                  end
          
        44. 
        
        
      
        
        
          
      44. 
            
            

            

                end
          
        45. 
        
        
      
        
        
          
      45. 
            
            

            

            
          
        46. 
        
        
      
        
        
          
      46. 
            1
            

            

                context 'when successful' do
          
        47. 
        
        
      
        
        
          
      47. 
            1
            

            

                  it 'didnt change password' do
          
        48. 
        
        
      
        
        
          
      48. 
            1
            

            

                    within('div', id: 'password') do
          
        49. 
        
        
      
        
        
          
      49. 
            1
            

            

                      fill_in :current_password, with: user.password
          
        50. 
        
        
      
        
        
          
      50. 
            1
            

            

                      fill_in :password, with: 'newPassword'
          
        51. 
        
        
      
        
        
          
      51. 
            1
            

            

                      fill_in :password_confirmation, with: 'newPassword'
          
        52. 
        
        
      
        
        
          
      52. 
            
            

            

            
          
        53. 
        
        
      
        
        
          
      53. 
            1
            

            

                      click_on I18n.t('settings.save')
          
        54. 
        
        
      
        
        
          
      54. 
            
            

            

                    end
          
        55. 
        
        
      
        
        
          
      55. 
            
            

            

            
          
        56. 
        
        
      
        
        
          
      56. 
            1
            

            

                    user.confirm
          
        57. 
        
        
      
        
        
          
      57. 
            
            

            

            
          
        58. 
        
        
      
        
        
          
      58. 
            1
            

            

                    expect(page).to have_content(I18n.t('devise.failure.unauthenticated'))
          
        59. 
        
        
      
        
        
          
      59. 
            
            

            

                  end
          
        60. 
        
        
      
        
        
          
      60. 
            
            

            

                end
          
        61. 
        
        
      
        
        
          
      61. 
            
            

            

              end
          
        62. 
        
        
      
        
        
          
      62. 
            
            

            

            end
          
        63. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/feature/shipping_spec.rb
      
    
      
      
  73.08%


      lines covered
    
      

    

    
      
      26 relevant lines.
      19 lines covered and
      7 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            RSpec.describe 'Shipping', type: :feature do
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

              include_context 'with api request authentication helper methods'
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

              include_context 'with api request global before and after hooks'
          
        4. 
        
        
      
        
        
          
      4. 
            
            

            

            
          
        5. 
        
        
      
        
        
          
      5. 
            2
            

            

              let(:user) { FactoryBot.create(:user) }
          
        6. 
        
        
      
        
        
          
      6. 
            1
            

            

              let(:attributes_for) { attributes_for(:shipping) }
          
        7. 
        
        
      
        
        
          
      7. 
            
            

            

            
          
        8. 
        
        
      
        
        
          
      8. 
            1
            

            

              describe '#fill_in', js: true do
          
        9. 
        
        
      
        
        
          
      9. 
            1
            

            

                it 'fill in shipping' do
          
        10. 
        
        
      
        
        
          
      10. 
            1
            

            

                  sign_in(user)
          
        11. 
        
        
      
        
        
          
      11. 
            
            

            

            
          
        12. 
        
        
      
        
        
          
      12. 
            1
            

            

                  visit edit_user_path(user.id)
          
        13. 
        
        
      
        
        
          
      13. 
            
            

            

            
          
        14. 
        
        
      
        
        
          
      14. 
            1
            

            

                  within('div#shipping.col-md-5.mb-40') do
          
        15. 
        
        
      
        
        
          
      15. 
            1
            

            

                    find_all('div', class: 'form-group')[0] do
          
        16. 
        
        
      
        
        
          
      16. 
            
            

            

                      fill_in :first_name, with: attributes_for[:first_name]
          
        17. 
        
        
      
        
        
          
      17. 
            
            

            

                    end
          
        18. 
        
        
      
        
        
          
      18. 
            1
            

            

                    find_all('div', class: 'form-group')[1] do
          
        19. 
        
        
      
        
        
          
      19. 
            
            

            

                      fill_in :last_name, with: attributes_for[:last_name]
          
        20. 
        
        
      
        
        
          
      20. 
            
            

            

                    end
          
        21. 
        
        
      
        
        
          
      21. 
            1
            

            

                    find_all('div', class: 'form-group')[2] do
          
        22. 
        
        
      
        
        
          
      22. 
            
            

            

                      fill_in :address, with: attributes_for[:address]
          
        23. 
        
        
      
        
        
          
      23. 
            
            

            

                    end
          
        24. 
        
        
      
        
        
          
      24. 
            1
            

            

                    find_all('div', class: 'form-group')[3] do
          
        25. 
        
        
      
        
        
          
      25. 
            
            

            

                      fill_in :city, with: attributes_for[:city]
          
        26. 
        
        
      
        
        
          
      26. 
            
            

            

                    end
          
        27. 
        
        
      
        
        
          
      27. 
            1
            

            

                    find_all('div', class: 'form-group')[4] do
          
        28. 
        
        
      
        
        
          
      28. 
            
            

            

                      fill_in :zip, with: attributes_for[:zip]
          
        29. 
        
        
      
        
        
          
      29. 
            
            

            

                    end
          
        30. 
        
        
      
        
        
          
      30. 
            1
            

            

                    find_all('div', class: 'form-group')[5] do
          
        31. 
        
        
      
        
        
          
      31. 
            
            

            

                      fill_in :country, with: attributes_for[:country]
          
        32. 
        
        
      
        
        
          
      32. 
            
            

            

                    end
          
        33. 
        
        
      
        
        
          
      33. 
            1
            

            

                    find_all('div', class: 'form-group')[6] do
          
        34. 
        
        
      
        
        
          
      34. 
            
            

            

                      fill_in :phone, with: attributes_for[:phone]
          
        35. 
        
        
      
        
        
          
      35. 
            
            

            

                    end
          
        36. 
        
        
      
        
        
          
      36. 
            1
            

            

                    click_on I18n.t('settings.save')
          
        37. 
        
        
      
        
        
          
      37. 
            
            

            

                  end
          
        38. 
        
        
      
        
        
          
      38. 
            
            

            

            
          
        39. 
        
        
      
        
        
          
      39. 
            1
            

            

                  expect(page).to have_content(I18n.t('settings.message.update'))
          
        40. 
        
        
      
        
        
          
      40. 
            
            

            

                end
          
        41. 
        
        
      
        
        
          
      41. 
            
            

            

              end
          
        42. 
        
        
      
        
        
          
      42. 
            
            

            

            end
          
        43. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/feature/user_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      42 relevant lines.
      42 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            RSpec.describe 'User', type: :feature do
          
        2. 
        
        
      
        
        
          
      2. 
            2
            

            

              let(:user) { build(:user, email: 'test.rspec@rspec.ua') }
          
        3. 
        
        
      
        
        
          
      3. 
            3
            

            

              let(:user_second) { create(:user, email: 'test.rspec-test@rspec.ua') }
          
        4. 
        
        
      
        
        
          
      4. 
            
            

            

            
          
        5. 
        
        
      
        
        
          
      5. 
            1
            

            

              describe '#sing_up' do
          
        6. 
        
        
      
        
        
          
      6. 
            1
            

            

                context 'when successfully sing_up' do
          
        7. 
        
        
      
        
        
          
      7. 
            1
            

            

                  before do
          
        8. 
        
        
      
        
        
          
      8. 
            1
            

            

                    visit new_user_registration_path
          
        9. 
        
        
      
        
        
          
      9. 
            
            

            

            
          
        10. 
        
        
      
        
        
          
      10. 
            1
            

            

                    within 'form', class: 'new_user', id: 'new_user' do
          
        11. 
        
        
      
        
        
          
      11. 
            1
            

            

                      fill_in 'user_email', with: user.email
          
        12. 
        
        
      
        
        
          
      12. 
            1
            

            

                      fill_in 'user_password', with: user.password
          
        13. 
        
        
      
        
        
          
      13. 
            1
            

            

                      fill_in 'user_password_confirmation', with: user.password
          
        14. 
        
        
      
        
        
          
      14. 
            
            

            

            
          
        15. 
        
        
      
        
        
          
      15. 
            1
            

            

                      click_on I18n.t('header.sing_up')
          
        16. 
        
        
      
        
        
          
      16. 
            
            

            

                    end
          
        17. 
        
        
      
        
        
          
      17. 
            
            

            

                  end
          
        18. 
        
        
      
        
        
          
      18. 
            
            

            

            
          
        19. 
        
        
      
        
        
          
      19. 
            1
            

            

                  it 'sing_up user' do
          
        20. 
        
        
      
        
        
          
      20. 
            1
            

            

                    expect(page).to have_text I18n.t('devise.registrations.signed_up_but_unconfirmed')
          
        21. 
        
        
      
        
        
          
      21. 
            
            

            

                  end
          
        22. 
        
        
      
        
        
          
      22. 
            
            

            

                end
          
        23. 
        
        
      
        
        
          
      23. 
            
            

            

            
          
        24. 
        
        
      
        
        
          
      24. 
            1
            

            

                context 'when unsuccessfully sing_up' do
          
        25. 
        
        
      
        
        
          
      25. 
            1
            

            

                  it 'didn`t sing_up' do
          
        26. 
        
        
      
        
        
          
      26. 
            1
            

            

                    visit new_user_registration_path
          
        27. 
        
        
      
        
        
          
      27. 
            
            

            

            
          
        28. 
        
        
      
        
        
          
      28. 
            1
            

            

                    within 'form', class: 'new_user', id: 'new_user' do
          
        29. 
        
        
      
        
        
          
      29. 
            1
            

            

                      fill_in 'user_email', with: FFaker::Internet.email
          
        30. 
        
        
      
        
        
          
      30. 
            1
            

            

                      fill_in 'user_password', with: 'wrong'
          
        31. 
        
        
      
        
        
          
      31. 
            1
            

            

                      fill_in 'user_password_confirmation', with: 'wrong'
          
        32. 
        
        
      
        
        
          
      32. 
            
            

            

            
          
        33. 
        
        
      
        
        
          
      33. 
            1
            

            

                      click_on I18n.t('header.sing_up')
          
        34. 
        
        
      
        
        
          
      34. 
            
            

            

                    end
          
        35. 
        
        
      
        
        
          
      35. 
            
            

            

            
          
        36. 
        
        
      
        
        
          
      36. 
            1
            

            

                    expect(page).to have_text '1 error prohibited this user from being saved'
          
        37. 
        
        
      
        
        
          
      37. 
            
            

            

                  end
          
        38. 
        
        
      
        
        
          
      38. 
            
            

            

                end
          
        39. 
        
        
      
        
        
          
      39. 
            
            

            

              end
          
        40. 
        
        
      
        
        
          
      40. 
            
            

            

            
          
        41. 
        
        
      
        
        
          
      41. 
            1
            

            

              describe '#login' do
          
        42. 
        
        
      
        
        
          
      42. 
            1
            

            

                before do
          
        43. 
        
        
      
        
        
          
      43. 
            2
            

            

                  user_second.confirm
          
        44. 
        
        
      
        
        
          
      44. 
            
            

            

                end
          
        45. 
        
        
      
        
        
          
      45. 
            
            

            

            
          
        46. 
        
        
      
        
        
          
      46. 
            1
            

            

                context 'when successfully login' do
          
        47. 
        
        
      
        
        
          
      47. 
            1
            

            

                  it 'login' do
          
        48. 
        
        
      
        
        
          
      48. 
            1
            

            

                    visit new_user_session_path
          
        49. 
        
        
      
        
        
          
      49. 
            
            

            

            
          
        50. 
        
        
      
        
        
          
      50. 
            1
            

            

                    within 'form', class: 'new_user', id: 'new_user' do
          
        51. 
        
        
      
        
        
          
      51. 
            1
            

            

                      fill_in 'user_email', with: user_second.email
          
        52. 
        
        
      
        
        
          
      52. 
            1
            

            

                      fill_in 'user_password', with: user_second.password
          
        53. 
        
        
      
        
        
          
      53. 
            
            

            

            
          
        54. 
        
        
      
        
        
          
      54. 
            1
            

            

                      click_on I18n.t('header.log_in')
          
        55. 
        
        
      
        
        
          
      55. 
            
            

            

                    end
          
        56. 
        
        
      
        
        
          
      56. 
            
            

            

            
          
        57. 
        
        
      
        
        
          
      57. 
            1
            

            

                    expect(page).to have_text I18n.t('devise.sessions.signed_in')
          
        58. 
        
        
      
        
        
          
      58. 
            
            

            

                  end
          
        59. 
        
        
      
        
        
          
      59. 
            
            

            

                end
          
        60. 
        
        
      
        
        
          
      60. 
            
            

            

            
          
        61. 
        
        
      
        
        
          
      61. 
            1
            

            

                context 'when unsuccessfully login' do
          
        62. 
        
        
      
        
        
          
      62. 
            1
            

            

                  it 'didn`t login' do
          
        63. 
        
        
      
        
        
          
      63. 
            1
            

            

                    visit new_user_session_path
          
        64. 
        
        
      
        
        
          
      64. 
            
            

            

            
          
        65. 
        
        
      
        
        
          
      65. 
            1
            

            

                    within 'form', class: 'new_user', id: 'new_user' do
          
        66. 
        
        
      
        
        
          
      66. 
            1
            

            

                      fill_in 'user_email', with: user_second.email
          
        67. 
        
        
      
        
        
          
      67. 
            1
            

            

                      fill_in 'user_password', with: 'wrong_password'
          
        68. 
        
        
      
        
        
          
      68. 
            
            

            

            
          
        69. 
        
        
      
        
        
          
      69. 
            1
            

            

                      click_on I18n.t('header.log_in')
          
        70. 
        
        
      
        
        
          
      70. 
            
            

            

                    end
          
        71. 
        
        
      
        
        
          
      71. 
            
            

            

            
          
        72. 
        
        
      
        
        
          
      72. 
            1
            

            

                    expect(page).to have_text 'Invalid Email or password.'
          
        73. 
        
        
      
        
        
          
      73. 
            
            

            

                  end
          
        74. 
        
        
      
        
        
          
      74. 
            
            

            

                end
          
        75. 
        
        
      
        
        
          
      75. 
            
            

            

              end
          
        76. 
        
        
      
        
        
          
      76. 
            
            

            

            end
          
        77. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/models/admin_user_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      5 relevant lines.
      5 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            require 'rails_helper'
          
        2. 
        
        
      
        
        
          
      2. 
            
            

            

            
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

            RSpec.describe AdminUser, type: :model do
          
        4. 
        
        
      
        
        
          
      4. 
            1
            

            

              context 'when validations' do
          
        5. 
        
        
      
        
        
          
      5. 
            2
<<<<<<< HEAD
=======
            

            

                it { is_expected.to validate_presence_of(:email) }
          
        6. 
        
        
      
        
        
          
      6. 
            2
            

            

                it { is_expected.to validate_presence_of(:password) }
          
        7. 
        
        
      
        
        
          
      7. 
            
            

            

              end
          
        8. 
        
        
      
        
        
          
      8. 
            
            

            

            end
          
        9. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/models/author_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      8 relevant lines.
      8 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
>>>>>>> c7a726c5 (Rebased)
            

            

<<<<<<< HEAD
                it { is_expected.to validate_presence_of(:email) }
=======
            RSpec.describe Author, type: :model do
>>>>>>> c7a726c5 (Rebased)
          
        2. 
        
        
      
        
        
<<<<<<< HEAD
          
      2. 
            2
=======
          
      3. 
            1
>>>>>>> c7a726c5 (Rebased)
            

            

<<<<<<< HEAD
                it { is_expected.to validate_presence_of(:password) }
=======
              describe 'author' do
          
        4. 
        
        
      
        
        
          
      4. 
            1
            

            

                context 'when validations' do
          
        5. 
        
        
      
        
        
          
      5. 
            2
            

            

                  it { is_expected.to validate_presence_of(:first_name) }
          
        6. 
        
        
      
        
        
          
      6. 
            2
            

            

                  it { is_expected.to validate_presence_of(:last_name) }
          
        7. 
        
        
      
        
        
          
      7. 
            
            

            

                end
>>>>>>> c7a726c5 (Rebased)
          
        8. 
        
        
      
        
        
          
      8. 
            
            

            

              end
          
        9. 
        
        
      
        
        
          
      9. 
            
            

            

            end
          
        10. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/models/author_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      8 relevant lines.
      8 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            RSpec.describe Author, type: :model do
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

              describe 'author' do
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

                context 'when validations' do
          
        4. 
        
        
      
        
        
          
      4. 
            2
            

            

                  it { is_expected.to validate_presence_of(:first_name) }
          
        5. 
        
        
      
        
        
          
      5. 
            2
            

            

                  it { is_expected.to validate_presence_of(:last_name) }
          
        6. 
        
        
      
        
        
          
      6. 
            
            

            

                end
          
        7. 
        
        
      
        
        
          
      7. 
            
            

            

            
          
        8. 
        
        
      
        
        
          
      8. 
            1
            

            

                context 'when associations' do
          
        9. 
        
        
      
        
        
          
      9. 
            2
            

            

                  it { is_expected.to have_many(:authors_books).dependent(:destroy) }
          
        10. 
        
        
      
        
        
          
      10. 
            2
            

            

                  it { is_expected.to have_many(:books).through(:authors_books) }
          
        11. 
        
        
      
        
        
          
      11. 
            
            

            

                end
          
        12. 
        
        
      
        
        
          
      12. 
            
            

            

              end
          
        13. 
        
        
      
        
        
          
      13. 
            
            

            

            end
          
        14. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/models/authors_book_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      8 relevant lines.
      8 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            RSpec.describe AuthorsBook, type: :model do
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

              describe 'authors_book' do
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

                context 'when validations' do
          
        4. 
        
        
      
        
        
          
      4. 
            2
            

            

                  it { is_expected.to validate_presence_of(:book) }
          
        5. 
        
        
      
        
        
          
      5. 
            2
            

            

                  it { is_expected.to validate_presence_of(:author) }
          
        6. 
        
        
      
        
        
          
      6. 
            
            

            

                end
          
        7. 
        
        
      
        
        
          
      7. 
            
            

            

            
          
        8. 
        
        
      
        
        
          
      8. 
            1
            

            

                context 'when associations' do
          
        9. 
        
        
      
        
        
          
      9. 
            2
            

            

                  it { is_expected.to belong_to(:author) }
          
        10. 
        
        
      
        
        
          
      10. 
            2
            

            

                  it { is_expected.to belong_to(:book) }
          
        11. 
        
        
      
        
        
          
      11. 
            
            

            

                end
          
        12. 
        
        
      
        
        
          
      12. 
            
            

            

              end
          
        13. 
        
        
      
        
        
          
      13. 
            
            

            

            end
          
        14. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/models/billing_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      20 relevant lines.
      20 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            RSpec.describe Billing, type: :model do
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

              describe 'billing' do
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

                context 'when validations' do
          
        4. 
        
        
      
        
        
          
      4. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::Name.first_name).for(:first_name) }
          
        5. 
        
        
      
        
        
          
      5. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::Name.first_name).for(:last_name) }
          
        6. 
        
        
      
        
        
          
      6. 
            2
            

            

                  it { is_expected.to allow_values('+919367788755', '8989829304', '+16308520397', '786-307-3615').for(:phone) }
          
        7. 
        
        
      
        
        
          
      7. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::AddressUK.country).for(:country) }
          
        8. 
        
        
      
        
        
          
      8. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::AddressUK.city).for(:city) }
          
        9. 
        
        
      
        
        
          
      9. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::AddressUA.zip_code).for(:zip) }
          
        10. 
        
        
      
        
        
          
      10. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::Address.street_address).for(:address) }
          
        11. 
        
        
      
        
        
          
      11. 
            
            

            

                end
          
        12. 
        
        
      
        
        
          
      12. 
            
            

            

            
          
        13. 
        
        
      
        
        
          
      13. 
            1
            

            

                context 'when not validations' do
          
        14. 
        
        
      
        
        
          
      14. 
            2
            

            

                  it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:first_name) }
          
        15. 
        
        
      
        
        
          
      15. 
            2
            

            

                  it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:last_name) }
          
        16. 
        
        
      
        
        
          
      16. 
            2
            

            

                  it { is_expected.not_to allow_values('789', '123765', '1-1-1', '+982').for(:phone) }
          
        17. 
        
        
      
        
        
          
      17. 
            2
            

            

                  it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:country) }
          
        18. 
        
        
      
        
        
          
      18. 
            2
            

            

                  it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:city) }
          
        19. 
        
        
      
        
        
          
      19. 
            2
            

            

                  it { is_expected.not_to allow_values('1' * Constants::VALIDATES_ZIP_LENGTH_MAX.next).for(:zip) }
          
        20. 
        
        
      
        
        
          
      20. 
            2
            

            

                  it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:address) }
          
        21. 
        
        
      
        
        
          
      21. 
            
            

            

                end
          
        22. 
        
        
      
        
        
          
      22. 
            
            

            

            
          
        23. 
        
        
      
        
        
          
      23. 
            1
            

            

                context 'when associations' do
          
        24. 
        
        
      
        
        
          
      24. 
            2
            

            

                  it { is_expected.to belong_to(:user) }
          
        25. 
        
        
      
        
        
          
      25. 
            
            

            

                end
          
        26. 
        
        
      
        
        
          
      26. 
            
            

            

              end
          
        27. 
        
        
      
        
        
          
      27. 
            
            

            

            end
          
        28. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/models/book_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      16 relevant lines.
      16 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            RSpec.describe Book, type: :model do
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

              describe 'books' do
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

                context 'when validations' do
          
        4. 
        
        
      
        
        
          
      4. 
            2
            

            

                  it { is_expected.to validate_presence_of(:title) }
          
        5. 
        
        
      
        
        
          
      5. 
            2
            

            

                  it { is_expected.to validate_presence_of(:description) }
          
        6. 
        
        
      
        
        
          
      6. 
            2
            

            

                  it { is_expected.to allow_values(Constants::MIN_PRICE_IN_CENTS, Constants::MAX_PRICE_IN_CENTS).for(:price_cents) }
          
        7. 
        
        
      
        
        
          
      7. 
            2
            

            

                  it { is_expected.to validate_presence_of(:year_of_publication) }
          
        8. 
        
        
      
        
        
          
      8. 
            2
            

            

                  it { is_expected.to validate_presence_of(:quantity) }
          
        9. 
        
        
      
        
        
          
      9. 
            2
            

            

                  it { is_expected.to validate_presence_of(:materials) }
          
        10. 
        
        
      
        
        
          
      10. 
            2
            

            

                  it { is_expected.to validate_presence_of(:dimensions) }
          
        11. 
        
        
      
        
        
          
      11. 
            
            

            

                end
          
        12. 
        
        
      
        
        
          
      12. 
            
            

            

            
          
        13. 
        
        
      
        
        
          
      13. 
            1
            

            

                context 'when associations' do
          
        14. 
        
        
      
        
        
          
      14. 
            2
            

            

                  it { is_expected.to have_many(:authors_books).dependent(:destroy) }
          
        15. 
        
        
      
        
        
          
      15. 
            2
            

            

                  it { is_expected.to have_many(:authors).through(:authors_books) }
          
        16. 
        
        
      
        
        
          
      16. 
            
            

            

            
          
        17. 
        
        
      
        
        
          
      17. 
            2
            

            

                  it { is_expected.to have_many(:books_categories).dependent(:destroy) }
          
        18. 
        
        
      
        
        
          
      18. 
            2
            

            

                  it { is_expected.to have_many(:categories).through(:books_categories) }
          
        19. 
        
        
      
        
        
          
      19. 
            
            

            

            
          
        20. 
        
        
      
        
        
          
      20. 
            2
            

            

                  it { is_expected.to have_many(:reviews).dependent(:destroy) }
          
        21. 
        
        
      
        
        
          
      21. 
            
            

            

                end
          
        22. 
        
        
      
        
        
          
      22. 
            
            

            

              end
          
        23. 
        
        
      
        
        
          
      23. 
            
            

            

            end
          
        24. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/models/books_category_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      8 relevant lines.
      8 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            RSpec.describe BooksCategory, type: :model do
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

              describe 'books_categories' do
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

                context 'when validations' do
          
        4. 
        
        
      
        
        
          
      4. 
            2
            

            

                  it { is_expected.to validate_presence_of(:book) }
          
        5. 
        
        
      
        
        
          
      5. 
            2
            

            

                  it { is_expected.to validate_presence_of(:category) }
          
        6. 
        
        
      
        
        
          
      6. 
            
            

            

                end
          
        7. 
        
        
      
        
        
          
      7. 
            
            

            

            
          
        8. 
        
        
      
        
        
          
      8. 
            1
            

            

                context 'when associations' do
          
        9. 
        
        
      
        
        
          
      9. 
            2
            

            

                  it { is_expected.to belong_to(:category) }
          
        10. 
        
        
      
        
        
          
      10. 
            2
            

            

                  it { is_expected.to belong_to(:book) }
          
        11. 
        
        
      
        
        
          
      11. 
            
            

            

                end
          
        12. 
        
        
      
        
        
          
      12. 
            
            

            

              end
          
        13. 
        
        
      
        
        
          
      13. 
            
            

            

            end
          
        14. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/models/category_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      7 relevant lines.
      7 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            RSpec.describe Category, type: :model do
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

              describe 'category' do
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

                context 'when validations' do
          
        4. 
        
        
      
        
        
          
      4. 
            2
            

            

                  it { is_expected.to validate_presence_of(:name) }
          
        5. 
        
        
      
        
        
          
      5. 
            
            

            

                end
          
        6. 
        
        
      
        
        
          
      6. 
            
            

            

            
          
        7. 
        
        
      
        
        
          
      7. 
            1
            

            

                context 'when associations' do
          
        8. 
        
        
      
        
        
          
      8. 
            2
            

            

                  it { is_expected.to have_many(:books_categories).dependent(:destroy) }
          
        9. 
        
        
      
        
        
          
      9. 
            2
            

            

                  it { is_expected.to have_many(:books).through(:books_categories) }
          
        10. 
        
        
      
        
        
          
      10. 
            
            

            

                end
          
        11. 
        
        
      
        
        
          
      11. 
            
            

            

              end
          
        12. 
        
        
      
        
        
          
      12. 
            
            

            

            end
          
        13. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/models/review_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      14 relevant lines.
      14 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            require 'rails_helper'
          
        2. 
        
        
      
        
        
          
      2. 
            
            

            

            
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

            RSpec.describe Review, type: :model do
          
        4. 
        
        
      
        
        
          
      4. 
            1
            

            

              describe 'review' do
          
        5. 
        
        
      
        
        
          
      5. 
            1
            

            

                context 'when validations' do
          
        6. 
        
        
      
        
        
          
      6. 
            2
            

            

                  it { is_expected.to validate_presence_of(:title) }
          
        7. 
        
        
      
        
        
          
      7. 
            2
            

            

                  it { is_expected.to validate_presence_of(:body) }
          
        8. 
        
        
      
        
        
          
      8. 
            2
            

            

                  it { is_expected.to validate_presence_of(:rating) }
          
        9. 
        
        
      
        
        
          
      9. 
            2
            

            

                  it { is_expected.to validate_presence_of(:verified) }
          
        10. 
        
        
      
        
        
          
      10. 
            2
            

            

                  it { is_expected.to allow_values('a' * Constants::VALIDATES_TITLE_LENGTH_MAX).for(:title) }
          
        11. 
        
        
      
        
        
          
      11. 
            2
            

            

                  it { is_expected.to allow_values('a' * Constants::VALIDATES_TEXT_LENGTH_MAX).for(:body) }
          
        12. 
        
        
      
        
        
          
      12. 
            2
            

            

                  it { is_expected.to allow_values(1, 2, 3, 4, 5).for(:rating) }
          
        13. 
        
        
      
        
        
          
      13. 
            
            

            

                end
          
        14. 
        
        
      
        
        
          
      14. 
            
            

            

            
          
        15. 
        
        
      
        
        
          
      15. 
            1
            

            

                context 'when associations' do
          
        16. 
        
        
      
        
        
          
      16. 
            2
            

            

                  it { is_expected.to belong_to(:book) }
          
        17. 
        
        
      
        
        
          
      17. 
            2
            

            

                  it { is_expected.to belong_to(:user) }
          
        18. 
        
        
      
        
        
          
      18. 
            
            

            

                end
          
        19. 
        
        
      
        
        
          
      19. 
            
            

            

              end
          
        20. 
        
        
      
        
        
          
      20. 
            
            

            

            end
          
        21. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/models/shipping_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      20 relevant lines.
      20 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            RSpec.describe Shipping, type: :model do
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

              describe 'shipping' do
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

                context 'when validations' do
          
        4. 
        
        
      
        
        
          
      4. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::Name.first_name).for(:first_name) }
          
        5. 
        
        
      
        
        
          
      5. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::Name.first_name).for(:last_name) }
          
        6. 
        
        
      
        
        
          
      6. 
            2
            

            

                  it { is_expected.to allow_values('+919367788755', '8989829304', '+16308520397', '786-307-3615').for(:phone) }
          
        7. 
        
        
      
        
        
          
      7. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::AddressUK.country).for(:country) }
          
        8. 
        
        
      
        
        
          
      8. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::AddressUK.city).for(:city) }
          
        9. 
        
        
      
        
        
          
      9. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::AddressUA.zip_code).for(:zip) }
          
        10. 
        
        
      
        
        
          
      10. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::Address.street_address).for(:address) }
          
        11. 
        
        
      
        
        
          
      11. 
            
            

            

                end
          
        12. 
        
        
      
        
        
          
      12. 
            
            

            

            
          
        13. 
        
        
      
        
        
          
      13. 
            1
            

            

                context 'when not validations' do
          
        14. 
        
        
      
        
        
          
      14. 
            2
            

            

                  it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:first_name) }
          
        15. 
        
        
      
        
        
          
      15. 
            2
            

            

                  it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:last_name) }
          
        16. 
        
        
      
        
        
          
      16. 
            2
            

            

                  it { is_expected.not_to allow_values('789', '123765', '1-1-1', '+982').for(:phone) }
          
        17. 
        
        
      
        
        
          
      17. 
            2
            

            

                  it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:country) }
          
        18. 
        
        
      
        
        
          
      18. 
            2
            

            

                  it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:city) }
          
        19. 
        
        
      
        
        
          
      19. 
            2
            

            

                  it { is_expected.not_to allow_values('1' * Constants::VALIDATES_ZIP_LENGTH_MAX.next).for(:zip) }
          
        20. 
        
        
      
        
        
          
      20. 
            2
            

            

                  it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:address) }
          
        21. 
        
        
      
        
        
          
      21. 
            
            

            

                end
          
        22. 
        
        
      
        
        
          
      22. 
            
            

            

            
          
        23. 
        
        
      
        
        
          
      23. 
            1
            

            

                context 'when associations' do
          
        24. 
        
        
      
        
        
          
      24. 
            2
            

            

                  it { is_expected.to belong_to(:user) }
          
        25. 
        
        
      
        
        
          
      25. 
            
            

            

                end
          
        26. 
        
        
      
        
        
          
      26. 
            
            

            

              end
          
        27. 
        
        
      
        
        
          
      27. 
            
            

            

            end
          
        28. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/models/user_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      9 relevant lines.
      9 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            RSpec.describe User, type: :model do
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

              let(:user) { FactoryBot.create(:user) }
          
        3. 
        
        
      
        
        
          
      3. 
            
            

            

            
          
        4. 
        
        
      
        
        
          
      4. 
            1
            

            

              describe 'author' do
          
        5. 
        
        
      
        
        
          
      5. 
            1
            

            

                context 'when validations' do
          
        6. 
        
        
      
        
        
          
      6. 
            2
            

            

                  it { is_expected.to validate_presence_of(:email) }
          
        7. 
        
        
      
        
        
          
      7. 
            2
            

            

                  it { is_expected.to validate_presence_of(:password) }
          
        8. 
        
        
      
        
        
          
      8. 
            
            

            

                end
          
        9. 
        
        
      
        
        
          
      9. 
            
            

            

            
          
        10. 
        
        
      
        
        
          
      10. 
            1
            

            

                context 'with associations' do
          
        11. 
        
        
      
        
        
          
      11. 
            2
            

            

                  it { is_expected.to have_one(:billing) }
          
        12. 
        
        
      
        
        
          
      12. 
            2
            

            

                  it { is_expected.to have_one(:shipping) }
          
        13. 
        
        
      
        
        
          
      13. 
            
            

            

                end
          
        14. 
        
        
      
        
        
          
      14. 
            
            

            

              end
          
        15. 
        
        
      
        
        
          
      15. 
            
            

            

            end
          
        16. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/queryes/book_query_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      45 relevant lines.
      45 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            require 'rails_helper'
          
        2. 
        
        
      
        
        
          
      2. 
            
            

            

            
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

            RSpec.describe BookQuery do
          
        4. 
        
        
      
        
        
          
      4. 
            1
            

            

              shared_examples 'sort test' do
          
        5. 
        
        
      
        
        
          
      5. 
            5
            

            

                it 'sort' do
          
        6. 
        
        
      
        
        
          
      6. 
            5
            

            

                  books
          
        7. 
        
        
      
        
        
          
      7. 
            5
            

            

                  expect(test).to eq(result)
          
        8. 
        
        
      
        
        
          
      8. 
            
            

            

                end
          
        9. 
        
        
      
        
        
          
      9. 
            
            

            

              end
          
        10. 
        
        
      
        
        
          
      10. 
            
            

            

            
          
        11. 
        
        
      
        
        
          
      11. 
            3
            

            

              let(:titles) { %w[Adam Zimbabwe] }
          
        12. 
        
        
      
        
        
          
      12. 
            1
            

            

              let(:books_dates) do
          
        13. 
        
        
      
        
        
          
      13. 
            1
            

            

                ['Thu, 25 Aug 2022 15:25:38.761014000 UTC +00:00', 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00']
          
        14. 
        
        
      
        
        
          
      14. 
            
            

            

              end
          
        15. 
        
        
      
        
        
          
      15. 
            
            

            

            
          
        16. 
        
        
      
        
        
          
      16. 
            1
            

            

              describe 'all books sort' do
          
        17. 
        
        
      
        
        
          
      17. 
            1
            

            

                context 'when sort by title A to Z' do
          
        18. 
        
        
      
        
        
          
      18. 
            1
            

            

                  let(:books) do
          
        19. 
        
        
      
        
        
          
      19. 
            1
            

            

                    create(:book, title: titles.first)
          
        20. 
        
        
      
        
        
          
      20. 
            1
            

            

                    create(:book, title: titles.second)
          
        21. 
        
        
      
        
        
          
      21. 
            
            

            

                  end
          
        22. 
        
        
      
        
        
          
      22. 
            
            

            

            
          
        23. 
        
        
      
        
        
          
      23. 
            2
            

            

                  let(:result) { titles.second }
          
        24. 
        
        
      
        
        
          
      24. 
            2
            

            

                  let(:test) { described_class.query({ sort: 'title DESC' }).first.title }
          
        25. 
        
        
      
        
        
          
      25. 
            
            

            

            
          
        26. 
        
        
      
        
        
          
      26. 
            1
            

            

                  include_examples 'sort test'
          
        27. 
        
        
      
        
        
          
      27. 
            
            

            

                end
          
        28. 
        
        
      
        
        
          
      28. 
            
            

            

            
          
        29. 
        
        
      
        
        
          
      29. 
            1
            

            

                context 'when sort title Z to A' do
          
        30. 
        
        
      
        
        
          
      30. 
            1
            

            

                  let(:books) do
          
        31. 
        
        
      
        
        
          
      31. 
            1
            

            

                    create(:book, title: titles.first)
          
        32. 
        
        
      
        
        
          
      32. 
            1
            

            

                    create(:book, title: titles.second)
          
        33. 
        
        
      
        
        
          
      33. 
            
            

            

                  end
          
        34. 
        
        
      
        
        
          
      34. 
            
            

            

            
          
        35. 
        
        
      
        
        
          
      35. 
            2
            

            

                  let(:result) { titles.first }
          
        36. 
        
        
      
        
        
          
      36. 
            2
            

            

                  let(:test) { described_class.query({ sort: 'title' }).first.title }
          
        37. 
        
        
      
        
        
          
      37. 
            
            

            

            
          
        38. 
        
        
      
        
        
          
      38. 
            1
            

            

                  include_examples 'sort test'
          
        39. 
        
        
      
        
        
          
      39. 
            
            

            

                end
          
        40. 
        
        
      
        
        
          
      40. 
            
            

            

            
          
        41. 
        
        
      
        
        
          
      41. 
            1
            

            

                context 'when sort by price High to Low' do
          
        42. 
        
        
      
        
        
          
      42. 
            1
            

            

                  let(:books) do
          
        43. 
        
        
      
        
        
          
      43. 
            1
            

            

                    create(:book, price_cents: 75)
          
        44. 
        
        
      
        
        
          
      44. 
            1
            

            

                    create(:book, price_cents: 23)
          
        45. 
        
        
      
        
        
          
      45. 
            
            

            

                  end
          
        46. 
        
        
      
        
        
          
      46. 
            
            

            

            
          
        47. 
        
        
      
        
        
          
      47. 
            2
            

            

                  let(:result) { 75 }
          
        48. 
        
        
      
        
        
          
      48. 
            2
            

            

                  let(:test) { described_class.query({ sort: 'price_cents DESC' }).first.price_cents }
          
        49. 
        
        
      
        
        
          
      49. 
            
            

            

            
          
        50. 
        
        
      
        
        
          
      50. 
            1
            

            

                  include_examples 'sort test'
          
        51. 
        
        
      
        
        
          
      51. 
            
            

            

                end
          
        52. 
        
        
      
        
        
          
      52. 
            
            

            

            
          
        53. 
        
        
      
        
        
          
      53. 
            1
            

            

                context 'when sort price Low to High' do
          
        54. 
        
        
      
        
        
          
      54. 
            1
            

            

                  let(:books) do
          
        55. 
        
        
      
        
        
          
      55. 
            1
            

            

                    create(:book, price_cents: 75)
          
        56. 
        
        
      
        
        
          
      56. 
            1
            

            

                    create(:book, price_cents: 23)
          
        57. 
        
        
      
        
        
          
      57. 
            
            

            

                  end
          
        58. 
        
        
      
        
        
          
      58. 
            
            

            

            
          
        59. 
        
        
      
        
        
          
      59. 
            2
            

            

                  let(:result) { 23 }
          
        60. 
        
        
      
        
        
          
      60. 
            2
            

            

                  let(:test) { described_class.query({ sort: 'price_cents' }).first.price_cents }
          
        61. 
        
        
      
        
        
          
      61. 
            
            

            

            
          
        62. 
        
        
      
        
        
          
      62. 
            1
            

            

                  include_examples 'sort test'
          
        63. 
        
        
      
        
        
          
      63. 
            
            

            

                end
          
        64. 
        
        
      
        
        
          
      64. 
            
            

            

            
          
        65. 
        
        
      
        
        
          
      65. 
            1
            

            

                context 'when sort by Newest' do
          
        66. 
        
        
      
        
        
          
      66. 
            1
            

            

                  let(:books) do
          
        67. 
        
        
      
        
        
          
      67. 
            1
            

            

                    create(:book, created_at: books_dates.first)
          
        68. 
        
        
      
        
        
          
      68. 
            1
            

            

                    create(:book, created_at: books_dates.second)
          
        69. 
        
        
      
        
        
          
      69. 
            
            

            

                  end
          
        70. 
        
        
      
        
        
          
      70. 
            
            

            

            
          
        71. 
        
        
      
        
        
          
      71. 
            2
            

            

                  let(:result) { books_dates.first }
          
        72. 
        
        
      
        
        
          
      72. 
            2
            

            

                  let(:test) { described_class.query({ sort: 'created_at DESC' }).first.created_at }
          
        73. 
        
        
      
        
        
          
      73. 
            
            

            

            
          
        74. 
        
        
      
        
        
          
      74. 
            1
            

            

                  include_examples 'sort test'
          
        75. 
        
        
      
        
        
          
      75. 
            
            

            

                end
          
        76. 
        
        
      
        
        
          
      76. 
            
            

            

              end
          
        77. 
        
        
      
        
        
          
      77. 
            
            

            

            end
          
        78. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/support/configs/capybara.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      19 relevant lines.
      19 lines covered and
>>>>>>> a5d032d (Fix)
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            RSpec.describe 'Author' do
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

              include_context 'with api request authentication helper methods'
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

              include_context 'with api request global before and after hooks'
          
        4. 
        
        
      
        
        
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
          
      4. 
            
            

            

            
          
        5. 
        
        
      
        
        
          
      5. 
            2
            

            

              let(:first_name) { FFaker::Name.first_name }
          
        6. 
        
        
      
        
        
          
      6. 
            2
            

            

              let(:last_name) { FFaker::Name.last_name }
          
        7. 
        
        
      
        
        
          
      7. 
            
            

            

            
          
        8. 
        
        
      
        
        
          
      8. 
            2
            

            

              let(:new_name) { FFaker::Name.first_name }
          
        9. 
        
        
      
        
        
          
      9. 
            2
            

            

              let(:old_name) { author.first_name }
          
        10. 
        
        
      
        
        
          
      10. 
            
            

            

            
          
        11. 
        
        
      
        
        
          
      11. 
            4
            

            

              let(:author) { create(:author) }
          
        12. 
        
        
      
        
        
          
      12. 
            
            

            

            
          
        13. 
        
        
      
        
        
          
      13. 
            1
            

            

              before do
          
        14. 
        
        
      
        
        
          
      14. 
            4
            

            

                sign_in(create(:admin_user), :admin_user)
          
        15. 
        
        
      
        
        
          
      15. 
            
            

            

              end
          
        16. 
        
        
      
        
        
          
      16. 
            
            

            

            
          
        17. 
        
        
      
        
        
          
      17. 
            1
            

            

              it 'can create an author' do
          
        18. 
        
        
      
        
        
          
      18. 
            1
            

            

                visit 'admin/authors'
          
        19. 
        
        
      
        
        
          
      19. 
            
            

            

            
          
        20. 
        
        
      
        
        
          
      20. 
            1
            

            

                click_link('New Author')
          
        21. 
        
        
      
        
        
          
      21. 
            
            

            

            
          
        22. 
        
        
      
        
        
          
      22. 
            1
            

            

                fill_in 'author[first_name]', with: first_name
          
        23. 
        
        
      
        
        
          
      23. 
            1
            

            

                fill_in 'author[last_name]', with: last_name
          
        24. 
        
        
      
        
        
          
      24. 
            
            

            

            
          
        25. 
        
        
      
        
        
          
      25. 
            2
            

            

                expect { click_button('Create Author') }.to change(Author, :count).from(0).to(1)
          
        26. 
        
        
      
        
        
          
      26. 
            
            

            

              end
          
        27. 
        
        
      
        
        
          
      27. 
            
            

            

            
          
        28. 
        
        
      
        
        
          
      28. 
            1
            

            

              it 'can delete an author' do
          
        29. 
        
        
      
        
        
          
      29. 
            1
            

            

                author
          
        30. 
        
        
      
        
        
          
      30. 
            
            

            

            
          
        31. 
        
        
      
        
        
          
      31. 
            1
            

            

                visit 'admin/authors'
          
        32. 
        
        
      
        
        
          
      32. 
            
            

            

            
          
        33. 
        
        
      
        
        
          
      33. 
            2
            

            

                expect { click_link('Delete') }.to change(Author, :count).from(1).to(0)
          
        34. 
        
        
      
        
        
          
      34. 
            
            

            

              end
          
        35. 
        
        
      
        
        
          
      35. 
            
            

            

            
          
        36. 
        
        
      
        
        
          
      36. 
            1
            

            

              it 'can view an author' do
          
        37. 
        
        
      
        
        
          
      37. 
            1
            

            

                author
          
        38. 
        
        
      
        
        
          
      38. 
            
            

            

            
          
        39. 
        
        
      
        
        
          
      39. 
            1
            

            

                visit 'admin/authors'
          
        40. 
        
        
      
        
        
          
      40. 
            
            

            

            
          
        41. 
        
        
      
        
        
          
      41. 
            1
            

            

                click_link('View')
          
        42. 
        
        
      
        
        
          
      42. 
            
            

            

            
          
        43. 
        
        
      
        
        
          
      43. 
            1
            

            

                expect(page).to have_content(author.first_name)
          
        44. 
        
        
      
        
        
          
      44. 
            
            

            

              end
          
        45. 
        
        
      
        
        
          
      45. 
            
            

            

            
          
        46. 
        
        
      
        
        
          
      46. 
            1
            

            

              it 'can edit an author' do
          
        47. 
        
        
      
        
        
          
      47. 
            1
            

            

                author
          
        48. 
        
        
      
        
        
          
      48. 
            
            

            

            
          
        49. 
        
        
      
        
        
          
      49. 
            1
            

            

                visit 'admin/authors'
          
        50. 
        
        
      
        
        
          
      50. 
            
            

            

            
          
        51. 
        
        
      
        
        
          
      51. 
            1
            

            

                click_link('Edit')
          
        52. 
        
        
      
        
        
          
      52. 
            
            

            

            
          
        53. 
        
        
      
        
        
          
      53. 
            1
            

            

                fill_in 'author[first_name]', with: new_name
          
        54. 
        
        
      
        
        
          
      54. 
            
            

            

            
          
        55. 
        
        
      
        
        
          
      55. 
            4
            

            

                expect { click_button('Update Author') }.to change { author.reload.first_name }.from(old_name).to(new_name)
          
        56. 
        
        
      
        
        
          
      56. 
            
            

            

              end
          
        57. 
        
        
      
        
        
          
      57. 
            
            

            

            end
          
        58. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/feature/admin/book_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      43 relevant lines.
      43 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            RSpec.describe 'Book' do
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

              include_context 'with api request authentication helper methods'
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

              include_context 'with api request global before and after hooks'
          
        4. 
        
        
      
        
        
          
      4. 
            
            

            

            
          
        5. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
          
      5. 
            7
=======
          
      6. 
=======
          
      7. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      8. 
>>>>>>> 752f0c0 (Featire specs)
            5
>>>>>>> 93bdda9 (Featire specs)
=======
          
      9. 
            7
>>>>>>> 872e675 (Fix)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              let(:book) { create(:book) }
=======
<<<<<<< HEAD
=======
>>>>>>> 752f0c0 (Featire specs)
              let(:category_one) { FactoryBot.create(:category) }
          
        10. 
        
        
      
        
        
          
      10. 
            3
            

            

              let(:category_two) { FactoryBot.create(:category) }
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
              let(:book) { create(:book) }
>>>>>>> 872e675 (Fix)
=======
              let(:category_two) { FactoryBot.create(:category) }
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
=======
              let(:category_two) { FactoryBot.create(:category) }
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
              let(:category_two) { FactoryBot.create(:category) }
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
          
        11. 
        
        
      
        
        
          
      11. 
            1
            

            

              let(:params) do
          
        12. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
          
      12. 
            1
=======
          
      13. 
            4
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> af057e3 (Featire specs)
=======
          
      14. 
            4
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      15. 
            1
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
=======
          
      16. 
            4
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
            

            

                { title: FFaker::Book.title,
          
        17. 
        
        
      
        
        
          
      17. 
            
            

            

                  description: FFaker::Book.description,
          
        18. 
        
        
      
        
        
          
      18. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
                  price_cents: FFaker::Number.rand(1..100),
=======
                  price: FFaker::Number.rand(1..100),
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                  price: FFaker::Number.rand(1..100),
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
                  price_cents: FFaker::Number.rand(1..100),
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
                  price: FFaker::Number.rand(1..100),
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
                  price: FFaker::Number.rand(1..100),
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
          
        19. 
        
        
      
        
        
          
      19. 
            
            

            

                  dimensions: FFaker::Book.cover,
          
        20. 
        
        
      
        
        
          
      20. 
            
            

            

                  year_of_publication: FFaker::Number.rand(1900..2022),
          
        21. 
        
        
      
        
        
          
      21. 
            
            

            

                  materials: 'Soft cover',
          
        22. 
        
        
      
        
        
          
      22. 
            
            

            

                  quantity: FFaker::Number.rand(2..5) }
          
        23. 
        
        
      
        
        
          
      23. 
            
            

            

              end
          
        24. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
          
      24. 
            
            

            

            
          
        25. 
        
        
      
        
        
          
      25. 
            1
            

            

              before do
          
        26. 
        
        
      
        
        
          
      26. 
            6
            

            

                sign_in(create(:admin_user), :admin_user)
          
        27. 
        
        
      
        
        
          
      27. 
            
            

            

            
          
        28. 
        
        
      
        
        
          
      28. 
            6
            

            

                book
          
        29. 
        
        
      
        
        
          
      29. 
            
            

            

            
          
        30. 
        
        
      
        
        
          
      30. 
            6
            

            

                visit 'admin/books'
          
        31. 
        
        
      
        
        
          
      31. 
            
            

            

              end
          
        32. 
        
        
      
        
        
          
      32. 
            
            

            

            
          
        33. 
        
        
      
        
        
          
      33. 
            1
            

            

              it 'can create an category' do
          
        34. 
        
        
      
        
        
          
      34. 
            1
            

            

                click_link('New Book')
          
        35. 
        
        
      
        
        
          
      35. 
            
            

            

            
          
        36. 
        
        
      
        
        
          
      36. 
            1
            

            

                fill_in 'book[title]', with: params[:title]
          
        37. 
        
        
      
        
        
          
      37. 
            1
            

            

                fill_in 'book[description]', with: params[:description]
          
        38. 
        
        
      
        
        
          
      38. 
            1
            

            

                fill_in 'book[year_of_publication]', with: params[:year_of_publication]
          
        39. 
        
        
      
        
        
          
      39. 
            1
            

            

                fill_in 'book[price_cents]', with: params[:price_cents]
          
        40. 
        
        
      
        
        
          
      40. 
            1
            

            

                fill_in 'book[materials]', with: params[:materials]
          
        41. 
        
        
      
        
        
          
      41. 
            1
            

            

                fill_in 'book[dimensions]', with: params[:dimensions]
          
        42. 
        
        
      
        
        
          
      42. 
            1
            

            

                fill_in 'book[quantity]', with: params[:quantity]
          
        43. 
        
        
      
        
        
          
      43. 
            
            

            

            
          
        44. 
        
        
      
        
        
          
      44. 
            1
            

            

                click_button('Create Book')
          
        45. 
        
        
      
        
        
          
      45. 
            
            

            

            
          
        46. 
        
        
      
        
        
          
      46. 
            1
            

            

                expect(page).to have_content(params[:title])
          
        47. 
        
        
      
        
        
          
      47. 
            
            

            

              end
          
        48. 
        
        
      
        
        
          
      48. 
            
            

            

            
          
        49. 
        
        
      
        
        
          
      49. 
            1
            

            

              it 'can delete an book' do
          
        50. 
        
        
      
        
        
          
      50. 
            1
            

            

                click_link('Delete')
          
        51. 
        
        
      
        
        
          
      51. 
            
            

            

            
          
        52. 
        
        
      
        
        
          
      52. 
            1
            

            

                expect(page).not_to have_content(book.title)
          
        53. 
        
        
      
        
        
          
      53. 
            
            

            

              end
          
        54. 
        
        
      
        
        
          
      54. 
            
            

            

            
          
        55. 
        
        
      
        
        
          
      55. 
            1
            

            

              it 'can view an book' do
          
        56. 
        
        
      
        
        
          
      56. 
            1
            

            

                click_link('View')
          
        57. 
        
        
      
        
        
          
      57. 
            
            

            

            
          
        58. 
        
        
      
        
        
          
      58. 
            1
            

            

                expect(page).to have_content(book.title)
          
        59. 
        
        
      
        
        
          
      59. 
            
            

            

              end
          
        60. 
        
        
      
        
        
          
      60. 
            
            

            

            
          
        61. 
        
        
      
        
        
          
      61. 
            1
            

            

              it 'can edit an book' do
          
        62. 
        
        
      
        
        
          
      62. 
            1
            

            

                click_link('Edit')
          
        63. 
        
        
      
        
        
          
      63. 
            
            

            

            
          
        64. 
        
        
      
        
        
          
      64. 
            1
            

            

                fill_in 'book[title]', with: 'New title'
          
        65. 
        
        
      
        
        
          
      65. 
            
            

            

            
          
        66. 
        
        
      
        
        
          
      66. 
            1
            

            

                click_button('Update Book')
          
        67. 
        
        
      
        
        
          
      67. 
            
            

            

            
          
        68. 
        
        
      
        
        
          
      68. 
            1
            

            

                expect(page).to have_content('New title')
          
        69. 
        
        
      
        
        
          
      69. 
            
            

            

              end
          
        70. 
        
        
      
        
        
          
      70. 
            
            

            

            
          
        71. 
        
        
      
        
        
          
      71. 
            1
            

            

              context 'when image' do
          
        72. 
        
        
      
        
        
          
      72. 
            1
            

            

                before do
          
        73. 
        
        
      
        
        
          
      73. 
            2
            

            

                  click_link('Edit')
          
        74. 
        
        
      
        
        
          
      74. 
            
            

            

            
          
        75. 
        
        
      
        
        
          
      75. 
            2
            

            

                  page.attach_file('book[images][]', './app/assets/images/Web-Book-Cover.png')
          
        76. 
        
        
      
        
        
          
      76. 
            
            

            

            
          
        77. 
        
        
      
        
        
          
      77. 
            2
            

            

                  click_on 'Update Book'
          
        78. 
        
        
      
        
        
          
      78. 
            
            

            

                end
          
        79. 
        
        
      
        
        
          
      79. 
            
            

            

            
          
        80. 
        
        
      
        
        
          
      80. 
            1
            

            

                it 'can add images to book' do
          
        81. 
        
        
      
        
        
          
      81. 
            1
            

            

                  expect(book.reload.images.count).to eq(1)
          
        82. 
        
        
      
        
        
          
      82. 
            
            

            

                end
          
        83. 
        
        
      
        
        
          
      83. 
            
            

            

            
          
        84. 
        
        
      
        
        
          
      84. 
            1
            

            

                it 'can delete images from book' do
          
        85. 
        
        
      
        
        
          
      85. 
            1
            

            

                  click_link('Edit')
          
        86. 
        
        
      
        
        
          
      86. 
            
            

            

            
          
        87. 
        
        
      
        
        
          
      87. 
            1
            

            

                  click_link('Delete')
          
        88. 
        
        
      
        
        
          
      88. 
            
            

            

            
          
        89. 
        
        
      
        
        
          
      89. 
            1
            

            

                  expect(book.reload.images.count).to eq(0)
          
        90. 
        
        
      
        
        
          
      90. 
            
            

            

                end
          
        91. 
        
        
      
        
        
          
      91. 
            
            

            

              end
          
        92. 
        
        
      
        
        
          
      92. 
            
            

            

            end
          
        93. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/feature/admin/category_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      25 relevant lines.
      25 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            RSpec.describe 'Category' do
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

              include_context 'with api request authentication helper methods'
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

              include_context 'with api request global before and after hooks'
          
        4. 
        
        
      
        
        
          
      4. 
            
            

            

            
          
        5. 
        
        
      
        
        
          
      5. 
            2
            

            

              let(:category_name) { FFaker::Book.genre }
          
        6. 
        
        
      
        
        
          
      6. 
            
            

            

            
          
        7. 
        
        
      
        
        
          
      7. 
            5
            

            

              let(:category) { create(:category) }
          
        8. 
        
        
      
        
        
          
      8. 
            
            

            

            
          
        9. 
        
        
      
        
        
          
      9. 
            1
            

            

              before do
          
        10. 
        
        
      
        
        
          
      10. 
            4
            

            

                sign_in(create(:admin_user), :admin_user)
          
        11. 
        
        
      
        
        
          
      11. 
            
            

            

            
          
        12. 
        
        
      
        
        
          
      12. 
            4
            

            

                category
          
        13. 
        
        
      
        
        
          
      13. 
            
            

            

            
          
        14. 
        
        
      
        
        
          
      14. 
            4
            

            

                visit 'admin/categories'
          
        15. 
        
        
      
        
        
          
      15. 
            
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
          
      16. 
            7
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> af057e3 (Featire specs)
=======
          
      17. 
            7
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
=======
          
      18. 
            7
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
              end
=======
              let(:book) { FactoryBot.create(:book) }
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
              let(:book) { FactoryBot.create(:book) }
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
              end
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
              let(:book) { FactoryBot.create(:book) }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
              let(:book) { FactoryBot.create(:book) }
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
          
        19. 
        
        
      
        
        
          
      19. 
            
            

            

            
          
        20. 
        
        
      
        
        
          
      20. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
              it 'can create an category' do
=======
              describe '#show book' do
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
              describe '#show book' do
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
              it 'can create an category' do
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
              describe '#show book' do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
              describe '#show book' do
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
          
        21. 
        
        
      
        
        
          
      21. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
                click_link('New Category')
=======
                it 'show books info' do
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                it 'show books info' do
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
                click_link('New Category')
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
                it 'show books info' do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
                it 'show books info' do
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
          
        22. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
          
      22. 
=======
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      23. 
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
          
      24. 
            1
            

            

                  visit "books/#{book.id}"
          
        25. 
        
        
      
        
        
          
      25. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
          
      26. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
            
            

            

            
          
        27. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
          
      27. 
=======
          
      28. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      29. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
          
      30. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      31. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      32. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
                fill_in 'category[name]', with: category_name
=======
                  expect(page).to have_content(book.title)
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                  expect(page).to have_content(book.title)
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
                fill_in 'category[name]', with: category_name
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
                  expect(page).to have_content(book.title)
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
                  expect(page).to have_content(book.title)
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
          
        33. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
          
      33. 
=======
          
      34. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      35. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
          
      36. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      37. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      38. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
            
          
        39. 
        
        
      
        
        
          
      39. 
            1
            

            

                click_button('Create Category')
<<<<<<< HEAD
<<<<<<< HEAD
=======
                end
>>>>>>> d0dc1f1 (Featire specs)
=======
                end
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
=======
                end
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
=======
                end
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
          
        40. 
        
        
      
        
        
          
      40. 
            
            

            

            
          
        41. 
        
        
      
        
        
          
      41. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
                expect(page).to have_content(category_name)
=======
                it 'clicked Beck to results' do
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                it 'clicked Beck to results' do
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
                expect(page).to have_content(category_name)
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
                it 'clicked Beck to results' do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
                it 'clicked Beck to results' do
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
          
        42. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
          
      42. 
            
=======
          
      43. 
            1
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> af057e3 (Featire specs)
=======
          
      44. 
            1
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      45. 
            
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
=======
          
      46. 
            1
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
              end
=======
                  visit "books/#{book.id}"
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                  visit "books/#{book.id}"
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
              end
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
                  visit "books/#{book.id}"
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
                  visit "books/#{book.id}"
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
          
        47. 
        
        
      
        
        
          
      47. 
            
            

            

            
          
        48. 
        
        
      
        
        
          
      48. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
              it 'can delete an category' do
=======
                  find('a', class: 'general-back-link').click
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                  find('a', class: 'general-back-link').click
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
              it 'can delete an category' do
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
                  find('a', class: 'general-back-link').click
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
                  find('a', class: 'general-back-link').click
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
          
        49. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
          
      49. 
            1
            

            

                click_link('Delete')
          
        50. 
        
        
      
        
        
          
      50. 
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      51. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      52. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
=======
          
      53. 
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
=======
          
      54. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
            
            

            

            
          
        55. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
          
      55. 
=======
          
      56. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      57. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
          
      58. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      59. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      60. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
                expect(page).not_to have_content(category.name)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                expect(page).not_to have_content(category.name)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
                  expect(page).to have_content('Catalog')
          
        61. 
        
        
      
        
        
          
      61. 
            
            

            

                end
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
                expect(page).not_to have_content(category.name)
>>>>>>> 872e675 (Fix)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
          
        62. 
        
        
      
        
        
          
      62. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
              end
=======
            
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
            
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
              end
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
            
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
            
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
          
        63. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
          
      63. 
            
=======
          
      64. 
            1
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> af057e3 (Featire specs)
=======
          
      65. 
            1
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      66. 
            
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
=======
          
      67. 
            1
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
            
=======
                context 'when test read more' do
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                context 'when test read more' do
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
            
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
                context 'when test read more' do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
                context 'when test read more' do
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
          
        68. 
        
        
      
        
        
          
      68. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
              it 'can view an category' do
=======
                  it 'show read more' do
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                  it 'show read more' do
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
              it 'can view an category' do
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
                  it 'show read more' do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
                  it 'show read more' do
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
          
        69. 
        
        
      
        
        
          
      69. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
                click_link('View')
=======
                    visit "books/#{book.id}"
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                    visit "books/#{book.id}"
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
                click_link('View')
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
                    visit "books/#{book.id}"
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
                    visit "books/#{book.id}"
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
          
        70. 
        
        
      
        
        
          
      70. 
            
            

            

            
          
        71. 
        
        
      
        
        
          
      71. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
                expect(page).to have_content(category.name)
=======
                    expect(page).to have_content('Read More')
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                    expect(page).to have_content('Read More')
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
                expect(page).to have_content(category.name)
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
                    expect(page).to have_content('Read More')
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
                    expect(page).to have_content('Read More')
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
          
        72. 
        
        
      
        
        
          
      72. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
              end
=======
                  end
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                  end
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
              end
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
                  end
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
                  end
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
          
        73. 
        
        
      
        
        
          
      73. 
            
            

            

            
          
        74. 
        
        
      
        
        
          
      74. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
              it 'can edit an category' do
=======
                  it 'clicked read more', js: true do
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                  it 'clicked read more', js: true do
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
              it 'can edit an category' do
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
                  it 'clicked read more', js: true do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
                  it 'clicked read more', js: true do
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
          
        75. 
        
        
      
        
        
          
      75. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
                click_link('Edit')
=======
                    visit "books/#{book.id}"
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                    visit "books/#{book.id}"
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
                click_link('Edit')
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
                    visit "books/#{book.id}"
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
                    visit "books/#{book.id}"
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
          
        76. 
        
        
      
        
        
          
      76. 
            
            

            

            
          
        77. 
        
        
      
        
        
          
      77. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
                fill_in 'category[name]', with: 'New Genre'
=======
                    click_link 'Read More'
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                    click_link 'Read More'
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
                fill_in 'category[name]', with: 'New Genre'
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
                    click_link 'Read More'
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
                    click_link 'Read More'
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
          
        78. 
        
        
      
        
        
          
      78. 
            
            

            

            
          
        79. 
        
        
      
        
        
          
      79. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
                click_button('Update Category')
=======
                    expect(page).not_to have_content('Read More')
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                    expect(page).not_to have_content('Read More')
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
                click_button('Update Category')
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
                    expect(page).not_to have_content('Read More')
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
                    expect(page).not_to have_content('Read More')
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
          
        80. 
        
        
      
        
        
          
      80. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
            
=======
                  end
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                  end
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
            
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
                  end
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
                  end
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
          
        81. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
          
      81. 
            1
=======
          
      82. 
            
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> af057e3 (Featire specs)
=======
          
      83. 
            
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      84. 
            1
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
=======
          
      85. 
            
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
                expect(page).to have_content('New Genre')
=======
                end
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                end
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
                expect(page).to have_content('New Genre')
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
                end
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
                end
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
          
        86. 
        
        
      
        
        
          
      86. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
              end
          
        87. 
        
        
      
        
        
          
      87. 
            
            

            

            end
          
        88. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/feature/billing_spec.rb
      
    
      
      
  73.08%


      lines covered
    
      

    

    
      
      26 relevant lines.
      19 lines covered and
      7 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            RSpec.describe 'Billing', type: :feature do
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

              include_context 'with api request authentication helper methods'
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

              include_context 'with api request global before and after hooks'
          
        4. 
        
        
      
        
        
          
      4. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
            
          
        5. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
          
      5. 
            2
            

            

              let(:user) { create(:user) }
          
        6. 
        
        
      
        
        
          
      6. 
            1
            

            

              let(:attributes_for) { attributes_for(:billing) }
          
        7. 
        
        
      
        
        
          
      7. 
            
            

            

            
          
        8. 
        
        
      
        
        
          
      8. 
            1
            

            

              describe '#fill_in', js: true do
          
        9. 
        
        
      
        
        
          
      9. 
            1
            

            

                it 'fill in billing' do
          
        10. 
        
        
      
        
        
          
      10. 
            1
            

            

                  sign_in(user)
          
        11. 
        
        
      
        
        
          
      11. 
            
            

            

            
          
        12. 
        
        
      
        
        
          
      12. 
            1
            

            

                  visit edit_user_path(user.id)
          
        13. 
        
        
      
        
        
          
      13. 
            
            

            

            
          
        14. 
        
        
      
        
        
          
      14. 
            1
            

            

                  within('div#billing.col-md-5.mb-40') do
          
        15. 
        
        
      
        
        
          
      15. 
            1
            

            

                    find_all('div', class: 'form-group')[0] do
          
        16. 
        
        
      
        
        
          
      16. 
            
            

            

                      fill_in :first_name, with: attributes_for[:first_name]
          
        17. 
        
        
      
        
        
          
      17. 
            
            

            

                    end
          
        18. 
        
        
      
        
        
          
      18. 
            1
            

            

                    find_all('div', class: 'form-group')[1] do
          
        19. 
        
        
      
        
        
          
      19. 
            
            

            

                      fill_in :last_name, with: attributes_for[:last_name]
          
        20. 
        
        
      
        
        
          
      20. 
            
            

            

                    end
          
        21. 
        
        
      
        
        
          
      21. 
            1
            

            

                    find_all('div', class: 'form-group')[2] do
          
        22. 
        
        
      
        
        
          
      22. 
            
            

            

                      fill_in :address, with: attributes_for[:address]
          
        23. 
        
        
      
        
        
          
      23. 
            
            

            

                    end
          
        24. 
        
        
      
        
        
          
      24. 
            1
            

            

                    find_all('div', class: 'form-group')[3] do
          
        25. 
        
        
      
        
        
          
      25. 
            
            

            

                      fill_in :city, with: attributes_for[:city]
          
        26. 
        
        
      
        
        
          
      26. 
            
            

            

                    end
          
        27. 
        
        
      
        
        
          
      27. 
            1
            

            

                    find_all('div', class: 'form-group')[4] do
          
        28. 
        
        
      
        
        
          
      28. 
            
            

            

                      fill_in :zip, with: attributes_for[:zip]
          
        29. 
        
        
      
        
        
          
      29. 
            
            

            

                    end
          
        30. 
        
        
      
        
        
          
      30. 
            1
            

            

                    find_all('div', class: 'form-group')[5] do
          
        31. 
        
        
      
        
        
          
      31. 
            
            

            

                      fill_in :country, with: attributes_for[:country]
          
        32. 
        
        
      
        
        
          
      32. 
            
            

            

                    end
          
        33. 
        
        
      
        
        
          
      33. 
            1
            

            

                    find_all('div', class: 'form-group')[6] do
          
        34. 
        
        
      
        
        
          
      34. 
            
            

            

                      fill_in :phone, with: attributes_for[:phone]
          
        35. 
        
        
      
        
        
          
      35. 
            
            

            

                    end
          
        36. 
        
        
      
        
        
          
      36. 
            1
            

            

                    click_on I18n.t('settings.save')
          
        37. 
        
        
      
        
        
          
      37. 
            
            

            

                  end
          
        38. 
        
        
      
        
        
          
      38. 
            
            

            

            
          
        39. 
        
        
      
        
        
          
      39. 
            1
            

            

                  expect(page).to have_content(I18n.t('settings.message.update'))
          
        40. 
        
        
      
        
        
          
      40. 
            
            

            

                end
          
        41. 
        
        
      
        
        
          
      41. 
            
            

            

              end
          
        42. 
        
        
      
        
        
          
      42. 
            
            

            

            end
          
        43. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/feature/book_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      104 relevant lines.
      104 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            RSpec.describe 'Book', type: :feature do
          
        2. 
        
        
      
        
        
          
      2. 
            5
            

            

              let(:category_one) { create(:category) }
          
        3. 
        
        
      
        
        
          
      3. 
            3
            

            

              let(:category_two) { create(:category) }
          
        4. 
        
        
      
        
        
          
      4. 
            1
            

            

              let(:params) do
          
        5. 
        
        
      
        
        
          
      5. 
            4
            

            

                { title: FFaker::Book.title,
          
        6. 
        
        
      
        
        
          
      6. 
            
            

            

                  description: FFaker::Book.description,
          
        7. 
        
        
      
        
        
          
      7. 
            
            

            

                  price_cents: FFaker::Number.rand(1..100),
          
        8. 
        
        
      
        
        
          
      8. 
            
            

            

                  dimensions: FFaker::Book.cover,
          
        9. 
        
        
      
        
        
          
      9. 
            
            

            

                  year_of_publication: FFaker::Number.rand(1900..2022),
          
        10. 
        
        
      
        
        
          
      10. 
            
            

            

                  materials: 'Soft cover',
          
        11. 
        
        
      
        
        
          
      11. 
            
            

            

                  quantity: FFaker::Number.rand(2..5) }
          
        12. 
        
        
      
        
        
          
      12. 
            
            

            

              end
          
        13. 
        
        
      
        
        
          
      13. 
            7
            

            

              let(:book) { create(:book).decorate }
          
        14. 
        
        
      
        
        
          
      14. 
            
            

            

            
          
        15. 
        
        
      
        
        
          
      15. 
            1
            

            

              describe '#show book' do
          
        16. 
        
        
      
        
        
          
      16. 
            1
            

            

                it 'show books info' do
          
        17. 
        
        
      
        
        
          
      17. 
            1
            

            

                  visit "books/#{book.id}"
          
        18. 
        
        
      
        
        
          
      18. 
            
            

            

            
          
        19. 
        
        
      
        
        
          
      19. 
            1
            

            

                  expect(page).to have_content(book.title)
          
        20. 
        
        
      
        
        
          
      20. 
            
            

            

                end
          
        21. 
        
        
      
        
        
          
      21. 
            
            

            

            
          
        22. 
        
        
      
        
        
          
      22. 
            1
            

            

                it 'clicked Beck to results' do
          
        23. 
        
        
      
        
        
          
      23. 
            1
            

            

                  visit "books/#{book.id}"
          
        24. 
        
        
      
        
        
          
      24. 
            
            

            

            
          
        25. 
        
        
      
        
        
          
      25. 
            1
            

            

                  find('a', class: 'general-back-link').click
          
        26. 
        
        
      
        
        
          
      26. 
            
            

            

            
          
        27. 
        
        
      
        
        
          
      27. 
            1
            

            

                  expect(page).to have_content(I18n.t('catalog_page.title'))
          
        28. 
        
        
      
        
        
          
      28. 
            
            

            

                end
          
        29. 
        
        
      
        
        
          
      29. 
            
            

            

            
          
        30. 
        
        
      
        
        
          
      30. 
            1
            

            

                context 'when test read more' do
          
        31. 
        
        
      
        
        
          
      31. 
            1
            

            

                  it 'show read more' do
          
        32. 
        
        
      
        
        
          
      32. 
            1
            

            

                    visit "books/#{book.id}"
          
        33. 
        
        
      
        
        
          
      33. 
            
            

            

            
          
        34. 
        
        
      
        
        
          
      34. 
            1
            

            

                    expect(page).to have_content(I18n.t('book_page.read_more'))
          
        35. 
        
        
      
        
        
          
      35. 
            
            

            

                  end
          
        36. 
        
        
      
        
        
          
      36. 
            
            

            

            
          
        37. 
        
        
      
        
        
          
      37. 
            1
            

            

                  it 'clicked read more', js: true do
          
        38. 
        
        
      
        
        
          
      38. 
            1
            

            

                    visit "books/#{book.id}"
          
        39. 
        
        
      
        
        
          
      39. 
            
            

            

            
          
        40. 
        
        
      
        
        
          
      40. 
            1
            

            

                    click_link I18n.t('book_page.read_more')
          
        41. 
        
        
      
        
        
          
      41. 
            
            

            

            
          
        42. 
        
        
      
        
        
          
      42. 
            1
            

            

                    expect(page).not_to have_content(I18n.t('book_page.read_more'))
          
        43. 
        
        
      
        
        
          
      43. 
            
            

            

                  end
          
        44. 
        
        
      
        
        
          
      44. 
            
            

            

                end
          
        45. 
        
        
      
        
        
          
      45. 
            
            

            

            
          
        46. 
        
        
      
        
        
          
      46. 
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
          
      47. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      48. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
=======
          
      49. 
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
=======
          
      50. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
          
      51. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      52. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      53. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
            1
            

            

                context 'when quantity changes', js: true do
          
        54. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
          
      54. 
=======
          
      55. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      56. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      57. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      58. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      59. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
          
      60. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      61. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      62. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      63. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
            1
            

            

                  before do
          
        64. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
          
      64. 
            2
            

            

                    visit "books/#{book.id}"
          
        65. 
        
        
      
        
        
          
      65. 
            
            

            

            
          
        66. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
          
      66. 
            2
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
                    find('a', class: 'inc').click
=======
                    visit "books/#{book.id}"
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
                    visit "books/#{book.id}"
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                    find('a', class: 'inc').click
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
                    visit "books/#{book.id}"
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
                    visit "books/#{book.id}"
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
                    visit "books/#{book.id}"
>>>>>>> 4e81ea2 (Featire specs)
=======
                    visit "books/#{book.id}"
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                    visit "books/#{book.id}"
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
                    visit "books/#{book.id}"
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                    visit "books/#{book.id}"
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                    visit "books/#{book.id}"
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
                    visit "books/#{book.id}"
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
                    visit "books/#{book.id}"
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
                    find('a', class: 'inc').click
>>>>>>> 5b7749a (Fix)
          
        67. 
        
        
      
        
        
          
      67. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
                  end
          
        68. 
        
        
      
        
        
          
      68. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
            
          
        69. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      69. 
            1
=======
          
      70. 
            2
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      71. 
            2
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      72. 
            1
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      73. 
            2
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      74. 
            2
>>>>>>> 08edf50 (Featire specs)
=======
<<<<<<< HEAD
          
      75. 
            2
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4552227 (Featire specs)
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
          
      76. 
            2
>>>>>>> e3e66f3 (Featire specs)
=======
          
      77. 
            1
>>>>>>> 5b7749a (Fix)
            

            

                  it 'increase quantity' do
          
        78. 
        
        
      
        
        
<<<<<<< HEAD
          
      78. 
            
            

            

                  end
          
        79. 
        
        
      
        
        
          
      79. 
            
            

            

            
          
        80. 
        
        
      
        
        
          
      80. 
            1
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
                  it 'increase quantity' do
>>>>>>> 563720e (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
                  it 'increase quantity' do
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                  it 'increase quantity' do
=======
                  it 'increase quantity', js: true do
>>>>>>> 752f0c0 (Featire specs)
=======
                  it 'increase quantity', js: true do
>>>>>>> 4e81ea2 (Featire specs)
=======
                  it 'increase quantity', js: true do
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
=======
=======
=======
                  it 'increase quantity' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
                  it 'increase quantity' do
>>>>>>> c033601 (Rebased)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
=======
          
      81. 
            2
>>>>>>> 08edf50 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
                  it 'increase quantity' do
=======
                    find('a', class: 'inc').click
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
=======
=======
                    find('a', class: 'inc').click
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
                  it 'increase quantity' do
>>>>>>> 872e675 (Fix)
=======
                  it 'increase quantity' do
=======
                    find('a', class: 'inc').click
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
=======
=======
                    find('a', class: 'inc').click
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
=======
                    find('a', class: 'inc').click
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
                    find('a', class: 'inc').click
>>>>>>> 752f0c0 (Featire specs)
=======
                    find('a', class: 'inc').click
>>>>>>> 4e81ea2 (Featire specs)
=======
                    find('a', class: 'inc').click
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                  it 'increase quantity' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
                  it 'increase quantity' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it 'increase quantity', js: true do
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                  it 'increase quantity' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
                  it 'increase quantity', js: true do
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
                  it 'increase quantity' do
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
        82. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      82. 
=======
          
      83. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
=======
          
      84. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      85. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      86. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      87. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      88. 
>>>>>>> 5b7749a (Fix)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
                    expect(page).to have_content("€#{Money.new(book.price_cents * 2)}")
          
        89. 
        
        
      
        
        
          
      89. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      90. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      91. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
=======
          
      92. 
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
=======
          
      93. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      94. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      95. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 5b7749a (Fix)
            
            

            

                  end
          
        96. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
          
      96. 
=======
          
      97. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      98. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      99. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      100. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      101. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
          
      102. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      103. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      104. 
>>>>>>> 5b7749a (Fix)
            
            

            

            
          
        105. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
          
      105. 
=======
          
      106. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      107. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      108. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      109. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      110. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
          
      111. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      112. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      113. 
>>>>>>> 5b7749a (Fix)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
                  it 'decrease quantity' do
>>>>>>> 563720e (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
                  it 'decrease quantity' do
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                  it 'decrease quantity' do
=======
                  it 'decrease quantity', js: true do
>>>>>>> 752f0c0 (Featire specs)
=======
                  it 'decrease quantity', js: true do
>>>>>>> 4e81ea2 (Featire specs)
=======
                  it 'decrease quantity', js: true do
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
=======
=======
=======
                  it 'decrease quantity' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
                  it 'decrease quantity' do
>>>>>>> c033601 (Rebased)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
                  it 'decrease quantity' do
=======
                  it 'increase quantity', js: true do
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
=======
=======
                  it 'increase quantity', js: true do
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
                  it 'decrease quantity' do
>>>>>>> 872e675 (Fix)
=======
                  it 'decrease quantity' do
=======
                  it 'increase quantity', js: true do
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
=======
=======
                  it 'increase quantity', js: true do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
=======
                  it 'increase quantity', js: true do
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
                  it 'decrease quantity' do
=======
                  it 'increase quantity', js: true do
>>>>>>> d0dc1f1 (Featire specs)
=======
                  it 'increase quantity', js: true do
>>>>>>> 752f0c0 (Featire specs)
=======
                  it 'increase quantity', js: true do
>>>>>>> 4e81ea2 (Featire specs)
=======
                  it 'increase quantity', js: true do
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
                  it 'decrease quantity' do
>>>>>>> 5b7749a (Fix)
          
        114. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
          
      114. 
=======
          
      115. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      116. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      117. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      118. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      119. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
          
      120. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      121. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      122. 
>>>>>>> 5b7749a (Fix)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
                    find('a', class: 'dec').click
=======
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
                    find('a', class: 'dec').click
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
                    expect(page).to have_content("€#{book.price * 2}")
          
        123. 
        
        
      
        
        
          
      123. 
            
            

            

                  end
          
        124. 
        
        
      
        
        
          
      124. 
            
            

            

            
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                    find('a', class: 'dec').click
>>>>>>> 872e675 (Fix)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
                    find('a', class: 'dec').click
>>>>>>> 5b7749a (Fix)
          
        125. 
        
        
      
        
        
          
      125. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
                  it 'decrease quantity', js: true do
=======
                  it 'decrease quantity' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
=======
                  it 'decrease quantity', js: true do
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                  it 'decrease quantity' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
                  it 'decrease quantity', js: true do
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
                  it 'decrease quantity' do
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
        126. 
        
        
      
        
        
          
      126. 
            1
            

            

                    find('a', class: 'dec').click
          
        127. 
        
        
      
        
        
          
      127. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 872e675 (Fix)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
                    expect(page).to have_content("€#{book.price}")
          
        128. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
          
      128. 
            
            

            

                  end
          
        129. 
        
        
      
        
        
          
      129. 
            
            

            

                end
          
        130. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
          
      130. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
              end
=======
                  end
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
                  end
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              end
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
                  end
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
                  end
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
                  end
>>>>>>> 4e81ea2 (Featire specs)
=======
                  end
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                  end
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
                  end
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  end
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                  end
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
                  end
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
                  end
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
              end
>>>>>>> 5b7749a (Fix)
          
        131. 
        
        
      
        
        
          
      131. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
                end
          
        132. 
        
        
      
        
        
          
      132. 
            
            

            

              end
          
        133. 
        
        
      
        
        
          
      133. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 872e675 (Fix)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
            
          
        134. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
          
      134. 
            1
            

            

              describe '#catalog' do
          
        135. 
        
        
      
        
        
          
      135. 
            1
            

            

                describe 'filter by category' do
          
        136. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
          
      136. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
              describe '#catalog' do
          
        137. 
        
        
      
        
        
          
      137. 
            1
            

            

                describe 'filter by category' do
          
        138. 
        
        
      
        
        
          
      138. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 872e675 (Fix)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
                  before do
          
        139. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      139. 
=======
          
      140. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      141. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      142. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      143. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      144. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
          
      145. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      146. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      147. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      148. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      149. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      150. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      151. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      152. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      153. 
>>>>>>> 5b7749a (Fix)
            2
            

            

                    category_one.books.create(params)
          
        154. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      154. 
=======
          
      155. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      156. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      157. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      158. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      159. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
          
      160. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      161. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      162. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      163. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      164. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      165. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      166. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      167. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      168. 
>>>>>>> 5b7749a (Fix)
            2
            

            

                    visit books_path
          
        169. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      169. 
=======
          
      170. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      171. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      172. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      173. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      174. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
          
      175. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      176. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      177. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      178. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      179. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      180. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      181. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      182. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      183. 
>>>>>>> 5b7749a (Fix)
            
            

            

                  end
          
        184. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      184. 
=======
          
      185. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      186. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      187. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      188. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      189. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
          
      190. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      191. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      192. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      193. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      194. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      195. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      196. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      197. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      198. 
>>>>>>> 5b7749a (Fix)
            
            

            

            
          
        199. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      199. 
=======
          
      200. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      201. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      202. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      203. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      204. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
          
      205. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      206. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      207. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      208. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      209. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      210. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      211. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      212. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      213. 
>>>>>>> 5b7749a (Fix)
            1
            

            

                  after do
          
        214. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      214. 
=======
          
      215. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      216. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      217. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      218. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      219. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
          
      220. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      221. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      222. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      223. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      224. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      225. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      226. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      227. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      228. 
>>>>>>> 5b7749a (Fix)
            2
            

            

                    category_one.destroy
          
        229. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      229. 
=======
          
      230. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      231. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      232. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      233. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      234. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
          
      235. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      236. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      237. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      238. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      239. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      240. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      241. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      242. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      243. 
>>>>>>> 5b7749a (Fix)
            
            

            

                  end
          
        244. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      244. 
=======
          
      245. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      246. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      247. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      248. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      249. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
          
      250. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      251. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      252. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      253. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      254. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      255. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      256. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      257. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      258. 
>>>>>>> 5b7749a (Fix)
            
            

            

            
          
        259. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      259. 
=======
          
      260. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      261. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      262. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      263. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      264. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
          
      265. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      266. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      267. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      268. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      269. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      270. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      271. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      272. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      273. 
>>>>>>> 5b7749a (Fix)
            1
            

            

                  it 'show book count for category' do
          
        274. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      274. 
=======
          
      275. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      276. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      277. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      278. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      279. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
          
      280. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      281. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      282. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      283. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      284. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      285. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      286. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      287. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      288. 
>>>>>>> 5b7749a (Fix)
            1
            

            

                    expect(page).to have_content(category_one.books.size)
          
        289. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      289. 
=======
          
      290. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      291. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      292. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      293. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      294. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
          
      295. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      296. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      297. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      298. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      299. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      300. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      301. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      302. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      303. 
>>>>>>> 5b7749a (Fix)
            
            

            

                  end
          
        304. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      304. 
=======
          
      305. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      306. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      307. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      308. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      309. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
          
      310. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      311. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      312. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      313. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      314. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      315. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      316. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      317. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      318. 
>>>>>>> 5b7749a (Fix)
            
            

            

            
          
        319. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
          
      319. 
            1
            

            

                  it 'filter book by category' do
          
        320. 
        
        
      
        
        
          
      320. 
            1
            

            

                    within 'ul', class: 'list-inline pt-10 mb-25 mr-240', id: 'filter' do
          
        321. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
          
      321. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
                  it 'filter book by category' do
          
        322. 
        
        
      
        
        
          
      322. 
            1
            

            

                    within 'ul', class: 'list-inline pt-10 mb-25 mr-240', id: 'filter' do
          
        323. 
        
        
      
        
        
          
      323. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 872e675 (Fix)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
                      click_on category_one.name
          
        324. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      324. 
=======
          
      325. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      326. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      327. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      328. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      329. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
          
      330. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      331. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      332. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      333. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      334. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      335. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      336. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      337. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      338. 
>>>>>>> 5b7749a (Fix)
            
            

            

                    end
          
        339. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      339. 
=======
          
      340. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      341. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      342. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      343. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      344. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
          
      345. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      346. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      347. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      348. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      349. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      350. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      351. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      352. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      353. 
>>>>>>> 5b7749a (Fix)
            
            

            

            
          
        354. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      354. 
=======
          
      355. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      356. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      357. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      358. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      359. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
          
      360. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      361. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      362. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      363. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      364. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      365. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      366. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      367. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      368. 
>>>>>>> 5b7749a (Fix)
            1
            

            

                    expect(page).to have_content(category_one.books.first.title)
          
        369. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      369. 
=======
          
      370. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      371. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      372. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      373. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      374. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
          
      375. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      376. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      377. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      378. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      379. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      380. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      381. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      382. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      383. 
>>>>>>> 5b7749a (Fix)
            
            

            

                  end
          
        384. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      384. 
=======
          
      385. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      386. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      387. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      388. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      389. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
          
      390. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      391. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      392. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      393. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      394. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      395. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      396. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      397. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      398. 
>>>>>>> 5b7749a (Fix)
            
            

            

                end
          
        399. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      399. 
=======
          
      400. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      401. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      402. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      403. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      404. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
          
      405. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      406. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      407. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      408. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      409. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      410. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      411. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      412. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      413. 
>>>>>>> 5b7749a (Fix)
            
            

            

            
          
        414. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      414. 
=======
          
      415. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      416. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      417. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      418. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      419. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
          
      420. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      421. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      422. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      423. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      424. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      425. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      426. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      427. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      428. 
>>>>>>> 5b7749a (Fix)
            1
            

            

                describe 'filter by all books' do
          
        429. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      429. 
=======
          
      430. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      431. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      432. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      433. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      434. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
          
      435. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      436. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      437. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      438. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      439. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      440. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      441. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      442. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      443. 
>>>>>>> 5b7749a (Fix)
            1
            

            

                  before do
          
        444. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      444. 
=======
          
      445. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      446. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      447. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      448. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      449. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
          
      450. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      451. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      452. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      453. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      454. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      455. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      456. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      457. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      458. 
>>>>>>> 5b7749a (Fix)
            2
            

            

                    category_one.books.create(params)
          
        459. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
          
      459. 
            2
            

            

                    category_two.books.create(params)
          
        460. 
        
        
      
        
        
          
      460. 
            
            

            

            
          
        461. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
          
      461. 
            2
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
                    visit books_path
=======
                    category_two.books.create(params)
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
                    category_two.books.create(params)
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                    visit books_path
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
                    category_two.books.create(params)
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
                    category_two.books.create(params)
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
                    category_two.books.create(params)
>>>>>>> 4e81ea2 (Featire specs)
=======
                    category_two.books.create(params)
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                    category_two.books.create(params)
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
                    category_two.books.create(params)
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                    category_two.books.create(params)
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                    category_two.books.create(params)
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
                    category_two.books.create(params)
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
                    category_two.books.create(params)
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
                    visit books_path
>>>>>>> 5b7749a (Fix)
          
        462. 
        
        
      
        
        
          
      462. 
            
            

            

            
          
        463. 
        
        
      
        
        
          
      463. 
            2
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
                    click_on I18n.t('catalog_page.all')
=======
                    visit books_path
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
                    visit books_path
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                    click_on I18n.t('catalog_page.all')
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
                    visit books_path
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
                    visit books_path
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
                    visit books_path
>>>>>>> 4e81ea2 (Featire specs)
=======
                    visit books_path
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                    visit books_path
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
                    visit books_path
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                    visit books_path
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                    visit books_path
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
                    visit books_path
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
                    visit books_path
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
                    click_on I18n.t('catalog_page.all')
>>>>>>> 5b7749a (Fix)
          
        464. 
        
        
      
        
        
          
      464. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
            
          
        465. 
        
        
      
        
        
          
      465. 
            2
            

            

                    click_on 'All'
          
        466. 
        
        
      
        
        
          
      466. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 872e675 (Fix)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
                  end
          
        467. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      467. 
=======
          
      468. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      469. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      470. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      471. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      472. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
          
      473. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      474. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      475. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      476. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      477. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      478. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      479. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      480. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      481. 
>>>>>>> 5b7749a (Fix)
            
            

            

            
          
        482. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      482. 
=======
          
      483. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      484. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      485. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      486. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      487. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
          
      488. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      489. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      490. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      491. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      492. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      493. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      494. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      495. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      496. 
>>>>>>> 5b7749a (Fix)
            1
            

            

                  after do
          
        497. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      497. 
=======
          
      498. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      499. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      500. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      501. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      502. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
          
      503. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      504. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      505. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      506. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      507. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      508. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      509. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      510. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      511. 
>>>>>>> 5b7749a (Fix)
            2
            

            

                    category_one.destroy
          
        512. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      512. 
=======
          
      513. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      514. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      515. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      516. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      517. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
          
      518. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      519. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      520. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      521. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      522. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      523. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      524. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      525. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      526. 
>>>>>>> 5b7749a (Fix)
            2
            

            

                    category_two.destroy
          
        527. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      527. 
=======
          
      528. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      529. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      530. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      531. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      532. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
          
      533. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      534. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      535. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      536. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      537. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      538. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      539. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      540. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      541. 
>>>>>>> 5b7749a (Fix)
            
            

            

                  end
          
        542. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      542. 
=======
          
      543. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      544. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      545. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      546. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      547. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
          
      548. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      549. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      550. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      551. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      552. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      553. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      554. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      555. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      556. 
>>>>>>> 5b7749a (Fix)
            
            

            

            
          
        557. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      557. 
=======
          
      558. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      559. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      560. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      561. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      562. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
          
      563. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      564. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      565. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      566. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      567. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      568. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      569. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      570. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      571. 
>>>>>>> 5b7749a (Fix)
            1
            

            

                  it 'shown books for first category' do
          
        572. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      572. 
=======
          
      573. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      574. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      575. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      576. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      577. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
          
      578. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      579. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      580. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      581. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      582. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      583. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      584. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      585. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      586. 
>>>>>>> 5b7749a (Fix)
            1
            

            

                    expect(page).to have_content(category_one.books.first.title)
          
        587. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      587. 
=======
          
      588. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      589. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      590. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      591. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      592. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
          
      593. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      594. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      595. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      596. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      597. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      598. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      599. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      600. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      601. 
>>>>>>> 5b7749a (Fix)
            
            

            

                  end
          
        602. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      602. 
=======
          
      603. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      604. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      605. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      606. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      607. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
          
      608. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      609. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      610. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      611. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      612. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      613. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      614. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      615. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      616. 
>>>>>>> 5b7749a (Fix)
            
            

            

            
          
        617. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      617. 
=======
          
      618. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      619. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      620. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      621. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      622. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
          
      623. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      624. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      625. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      626. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      627. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      628. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      629. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      630. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      631. 
>>>>>>> 5b7749a (Fix)
            1
            

            

                  it 'shown books for second category' do
          
        632. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      632. 
=======
          
      633. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      634. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      635. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      636. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      637. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
          
      638. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      639. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      640. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      641. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      642. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      643. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      644. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      645. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      646. 
>>>>>>> 5b7749a (Fix)
            1
            

            

                    expect(page).to have_content(category_two.books.first.title)
          
        647. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
          
      647. 
            
            

            

                  end
          
        648. 
        
        
      
        
        
          
      648. 
            
            

            

                end
          
        649. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
          
      649. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
              end
=======
                  end
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
                  end
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              end
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
                  end
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
                  end
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
                  end
>>>>>>> 4e81ea2 (Featire specs)
=======
                  end
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                  end
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
                  end
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  end
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                  end
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
                  end
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
                  end
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
              end
>>>>>>> 5b7749a (Fix)
          
        650. 
        
        
      
        
        
          
      650. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
                end
          
        651. 
        
        
      
        
        
          
      651. 
            
            

            

              end
          
        652. 
        
        
      
        
        
          
      652. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 872e675 (Fix)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
            
          
        653. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      653. 
=======
          
      654. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      655. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      656. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      657. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      658. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
          
      659. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      660. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      661. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      662. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      663. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      664. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      665. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      666. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      667. 
>>>>>>> 5b7749a (Fix)
            1
            

            

              describe 'load_more' do
          
        668. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      668. 
=======
          
      669. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      670. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      671. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      672. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      673. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
          
      674. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      675. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      676. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      677. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      678. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      679. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      680. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      681. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      682. 
>>>>>>> 5b7749a (Fix)
            1
            

            

                before do
          
        683. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      683. 
=======
          
      684. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      685. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      686. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      687. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      688. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
          
      689. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      690. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      691. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      692. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      693. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      694. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      695. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      696. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      697. 
>>>>>>> 5b7749a (Fix)
            3
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                  24.times do
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                  (BooksController::PAGINATION_PER_PAGE * 2).times do
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                  (BooksController::PAGINATION_PER_PAGE * 2).times do
=======
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
                  24.times do
=======
                  (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
                  (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do
>>>>>>> 752f0c0 (Featire specs)
=======
                  (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do
>>>>>>> 4e81ea2 (Featire specs)
=======
                  (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> df37394 (Featire specs)
=======
=======
=======
                  (BooksController::PAGINATION_PER_PAGE * 2).times do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
                  24.times do
>>>>>>> c033601 (Rebased)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
                  24.times do
=======
                  (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
=======
=======
                  (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
                  24.times do
>>>>>>> 872e675 (Fix)
=======
                  24.times do
=======
                  (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
=======
=======
                  (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
=======
                  (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                  (BooksController::PAGINATION_PER_PAGE * 2).times do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
                  (BooksController::PAGINATION_PER_PAGE * 2).times do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                  (BooksController::PAGINATION_PER_PAGE * 2).times do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
                  (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
                  (BooksController::PAGINATION_PER_PAGE * 2).times do
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
                  24.times do
>>>>>>> 5b7749a (Fix)
          
        698. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      698. 
=======
          
      699. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      700. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      701. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      702. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      703. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
          
      704. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      705. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      706. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      707. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      708. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      709. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      710. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      711. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      712. 
>>>>>>> 5b7749a (Fix)
            72
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
                    books << create(:book)
          
        713. 
        
        
      
        
        
          
      713. 
            
            

            

                  end
          
        714. 
        
        
      
        
        
          
      714. 
            
            

            

                end
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
                    books << FactoryBot.create(:book)
>>>>>>> d0dc1f1 (Featire specs)
=======
                    books << FactoryBot.create(:book)
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
=======
                    books << FactoryBot.create(:book)
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
=======
                    books << FactoryBot.create(:book)
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
                    books << FactoryBot.create(:book)
>>>>>>> 4e81ea2 (Featire specs)
=======
                    books << FactoryBot.create(:book)
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                    books << FactoryBot.create(:book)
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
                    books << FactoryBot.create(:book)
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                    books << FactoryBot.create(:book)
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                    books << FactoryBot.create(:book)
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
                    books << FactoryBot.create(:book)
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
                    books << FactoryBot.create(:book)
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
          
        715. 
        
        
      
        
        
          
      715. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
            
=======
                  end
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
                  end
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
            
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
                  end
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
                  end
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
                  end
>>>>>>> 4e81ea2 (Featire specs)
=======
                  end
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                  end
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
                  end
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  end
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                  end
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
                  end
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
                  end
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
            
>>>>>>> 5b7749a (Fix)
          
        716. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      716. 
            4
=======
          
      717. 
            
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      718. 
            
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      719. 
            4
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      720. 
            
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      721. 
            
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      722. 
            
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      723. 
            
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      724. 
            
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      725. 
            
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      726. 
            
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      727. 
            4
>>>>>>> 5b7749a (Fix)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
                let(:books) { [] }
=======
                end
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
                end
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                let(:books) { [] }
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
                end
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
                end
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
                end
>>>>>>> 4e81ea2 (Featire specs)
=======
                end
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                end
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
                end
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                end
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                end
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
                end
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
                end
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
                let(:books) { [] }
>>>>>>> 5b7749a (Fix)
          
        728. 
        
        
      
        
        
          
      728. 
            
            

            

            
          
        729. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      729. 
            1
=======
          
      730. 
            4
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      731. 
            4
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      732. 
            1
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      733. 
            4
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      734. 
            4
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      735. 
            4
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      736. 
            4
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      737. 
            4
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      738. 
            4
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      739. 
            4
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      740. 
            1
>>>>>>> 5b7749a (Fix)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
                it 'show books without view more button' do
=======
                let(:books) { [] }
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
                let(:books) { [] }
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                it 'show books without view more button' do
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
                let(:books) { [] }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
                let(:books) { [] }
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
                let(:books) { [] }
>>>>>>> 4e81ea2 (Featire specs)
=======
                let(:books) { [] }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                let(:books) { [] }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
                let(:books) { [] }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                let(:books) { [] }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                let(:books) { [] }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
                let(:books) { [] }
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
                let(:books) { [] }
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
                it 'show books without view more button' do
>>>>>>> 5b7749a (Fix)
          
        741. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
          
      741. 
            1
            

            

                  visit books_path
          
        742. 
        
        
      
        
        
          
      742. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      743. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      744. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
=======
          
      745. 
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
=======
          
      746. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      747. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      748. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      749. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      750. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      751. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      752. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      753. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      754. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
            
            

            

            
          
        755. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      755. 
            1
            

            

                it 'show books without view more button' do
          
        756. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 872e675 (Fix)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
          
      756. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
                  find('a', id: 'view_more', class: 'view_more').click
=======
                  visit books_path
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
                  visit books_path
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                  find('a', id: 'view_more', class: 'view_more').click
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
                  visit books_path
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
                  visit books_path
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
                  visit books_path
>>>>>>> 4e81ea2 (Featire specs)
=======
                  visit books_path
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                  visit books_path
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
                  visit books_path
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  visit books_path
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                  visit books_path
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
                  visit books_path
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
                  visit books_path
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
                  find('a', id: 'view_more', class: 'view_more').click
>>>>>>> 5b7749a (Fix)
          
        757. 
        
        
      
        
        
          
      757. 
            
            

            

            
          
        758. 
        
        
      
        
        
          
      758. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
                  expect(page).not_to have_css('a', class: 'view_more hidden', id: 'view_more')
=======
                  find('a', id: 'view_more', class: 'view_more').click
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
                  find('a', id: 'view_more', class: 'view_more').click
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                  expect(page).not_to have_css('a', class: 'view_more hidden', id: 'view_more')
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
                  find('a', id: 'view_more', class: 'view_more').click
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
                  find('a', id: 'view_more', class: 'view_more').click
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
                  find('a', id: 'view_more', class: 'view_more').click
>>>>>>> 4e81ea2 (Featire specs)
=======
                  find('a', id: 'view_more', class: 'view_more').click
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                  find('a', id: 'view_more', class: 'view_more').click
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
                  find('a', id: 'view_more', class: 'view_more').click
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  find('a', id: 'view_more', class: 'view_more').click
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                  find('a', id: 'view_more', class: 'view_more').click
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
                  find('a', id: 'view_more', class: 'view_more').click
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
                  find('a', id: 'view_more', class: 'view_more').click
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
                  expect(page).not_to have_css('a', class: 'view_more hidden', id: 'view_more')
>>>>>>> 5b7749a (Fix)
          
        759. 
        
        
      
        
        
          
      759. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
            
          
        760. 
        
        
      
        
        
          
      760. 
            1
            

            

                  expect(page).not_to have_css('a', class: 'view_more hidden', id: 'view_more')
          
        761. 
        
        
      
        
        
          
      761. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 872e675 (Fix)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
                end
          
        762. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      762. 
=======
          
      763. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      764. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      765. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      766. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      767. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
          
      768. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      769. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      770. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      771. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      772. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      773. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      774. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      775. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      776. 
>>>>>>> 5b7749a (Fix)
            
            

            

            
          
        777. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
          
      777. 
            1
            

            

                context 'when view more' do
          
        778. 
        
        
      
        
        
          
      778. 
            1
            

            

                  it 'show books with view more button' do
          
        779. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
          
      779. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
                    visit books_path
=======
                context 'when view more' do
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
                context 'when view more' do
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                    visit books_path
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
                context 'when view more' do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
                context 'when view more' do
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
                context 'when view more' do
>>>>>>> 4e81ea2 (Featire specs)
=======
                context 'when view more' do
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                context 'when view more' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
                context 'when view more' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                context 'when view more' do
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                context 'when view more' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
                context 'when view more' do
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
                context 'when view more' do
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
                    visit books_path
>>>>>>> 5b7749a (Fix)
          
        780. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      780. 
            
=======
          
      781. 
            1
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      782. 
            1
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      783. 
            
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      784. 
            1
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      785. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      786. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      787. 
            1
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      788. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      789. 
            1
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      790. 
            1
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      791. 
            
>>>>>>> 5b7749a (Fix)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
            
=======
                  it 'show books with view more button' do
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
                  it 'show books with view more button' do
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
            
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
                  it 'show books with view more button' do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
                  it 'show books with view more button' do
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
                  it 'show books with view more button' do
>>>>>>> 4e81ea2 (Featire specs)
=======
                  it 'show books with view more button' do
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                  it 'show books with view more button' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
                  it 'show books with view more button' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it 'show books with view more button' do
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                  it 'show books with view more button' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
                  it 'show books with view more button' do
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
                  it 'show books with view more button' do
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
            
>>>>>>> 5b7749a (Fix)
          
        792. 
        
        
      
        
        
          
      792. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
                    expect(page).to have_css('a', class: 'view_more')
=======
                    visit books_path
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
                    visit books_path
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                    expect(page).to have_css('a', class: 'view_more')
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
                    visit books_path
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
                    visit books_path
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
                    visit books_path
>>>>>>> 4e81ea2 (Featire specs)
=======
                    visit books_path
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                    visit books_path
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
                    visit books_path
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                    visit books_path
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                    visit books_path
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
                    visit books_path
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
                    visit books_path
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
                    expect(page).to have_css('a', class: 'view_more')
>>>>>>> 5b7749a (Fix)
          
        793. 
        
        
      
        
        
          
      793. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
            
          
        794. 
        
        
      
        
        
          
      794. 
            1
            

            

                    expect(page).to have_css('a', class: 'view_more')
          
        795. 
        
        
      
        
        
          
      795. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 872e675 (Fix)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
                  end
          
        796. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      796. 
=======
          
      797. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      798. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      799. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      800. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      801. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
          
      802. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      803. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      804. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      805. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      806. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      807. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      808. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      809. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      810. 
>>>>>>> 5b7749a (Fix)
            
            

            

            
          
        811. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      811. 
=======
          
      812. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      813. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      814. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      815. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      816. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
          
      817. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      818. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      819. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      820. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      821. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      822. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      823. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      824. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      825. 
>>>>>>> 5b7749a (Fix)
            1
            

            

                  it 'show loaded books', js: true do
          
        826. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
          
      826. 
            1
            

            

                    visit books_path
          
        827. 
        
        
      
        
        
          
      827. 
            
            

            

            
          
        828. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
          
      828. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
                    find('a', class: 'view_more').click
=======
                    visit books_path
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
                    visit books_path
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                    find('a', class: 'view_more').click
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
                    visit books_path
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
                    visit books_path
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
                    visit books_path
>>>>>>> 4e81ea2 (Featire specs)
=======
                    visit books_path
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                    visit books_path
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
                    visit books_path
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                    visit books_path
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                    visit books_path
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
                    visit books_path
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
                    visit books_path
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
                    find('a', class: 'view_more').click
>>>>>>> 5b7749a (Fix)
          
        829. 
        
        
      
        
        
          
      829. 
            
            

            

            
          
        830. 
        
        
      
        
        
          
      830. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
                    expect(page).to have_content(books.last.title)
=======
                    find('a', id: 'view_more', class: 'view_more').click
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
                    find('a', id: 'view_more', class: 'view_more').click
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                    expect(page).to have_content(books.last.title)
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
                    find('a', id: 'view_more', class: 'view_more').click
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
                    find('a', id: 'view_more', class: 'view_more').click
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
                    find('a', id: 'view_more', class: 'view_more').click
>>>>>>> 4e81ea2 (Featire specs)
=======
                    find('a', id: 'view_more', class: 'view_more').click
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                    find('a', id: 'view_more', class: 'view_more').click
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
                    find('a', id: 'view_more', class: 'view_more').click
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                    find('a', id: 'view_more', class: 'view_more').click
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                    find('a', id: 'view_more', class: 'view_more').click
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
                    find('a', id: 'view_more', class: 'view_more').click
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
                    find('a', id: 'view_more', class: 'view_more').click
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
                    expect(page).to have_content(books.last.title)
>>>>>>> 5b7749a (Fix)
          
        831. 
        
        
      
        
        
          
      831. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
                  end
=======
            
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
            
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                  end
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
            
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
            
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
            
>>>>>>> 4e81ea2 (Featire specs)
=======
            
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
            
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
            
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
            
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
            
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
            
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
            
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
                  end
>>>>>>> 5b7749a (Fix)
          
        832. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      832. 
            
=======
          
      833. 
            1
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      834. 
            1
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      835. 
            
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      836. 
            1
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      837. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      838. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      839. 
            1
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      840. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      841. 
            1
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      842. 
            1
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      843. 
            
>>>>>>> 5b7749a (Fix)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
                end
=======
                    expect(page).to have_content(books.last.title)
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
                    expect(page).to have_content(books.last.title)
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                end
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
                    expect(page).to have_content(books.last.title)
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
                    expect(page).to have_content(books.last.title)
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
                    expect(page).to have_content(books.last.title)
>>>>>>> 4e81ea2 (Featire specs)
=======
                    expect(page).to have_content(books.last.title)
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                    expect(page).to have_content(books.last.title)
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
                    expect(page).to have_content(books.last.title)
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                    expect(page).to have_content(books.last.title)
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                    expect(page).to have_content(books.last.title)
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
                    expect(page).to have_content(books.last.title)
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
                    expect(page).to have_content(books.last.title)
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
                end
>>>>>>> 5b7749a (Fix)
          
        844. 
        
        
      
        
        
          
      844. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
              end
=======
                  end
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
                  end
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              end
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
                  end
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
                  end
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
                  end
>>>>>>> 4e81ea2 (Featire specs)
=======
                  end
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                  end
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
                  end
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  end
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                  end
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
                  end
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
                  end
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
              end
>>>>>>> 5b7749a (Fix)
          
        845. 
        
        
      
        
        
          
      845. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
                end
          
        846. 
        
        
      
        
        
          
      846. 
            
            

            

              end
          
        847. 
        
        
      
        
        
          
      847. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 872e675 (Fix)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
            
          
        848. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      848. 
=======
          
      849. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      850. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      851. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      852. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      853. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
          
      854. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      855. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      856. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      857. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      858. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      859. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      860. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      861. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      862. 
>>>>>>> 5b7749a (Fix)
            1
            

            

              describe 'sort' do
          
        863. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      863. 
=======
          
      864. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      865. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      866. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      867. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      868. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
          
      869. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      870. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      871. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      872. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      873. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      874. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      875. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      876. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      877. 
>>>>>>> 5b7749a (Fix)
            1
            

            

                shared_examples 'sort test' do
          
        878. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      878. 
=======
          
      879. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      880. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      881. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      882. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      883. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
          
      884. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      885. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      886. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      887. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      888. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      889. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      890. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      891. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      892. 
>>>>>>> 5b7749a (Fix)
            5
            

            

                  it 'sort books' do
          
        893. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
          
      893. 
            5
            

            

                    create(:book, title: 'Zimbabwe', price_cents: 75,
          
        894. 
        
        
      
        
        
          
      894. 
            
            

            

                                  created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
          
        895. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
          
      895. 
            5
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
                    create(:book, title: 'Anna', price_cents: 23,
=======
                    FactoryBot.create(:book, title: 'Zimbabwe', price: 75,
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
                    FactoryBot.create(:book, title: 'Zimbabwe', price: 75,
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                    create(:book, title: 'Anna', price_cents: 23,
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
                    FactoryBot.create(:book, title: 'Zimbabwe', price: 75,
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
                    FactoryBot.create(:book, title: 'Zimbabwe', price: 75,
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
                    FactoryBot.create(:book, title: 'Zimbabwe', price: 75,
>>>>>>> 4e81ea2 (Featire specs)
=======
                    FactoryBot.create(:book, title: 'Zimbabwe', price: 75,
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                    FactoryBot.create(:book, title: 'Zimbabwe', price: 75,
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
                    FactoryBot.create(:book, title: 'Zimbabwe', price: 75,
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                    FactoryBot.create(:book, title: 'Zimbabwe', price: 75,
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                    FactoryBot.create(:book, title: 'Zimbabwe', price: 75,
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
                    FactoryBot.create(:book, title: 'Zimbabwe', price: 75,
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
                    FactoryBot.create(:book, title: 'Zimbabwe', price: 75,
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
                    create(:book, title: 'Anna', price_cents: 23,
>>>>>>> 5b7749a (Fix)
          
        896. 
        
        
      
        
        
          
      896. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                                  created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00')
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                                             created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                                             created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
=======
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
                                  created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00')
=======
                                      created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
                                      created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
>>>>>>> 752f0c0 (Featire specs)
=======
                                      created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
>>>>>>> 4e81ea2 (Featire specs)
=======
                                      created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> df37394 (Featire specs)
=======
=======
=======
                                             created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
                                  created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00')
>>>>>>> c033601 (Rebased)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
                                  created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00')
=======
                                      created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
=======
=======
                                      created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
                                  created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00')
>>>>>>> 872e675 (Fix)
=======
                                  created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00')
=======
                                      created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
=======
=======
                                      created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
=======
                                      created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                                             created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
                                             created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                                      created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                                             created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
                                      created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
                                             created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
                                  created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00')
>>>>>>> 5b7749a (Fix)
          
        897. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      897. 
=======
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      898. 
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      899. 
            5
            

            

                    FactoryBot.create(:book, title: 'Anna', price: 23, created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00')
          
        900. 
        
        
      
        
        
          
      900. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      901. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      902. 
>>>>>>> 5b7749a (Fix)
            
            

            

            
          
        903. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      903. 
=======
          
      904. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      905. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      906. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      907. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      908. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
          
      909. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      910. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      911. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      912. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      913. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      914. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      915. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      916. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      917. 
>>>>>>> 5b7749a (Fix)
            5
            

            

                    visit books_path
          
        918. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      918. 
=======
          
      919. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      920. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      921. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      922. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      923. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
          
      924. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      925. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      926. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      927. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      928. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      929. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      930. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      931. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      932. 
>>>>>>> 5b7749a (Fix)
            
            

            

            
          
        933. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      933. 
=======
          
      934. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      935. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      936. 
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
          
      937. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
          
      938. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
          
      939. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      940. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      941. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      942. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      943. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      944. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      945. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      946. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      947. 
>>>>>>> 5b7749a (Fix)
            5
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
                    find('a', class: 'dropdown-toggle lead small', text: I18n.t('catalog_page.sorting.newer_first'),
          
        948. 
        
        
      
        
        
          
      948. 
            
            

            

                              id: 'menu').click
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
                    find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click
>>>>>>> d0dc1f1 (Featire specs)
=======
                    find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
=======
                    find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
=======
                    find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
                    find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click
>>>>>>> 4e81ea2 (Featire specs)
=======
                    find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                    find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
                    find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                    find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                    find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
                    find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
                    find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
          
        949. 
        
        
      
        
        
          
      949. 
            
            

            

            
          
        950. 
        
        
      
        
        
          
      950. 
            5
            

            

                    within 'ul', class: 'dropdown-menu', id: 'sort' do
          
        951. 
        
        
      
        
        
          
      951. 
            5
            

            

                      click_link button
          
        952. 
        
        
      
        
        
          
      952. 
            
            

            

                    end
          
        953. 
        
        
      
        
        
          
      953. 
            5
            

            

                    expect(find('.col-xs-6.col-sm-3', match: :first)).to have_content(book_title)
          
        954. 
        
        
      
        
        
          
      954. 
            
            

            

                  end
          
        955. 
        
        
      
        
        
          
      955. 
            
            

            

                end
          
        956. 
        
        
      
        
        
          
      956. 
            
            

            

            
          
        957. 
        
        
      
        
        
          
      957. 
            1
            

            

                context 'when sort by title A to Z' do
          
        958. 
        
        
      
        
        
          
      958. 
            2
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
                  let(:button) { I18n.t('catalog_page.sorting.title.asc') }
=======
                  let(:button) { 'Title: A to Z' }
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
                  let(:button) { 'Title: A to Z' }
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                  let(:button) { I18n.t('catalog_page.sorting.title.asc') }
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
                  let(:button) { 'Title: A to Z' }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
                  let(:button) { 'Title: A to Z' }
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
                  let(:button) { 'Title: A to Z' }
>>>>>>> 4e81ea2 (Featire specs)
=======
                  let(:button) { 'Title: A to Z' }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                  let(:button) { 'Title: A to Z' }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
                  let(:button) { 'Title: A to Z' }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  let(:button) { 'Title: A to Z' }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                  let(:button) { 'Title: A to Z' }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
                  let(:button) { 'Title: A to Z' }
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
                  let(:button) { 'Title: A to Z' }
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
                  let(:button) { I18n.t('catalog_page.sorting.title.asc') }
>>>>>>> 5b7749a (Fix)
          
        959. 
        
        
      
        
        
          
      959. 
            2
            

            

                  let(:book_title) { 'Anna' }
          
        960. 
        
        
      
        
        
          
      960. 
            
            

            

            
          
        961. 
        
        
      
        
        
          
      961. 
            1
            

            

                  include_examples 'sort test'
          
        962. 
        
        
      
        
        
          
      962. 
            
            

            

                end
          
        963. 
        
        
      
        
        
          
      963. 
            
            

            

            
          
        964. 
        
        
      
        
        
          
      964. 
            1
            

            

                context 'when sort by title Z to A' do
          
        965. 
        
        
      
        
        
          
      965. 
            2
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
                  let(:button) { I18n.t('catalog_page.sorting.title.desc') }
=======
                  let(:button) { 'Title: Z to A' }
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
                  let(:button) { 'Title: Z to A' }
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                  let(:button) { I18n.t('catalog_page.sorting.title.desc') }
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
                  let(:button) { 'Title: Z to A' }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
                  let(:button) { 'Title: Z to A' }
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
                  let(:button) { 'Title: Z to A' }
>>>>>>> 4e81ea2 (Featire specs)
=======
                  let(:button) { 'Title: Z to A' }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                  let(:button) { 'Title: Z to A' }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
                  let(:button) { 'Title: Z to A' }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  let(:button) { 'Title: Z to A' }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                  let(:button) { 'Title: Z to A' }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
                  let(:button) { 'Title: Z to A' }
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
                  let(:button) { 'Title: Z to A' }
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
                  let(:button) { I18n.t('catalog_page.sorting.title.desc') }
>>>>>>> 5b7749a (Fix)
          
        966. 
        
        
      
        
        
          
      966. 
            2
            

            

                  let(:book_title) { 'Zimbabwe' }
          
        967. 
        
        
      
        
        
          
      967. 
            
            

            

            
          
        968. 
        
        
      
        
        
          
      968. 
            1
            

            

                  include_examples 'sort test'
          
        969. 
        
        
      
        
        
          
      969. 
            
            

            

                end
          
        970. 
        
        
      
        
        
          
      970. 
            
            

            

            
          
        971. 
        
        
      
        
        
          
      971. 
            1
            

            

                context 'when sort by price High to Low' do
          
        972. 
        
        
      
        
        
          
      972. 
            2
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
                  let(:button) { I18n.t('catalog_page.sorting.price.desc') }
=======
                  let(:button) { 'Price: High to Low' }
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
                  let(:button) { 'Price: High to Low' }
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                  let(:button) { I18n.t('catalog_page.sorting.price.desc') }
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
                  let(:button) { 'Price: High to Low' }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
                  let(:button) { 'Price: High to Low' }
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
                  let(:button) { 'Price: High to Low' }
>>>>>>> 4e81ea2 (Featire specs)
=======
                  let(:button) { 'Price: High to Low' }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                  let(:button) { 'Price: High to Low' }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
                  let(:button) { 'Price: High to Low' }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  let(:button) { 'Price: High to Low' }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                  let(:button) { 'Price: High to Low' }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
                  let(:button) { 'Price: High to Low' }
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
                  let(:button) { 'Price: High to Low' }
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
                  let(:button) { I18n.t('catalog_page.sorting.price.desc') }
>>>>>>> 5b7749a (Fix)
          
        973. 
        
        
      
        
        
          
      973. 
            2
            

            

                  let(:book_title) { 'Zimbabwe' }
          
        974. 
        
        
      
        
        
          
      974. 
            
            

            

            
          
        975. 
        
        
      
        
        
          
      975. 
            1
            

            

                  include_examples 'sort test'
          
        976. 
        
        
      
        
        
          
      976. 
            
            

            

                end
          
        977. 
        
        
      
        
        
          
      977. 
            
            

            

            
          
        978. 
        
        
      
        
        
          
      978. 
            1
            

            

                context 'when sort by price Low to High' do
          
        979. 
        
        
      
        
        
          
      979. 
            2
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
                  let(:button) { I18n.t('catalog_page.sorting.price.asc') }
=======
                  let(:button) { 'Price: Low to High' }
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
                  let(:button) { 'Price: Low to High' }
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                  let(:button) { I18n.t('catalog_page.sorting.price.asc') }
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
                  let(:button) { 'Price: Low to High' }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
                  let(:button) { 'Price: Low to High' }
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
                  let(:button) { 'Price: Low to High' }
>>>>>>> 4e81ea2 (Featire specs)
=======
                  let(:button) { 'Price: Low to High' }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                  let(:button) { 'Price: Low to High' }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
                  let(:button) { 'Price: Low to High' }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  let(:button) { 'Price: Low to High' }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                  let(:button) { 'Price: Low to High' }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
                  let(:button) { 'Price: Low to High' }
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
                  let(:button) { 'Price: Low to High' }
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
                  let(:button) { I18n.t('catalog_page.sorting.price.asc') }
>>>>>>> 5b7749a (Fix)
          
        980. 
        
        
      
        
        
          
      980. 
            2
            

            

                  let(:book_title) { 'Anna' }
          
        981. 
        
        
      
        
        
          
      981. 
            
            

            

            
          
        982. 
        
        
      
        
        
          
      982. 
            1
            

            

                  include_examples 'sort test'
          
        983. 
        
        
      
        
        
          
      983. 
            
            

            

                end
          
        984. 
        
        
      
        
        
          
      984. 
            
            

            

            
          
        985. 
        
        
      
        
        
          
      985. 
            1
            

            

                context 'when sort by newest' do
          
        986. 
        
        
      
        
        
          
      986. 
            2
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
                  let(:button) { I18n.t('catalog_page.sorting.newer_first') }
=======
                  let(:button) { 'Newest first' }
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
                  let(:button) { 'Newest first' }
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                  let(:button) { I18n.t('catalog_page.sorting.newer_first') }
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
                  let(:button) { 'Newest first' }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
                  let(:button) { 'Newest first' }
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
                  let(:button) { 'Newest first' }
>>>>>>> 4e81ea2 (Featire specs)
=======
                  let(:button) { 'Newest first' }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                  let(:button) { 'Newest first' }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
                  let(:button) { 'Newest first' }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  let(:button) { 'Newest first' }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                  let(:button) { 'Newest first' }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
                  let(:button) { 'Newest first' }
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
                  let(:button) { 'Newest first' }
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
                  let(:button) { I18n.t('catalog_page.sorting.newer_first') }
>>>>>>> 5b7749a (Fix)
          
        987. 
        
        
      
        
        
          
      987. 
            2
            

            

                  let(:book_title) { 'Zimbabwe' }
          
        988. 
        
        
      
        
        
          
      988. 
            
            

            

            
          
        989. 
        
        
      
        
        
          
      989. 
            1
            

            

                  include_examples 'sort test'
          
        990. 
        
        
      
        
        
          
      990. 
            
            

            

                end
          
        991. 
        
        
      
        
        
          
      991. 
            
            

            

              end
          
        992. 
        
        
      
        
        
          
      992. 
            
            

            

            end
          
        993. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/feature/cart_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      29 relevant lines.
      29 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            require 'rails_helper'
          
        2. 
        
        
      
        
        
          
      2. 
            
            

            

            
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

            RSpec.describe 'Cart', type: :feature, js: true do
          
        4. 
        
        
      
        
        
          
      4. 
            5
            

            

              let(:book) { FactoryBot.create(:book) }
          
        5. 
        
        
      
        
        
          
      5. 
            
            

            

            
          
        6. 
        
        
      
        
        
          
      6. 
            1
            

            

              before do
          
        7. 
        
        
      
        
        
          
      7. 
            4
            

            

                book
          
        8. 
        
        
      
        
        
          
      8. 
            4
            

            

                visit book_path(book.id)
          
        9. 
        
        
      
        
        
          
      9. 
            
            

            

            
          
        10. 
        
        
      
        
        
          
      10. 
            4
            

            

                click_button I18n.t('book_page.add_to_card')
          
        11. 
        
        
      
        
        
          
      11. 
            
            

            

              end
          
        12. 
        
        
      
        
        
          
      12. 
            
            

            

            
          
        13. 
        
        
      
        
        
          
      13. 
            1
            

            

              describe '#add_book_to_order' do
          
        14. 
        
        
      
        
        
          
      14. 
            1
            

            

                it 'add book to order' do
          
        15. 
        
        
      
        
        
          
      15. 
            1
            

            

                  within('span', class: 'shop-icon') do
          
        16. 
        
        
      
        
        
          
      16. 
            1
            

            

                    expect(page).to have_content(1)
          
        17. 
        
        
      
        
        
          
      17. 
            
            

            

                  end
          
        18. 
        
        
      
        
        
          
      18. 
            
            

            

                end
          
        19. 
        
        
      
        
        
          
      19. 
            
            

            

              end
          
        20. 
        
        
      
        
        
          
      20. 
            
            

            

            
          
        21. 
        
        
      
        
        
          
      21. 
            1
            

            

              describe '#quantity_change' do
          
        22. 
        
        
      
        
        
          
      22. 
            1
            

            

                it 'book quantity inc' do
          
        23. 
        
        
      
        
        
          
      23. 
            1
            

            

                  visit orders_path
          
        24. 
        
        
      
        
        
          
      24. 
            
            

            

            
          
        25. 
        
        
      
        
        
          
      25. 
            1
            

            

                  within("a#inc#{book.id}.input-link") do
          
        26. 
        
        
      
        
        
          
      26. 
            1
            

            

                    find('i.fa.fa-plus.line-heaght-40').click
          
        27. 
        
        
      
        
        
          
      27. 
            
            

            

                  end
          
        28. 
        
        
      
        
        
          
      28. 
            
            

            

            
          
        29. 
        
        
      
        
        
          
      29. 
            1
            

            

                  sleep(2)
          
        30. 
        
        
      
        
        
          
      30. 
            
            

            

            
          
        31. 
        
        
      
        
        
          
      31. 
            1
            

            

                  expect(find_field("counter#{book.id}").value).to eq('2')
          
        32. 
        
        
      
        
        
          
      32. 
            
            

            

                end
          
        33. 
        
        
      
        
        
          
      33. 
            
            

            

            
          
        34. 
        
        
      
        
        
          
      34. 
            1
            

            

                it 'book quantity dec' do
          
        35. 
        
        
      
        
        
          
      35. 
            1
            

            

                  visit orders_path
          
        36. 
        
        
      
        
        
          
      36. 
            
            

            

            
          
        37. 
        
        
      
        
        
          
      37. 
            1
            

            

                  within("a#dec#{book.id}.input-link") do
          
        38. 
        
        
      
        
        
          
      38. 
            1
            

            

                    find('i.fa.fa-minus.line-heaght-40').click
          
        39. 
        
        
      
        
        
          
      39. 
            
            

            

                  end
          
        40. 
        
        
      
        
        
          
      40. 
            
            

            

            
          
        41. 
        
        
      
        
        
          
      41. 
            1
            

            

                  sleep(2)
          
        42. 
        
        
      
        
        
          
      42. 
            
            

            

            
          
        43. 
        
        
      
        
        
          
      43. 
            1
            

            

                  expect(find_field("counter#{book.id}").value).to eq('0')
          
        44. 
        
        
      
        
        
          
      44. 
            
            

            

                end
          
        45. 
        
        
      
        
        
          
      45. 
            
            

            

              end
          
        46. 
        
        
      
        
        
          
      46. 
            
            

            

            
          
        47. 
        
        
      
        
        
          
      47. 
            1
            

            

              describe '#remove_book_from_cart' do
          
        48. 
        
        
      
        
        
          
      48. 
            1
            

            

                it 'book quantity change' do
          
        49. 
        
        
      
        
        
          
      49. 
            1
            

            

                  visit orders_path
          
        50. 
        
        
      
        
        
          
      50. 
            
            

            

            
          
        51. 
        
        
      
        
        
          
      51. 
            1
            

            

                  find('button.close.general-cart-close').click
          
        52. 
        
        
      
        
        
          
      52. 
            
            

            

            
          
        53. 
        
        
      
        
        
          
      53. 
            1
            

            

                  expect(page).to have_content(I18n.t('order.messages.delete'))
          
        54. 
        
        
      
        
        
          
      54. 
            
            

            

                end
          
        55. 
        
        
      
        
        
          
      55. 
            
            

            

              end
          
        56. 
        
        
      
        
        
          
      56. 
            
            

            

            end
          
        57. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/feature/coupon_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      30 relevant lines.
      30 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            require 'rails_helper'
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

            require_relative '../support/shared_context'
          
        3. 
        
        
      
        
        
          
      3. 
            
            

            

            
          
        4. 
        
        
      
        
        
          
      4. 
            1
            

            

            RSpec.describe 'Coupon', type: :feature, js: true do
          
        5. 
        
        
      
        
        
          
      5. 
            1
            

            

              include_context 'with api request authentication helper methods'
          
        6. 
        
        
      
        
        
          
      6. 
            1
            

            

              include_context 'with api request global before and after hooks'
          
        7. 
        
        
      
        
        
          
      7. 
            
            

            

            
          
        8. 
        
        
      
        
        
          
      8. 
            5
            

            

              let(:user) { FactoryBot.create(:user) }
          
        9. 
        
        
      
        
        
          
      9. 
            4
            

            

              let(:coupon) { FactoryBot.create(:coupon, discount: 0.15) }
          
        10. 
        
        
      
        
        
          
      10. 
            5
            

            

              let(:order) { FactoryBot.create(:order, user_id: user.id, books_count: 0) }
          
        11. 
        
        
      
        
        
          
      11. 
            5
            

            

              let(:book) { FactoryBot.create(:book, price_cents: 1234) }
          
        12. 
        
        
      
        
        
          
      12. 
            5
            

            

              let(:order_book) { FactoryBot.create(:order_book, order: order, book: book) }
          
        13. 
        
        
      
        
        
          
      13. 
            
            

            

            
          
        14. 
        
        
      
        
        
          
      14. 
            1
            

            

              before do
          
        15. 
        
        
      
        
        
          
      15. 
            4
            

            

                sign_in(user)
          
        16. 
        
        
      
        
        
          
      16. 
            4
            

            

                order
          
        17. 
        
        
      
        
        
          
      17. 
            4
            

            

                order_book
          
        18. 
        
        
      
        
        
          
      18. 
            4
            

            

                visit orders_path
          
        19. 
        
        
      
        
        
          
      19. 
            
            

            

              end
          
        20. 
        
        
      
        
        
          
      20. 
            
            

            

            
          
        21. 
        
        
      
        
        
          
      21. 
            1
            

            

              describe '#valid coupon' do
          
        22. 
        
        
      
        
        
          
      22. 
            1
            

            

                before do
          
        23. 
        
        
      
        
        
          
      23. 
            3
            

            

                  fill_in 'input', with: coupon.code
          
        24. 
        
        
      
        
        
          
      24. 
            
            

            

            
          
        25. 
        
        
      
        
        
          
      25. 
            3
            

            

                  click_button I18n.t('order.apply')
          
        26. 
        
        
      
        
        
          
      26. 
            
            

            

                end
          
        27. 
        
        
      
        
        
          
      27. 
            
            

            

            
          
        28. 
        
        
      
        
        
          
      28. 
            1
            

            

                it 'sub price' do
          
        29. 
        
        
      
        
        
          
      29. 
            1
            

            

                  expect(page).to have_content("SubTotal:\n€ 12.34")
          
        30. 
        
        
      
        
        
          
      30. 
            
            

            

                end
          
        31. 
        
        
      
        
        
          
      31. 
            
            

            

            
          
        32. 
        
        
      
        
        
          
      32. 
            1
            

            

                it 'use coupon' do
          
        33. 
        
        
      
        
        
          
      33. 
            1
            

            

                  expect(page).to have_content("Coupon:\n€ 1.85")
          
        34. 
        
        
      
        
        
          
      34. 
            
            

            

                end
          
        35. 
        
        
      
        
        
          
      35. 
            
            

            

            
          
        36. 
        
        
      
        
        
          
      36. 
            1
            

            

                it 'count price with coupon' do
          
        37. 
        
        
      
        
        
          
      37. 
            1
            

            

                  expect(page).to have_content('Order Total: € 10.49')
          
        38. 
        
        
      
        
        
          
      38. 
            
            

            

                end
          
        39. 
        
        
      
        
        
          
      39. 
            
            

            

              end
          
        40. 
        
        
      
        
        
          
      40. 
            
            

            

            
          
        41. 
        
        
      
        
        
          
      41. 
            1
            

            

              describe '#invalid coupon' do
          
        42. 
        
        
      
        
        
          
      42. 
            1
            

            

                it 'show error message' do
          
        43. 
        
        
      
        
        
          
      43. 
            1
            

            

                  fill_in 'input', with: 'dasdasdqe1243wasad'
          
        44. 
        
        
      
        
        
          
      44. 
            
            

            

            
          
        45. 
        
        
      
        
        
          
      45. 
            1
            

            

                  click_button I18n.t('order.apply')
          
        46. 
        
        
      
        
        
          
      46. 
            
            

            

            
          
        47. 
        
        
      
        
        
          
      47. 
            1
            

            

                  expect(page).to have_content(I18n.t('order.coupon.error'))
          
        48. 
        
        
      
        
        
          
      48. 
            
            

            

                end
          
        49. 
        
        
      
        
        
          
      49. 
            
            

            

              end
          
        50. 
        
        
      
        
        
          
      50. 
            
            

            

            end
          
        51. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/feature/home_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
      49 relevant lines.
      49 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            RSpec.describe 'Home', type: :feature do
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

              include_context 'with api request authentication helper methods'
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

              include_context 'with api request global before and after hooks'
          
        4. 
        
        
      
        
        
          
      4. 
            
            

            

            
          
        5. 
        
        
      
        
        
          
      5. 
            1
            

            

              describe 'Get Started' do
          
        6. 
        
        
      
        
        
          
      6. 
            1
            

            

                it 'on click move to catalog page' do
          
        7. 
        
        
      
        
        
          
      7. 
            1
            

            

                  visit root_path
          
        8. 
        
        
      
        
        
          
      8. 
            
            

            

            
          
        9. 
        
        
      
        
        
          
      9. 
            1
            

            

                  click_on 'Get Started'
          
        10. 
        
        
      
        
        
          
      10. 
            
            

            

            
          
        11. 
        
        
      
        
        
          
      11. 
            1
            

            

                  expect(page).to have_content('Catalog')
          
        12. 
        
        
      
        
        
          
      12. 
            
            

            

                end
          
        13. 
        
        
      
        
        
          
      13. 
            
            

            

              end
          
        14. 
        
        
      
        
        
          
      14. 
            
            

            

            
          
        15. 
        
        
      
        
        
          
      15. 
            1
            

            

              describe 'navbar' do
          
        16. 
        
        
      
        
        
          
      16. 
            2
            

            

                let(:books_category) { create(:books_category) }
          
        17. 
        
        
      
        
        
          
      17. 
            
            

            

            
          
        18. 
        
        
      
        
        
          
      18. 
            1
            

            

                it 'on click home move to root-path' do
          
        19. 
        
        
      
        
        
          
      19. 
            1
            

            

                  visit books_path
          
        20. 
        
        
      
        
        
          
      20. 
            
            

            

            
          
        21. 
        
        
      
        
        
          
      21. 
            1
            

            

                  find('a', id: 'root').click
          
        22. 
        
        
      
        
        
          
      22. 
            
            

            

            
          
        23. 
        
        
      
        
        
          
      23. 
            1
            

            

                  expect(page).to have_content('Get Started')
          
        24. 
        
        
      
        
        
          
      24. 
            
            

            

                end
          
        25. 
        
        
      
        
        
          
      25. 
            
            

            

            
          
        26. 
        
        
      
        
        
          
      26. 
            1
            

            

                it 'on click category name move to root-path with books that belong to this category' do
          
        27. 
        
        
      
        
        
          
      27. 
            1
            

            

                  books_category
          
        28. 
        
        
      
        
        
          
      28. 
            
            

            

            
          
        29. 
        
        
      
        
        
          
      29. 
            1
            

            

                  visit root_path
          
        30. 
        
        
      
        
        
          
      30. 
            
            

            

            
          
        31. 
        
        
      
        
        
          
      31. 
            1
            

            

                  find('a', class: 'dropdown-toggle', text: 'Shop').click
          
        32. 
        
        
      
        
        
          
      32. 
            
            

            

            
          
        33. 
        
        
      
        
        
          
      33. 
            1
            

            

                  within('ul', id: 'nav') do
          
        34. 
        
        
      
        
        
          
      34. 
            1
            

            

                    find('a', class: 'collapse-link', text: books_category.category.name).click
          
        35. 
        
        
      
        
        
          
      35. 
            
            

            

                  end
          
        36. 
        
        
      
        
        
          
      36. 
            
            

            

            
          
        37. 
        
        
      
        
        
          
      37. 
            1
            

            

                  expect(page).to have_content(books_category.category.books.first.title)
          
        38. 
        
        
      
        
        
          
      38. 
            
            

            

                end
          
        39. 
        
        
      
        
        
          
      39. 
            
            

            

            
          
        40. 
        
        
      
        
        
          
      40. 
            1
            

            

                context 'when guest' do
          
        41. 
        
        
      
        
        
          
      41. 
            1
            

            

                  it 'on click login go to login page' do
          
        42. 
        
        
      
        
        
          
      42. 
            1
            

            

                    visit root_path
          
        43. 
        
        
      
        
        
          
      43. 
            
            

            

            
          
        44. 
        
        
      
        
        
          
      44. 
            1
            

            

                    within 'div', class: 'visible-xs' do
          
        45. 
        
        
      
        
        
          
      45. 
            1
            

            

                      click_link I18n.t('header.log_in')
          
        46. 
        
        
      
        
        
          
      46. 
            
            

            

                    end
          
        47. 
        
        
      
        
        
          
      47. 
            
            

            

            
          
        48. 
        
        
      
        
        
          
      48. 
            1
            

            

                    expect(page).to have_content(I18n.t('header.log_in'))
          
        49. 
        
        
      
        
        
          
      49. 
            
            

            

                  end
          
        50. 
        
        
      
        
        
          
      50. 
            
            

            

            
          
        51. 
        
        
      
        
        
          
      51. 
            1
            

            

                  it 'on click sing up go to sing up page' do
          
        52. 
        
        
      
        
        
          
      52. 
            1
            

            

                    visit root_path
          
        53. 
        
        
      
        
        
          
      53. 
            
            

            

            
          
        54. 
        
        
      
        
        
          
      54. 
            1
            

            

                    within 'div', class: 'visible-xs' do
          
        55. 
        
        
      
        
        
          
      55. 
            1
            

            

                      click_link I18n.t('header.sing_up')
          
        56. 
        
        
      
        
        
          
      56. 
            
            

            

                    end
          
        57. 
        
        
      
        
        
          
      57. 
            
            

            

            
          
        58. 
        
        
      
        
        
          
      58. 
            1
            

            

                    expect(page).to have_content(I18n.t('header.sing_up'))
          
        59. 
        
        
      
        
        
          
      59. 
            
            

            

                  end
          
        60. 
        
        
      
        
        
          
      60. 
            
            

            

                end
          
        61. 
        
        
      
        
        
          
      61. 
            
            

            

            
          
        62. 
        
        
      
        
        
          
      62. 
            1
            

            

                context 'when user', js: true do
          
        63. 
        
        
      
        
        
          
      63. 
            4
            

            

                  let(:user) { create(:user) }
          
        64. 
        
        
      
        
        
          
      64. 
            
            

            

            
          
        65. 
        
        
      
        
        
          
      65. 
            1
            

            

                  before do
          
        66. 
        
        
      
        
        
          
      66. 
            3
            

            

                    sign_in(user)
          
        67. 
        
        
      
        
        
          
      67. 
            
            

            

                  end
          
        68. 
        
        
      
        
        
          
      68. 
            
            

            

            
          
        69. 
        
        
      
        
        
          
      69. 
            1
            

            

                  it 'on click account show settings' do
          
        70. 
        
        
      
        
        
          
      70. 
            1
            

            

                    visit root_path
          
        71. 
        
        
      
        
        
          
      71. 
            
            

            

            
          
        72. 
        
        
      
        
        
          
      72. 
            1
            

            

                    click_on I18n.t('header.account')
          
        73. 
        
        
      
        
        
          
      73. 
            
            

            

            
          
        74. 
        
        
      
        
        
          
      74. 
            1
            

            

                    expect(page).to have_content(I18n.t('header.settings'))
          
        75. 
        
        
      
        
        
          
      75. 
            
            

            

                  end
          
        76. 
        
        
      
        
        
          
      76. 
            
            

            

            
          
        77. 
        
        
      
        
        
          
      77. 
            1
            

            

                  it 'on click account show log_out' do
          
        78. 
        
        
      
        
        
          
      78. 
            1
            

            

                    visit root_path
          
        79. 
        
        
      
        
        
          
      79. 
            
            

            

            
          
        80. 
        
        
      
        
        
          
      80. 
            1
            

            

                    click_on I18n.t('header.account')
          
        81. 
        
        
      
        
        
          
      81. 
            
            

            

            
          
        82. 
        
        
      
        
        
          
      82. 
            1
            

            

                    expect(page).to have_content(I18n.t('header.log_out'))
          
        83. 
        
        
      
        
        
          
      83. 
            
            

            

                  end
          
        84. 
        
        
      
        
        
          
      84. 
            
            

            

            
          
        85. 
        
        
      
        
        
          
      85. 
            1
            

            

                  it 'log_out' do
          
        86. 
        
        
      
        
        
          
      86. 
            1
            

            

                    visit root_path
          
        87. 
        
        
      
        
        
          
      87. 
            
            

            

            
          
        88. 
        
        
      
        
        
          
      88. 
            1
            

            

                    click_on I18n.t('header.account')
          
        89. 
        
        
      
        
        
          
      89. 
            
            

            

            
          
        90. 
        
        
      
        
        
          
      90. 
            1
            

            

                    click_on(I18n.t('header.log_out'), match: :first)
          
        91. 
        
        
      
        
        
          
      91. 
            
            

            

            
          
        92. 
        
        
      
        
        
          
      92. 
            1
            

            

                    expect(page).to have_content(I18n.t('devise.sessions.signed_out'))
          
        93. 
        
        
      
        
        
          
      93. 
            
            

            

                  end
          
        94. 
        
        
      
        
        
          
      94. 
            
            

            

                end
          
        95. 
        
        
      
        
        
          
      95. 
            
            

            

              end
          
        96. 
        
        
      
        
        
          
      96. 
            
            

            

            end
          
        97. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/feature/login_spec.rb
      
    
      
>>>>>>> a5d032d (Fix)
      
  100.0%


      lines covered
    
      

    

    
      
<<<<<<< HEAD
      31 relevant lines.
      31 lines covered and
=======
      19 relevant lines.
      19 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            RSpec.describe 'Login', type: :feature do
          
        2. 
        
        
      
        
        
          
      2. 
            3
            

            

              let(:user_second) { create(:user, email: 'test.rspec@rspec.ua') }
          
        3. 
        
        
      
        
        
          
      3. 
            
            

            

            
          
        4. 
        
        
      
        
        
          
      4. 
            1
            

            

              describe '#login' do
          
        5. 
        
        
      
        
        
          
      5. 
            1
            

            

                before do
          
        6. 
        
        
      
        
        
          
      6. 
            2
            

            

                  visit new_user_session_path
          
        7. 
        
        
      
        
        
          
      7. 
            
            

            

                end
          
        8. 
        
        
      
        
        
          
      8. 
            
            

            

            
          
        9. 
        
        
      
        
        
          
      9. 
            1
            

            

                context 'when successfully login' do
          
        10. 
        
        
      
        
        
          
      10. 
            1
            

            

                  it 'login' do
          
        11. 
        
        
      
        
        
          
      11. 
            1
            

            

                    within 'form', class: 'new_user', id: 'new_user' do
          
        12. 
        
        
      
        
        
          
      12. 
            1
            

            

                      fill_in 'user_email', with: user_second.email
          
        13. 
        
        
      
        
        
          
      13. 
            1
            

            

                      fill_in 'user_password', with: user_second.password
          
        14. 
        
        
      
        
        
          
      14. 
            
            

            

            
          
        15. 
        
        
      
        
        
          
      15. 
            1
            

            

                      click_on I18n.t('header.log_in')
          
        16. 
        
        
      
        
        
          
      16. 
            
            

            

                    end
          
        17. 
        
        
      
        
        
          
      17. 
            
            

            

            
          
        18. 
        
        
      
        
        
          
      18. 
            1
            

            

                    expect(page).to have_text I18n.t('devise.sessions.signed_in')
          
        19. 
        
        
      
        
        
          
      19. 
            
            

            

                  end
          
        20. 
        
        
      
        
        
          
      20. 
            
            

            

                end
          
        21. 
        
        
      
        
        
          
      21. 
            
            

            

            
          
        22. 
        
        
      
        
        
          
      22. 
            1
            

            

                context 'when unsuccessfully login' do
          
        23. 
        
        
      
        
        
          
      23. 
            1
            

            

                  it 'didn`t login' do
          
        24. 
        
        
      
        
        
          
      24. 
            1
            

            

                    within 'form', class: 'new_user', id: 'new_user' do
          
        25. 
        
        
      
        
        
          
      25. 
            1
            

            

                      fill_in 'user_email', with: user_second.email
          
        26. 
        
        
      
        
        
          
      26. 
            1
            

            

                      fill_in 'user_password', with: 'wrong_password'
          
        27. 
        
        
      
        
        
          
      27. 
            
            

            

            
          
        28. 
        
        
      
        
        
          
      28. 
            1
            

            

                      click_on I18n.t('header.log_in')
          
        29. 
        
        
      
        
        
          
      29. 
            
            

            

                    end
          
        30. 
        
        
      
        
        
          
      30. 
            
            

            

            
          
        31. 
        
        
      
        
        
          
      31. 
            1
            

            

                    expect(page).to have_text 'Invalid Email or password.'
          
        32. 
        
        
      
        
        
          
      32. 
            
            

            

                  end
          
        33. 
        
        
      
        
        
          
      33. 
            
            

            

                end
          
        34. 
        
        
      
        
        
          
      34. 
            
            

            

              end
          
        35. 
        
        
      
        
        
          
      35. 
            
            

            

            end
          
        36. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/feature/new_password_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      13 relevant lines.
      13 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            require_relative '../rails_helper'
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

            require_relative '../support/shared_context'
          
        3. 
        
        
      
        
        
          
      3. 
            
            

            

            
          
        4. 
        
        
      
        
        
          
      4. 
            1
            

            

            RSpec.describe 'New Password', type: :feature do
          
        5. 
        
        
      
        
        
          
      5. 
            3
            

            

              let(:user) { FactoryBot.create(:user) }
          
        6. 
        
        
      
        
        
          
      6. 
            
            

            

            
          
        7. 
        
        
      
        
        
          
      7. 
            1
            

            

              describe '#new_password' do
          
        8. 
        
        
      
        
        
          
      8. 
            1
            

            

                it 'change password' do
          
        9. 
        
        
      
        
        
          
      9. 
            1
            

            

                  user.reset_password('newPassword', 'newPassword')
          
        10. 
        
        
      
        
        
          
      10. 
            
            

            

            
          
        11. 
        
        
      
        
        
          
      11. 
            1
            

            

                  expect(user.password).to eq('newPassword')
          
        12. 
        
        
      
        
        
          
      12. 
            
            

            

                end
          
        13. 
        
        
      
        
        
          
      13. 
            
            

            

            
          
        14. 
        
        
      
        
        
          
      14. 
            1
            

            

                it 'not validate password' do
          
        15. 
        
        
      
        
        
          
      15. 
            1
            

            

                  visit new_user_password_path
          
        16. 
        
        
      
        
        
          
      16. 
            
            

            

            
          
        17. 
        
        
      
        
        
          
      17. 
            1
            

            

                  fill_in 'email', with: user.email
          
        18. 
        
        
      
        
        
          
      18. 
            
            

            

            
          
        19. 
        
        
      
        
        
          
      19. 
            1
            

            

                  click_on I18n.t('login.send_instructions')
          
        20. 
        
        
      
        
        
          
      20. 
            
            

            

            
          
        21. 
        
        
      
        
        
          
      21. 
            1
            

            

                  expect(page).to have_content(I18n.t('devise.passwords.send_instructions'))
          
        22. 
        
        
      
        
        
          
      22. 
            
            

            

                end
          
        23. 
        
        
      
        
        
          
      23. 
            
            

            

              end
          
        24. 
        
        
      
        
        
          
      24. 
            
            

            

            end
          
        25. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/feature/registration_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      29 relevant lines.
      29 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            RSpec.describe 'Registration', type: :feature do
          
        2. 
        
        
      
        
        
          
      2. 
            3
            

            

              let(:user) { create(:user, email: 'test.rspec@rspec.ua') }
          
        3. 
        
        
      
        
        
          
      3. 
            
            

            

            
          
        4. 
        
        
      
        
        
          
      4. 
            1
            

            

              describe '#sing_up' do
          
        5. 
        
        
      
        
        
          
      5. 
            1
            

            

                before do
          
        6. 
        
        
      
        
        
          
      6. 
            3
            

            

                  visit new_user_registration_path
          
        7. 
        
        
      
        
        
          
      7. 
            
            

            

                end
          
        8. 
        
        
      
        
        
          
      8. 
            
            

            

            
          
        9. 
        
        
      
        
        
          
      9. 
            1
            

            

                context 'when successfully sing_up' do
          
        10. 
        
        
      
        
        
          
      10. 
            1
            

            

                  it 'sing_up users' do
          
        11. 
        
        
      
        
        
          
      11. 
            1
            

            

                    within 'form', class: 'new_user', id: 'new_user' do
          
        12. 
        
        
      
        
        
          
      12. 
            1
            

            

                      fill_in 'user_email', with: 'email-test@rspec.com'
          
        13. 
        
        
      
        
        
          
      13. 
            1
            

            

                      fill_in 'user_password', with: user.password
          
        14. 
        
        
      
        
        
          
      14. 
            1
            

            

                      fill_in 'user_password_confirmation', with: user.password
          
        15. 
        
        
      
        
        
          
      15. 
            
            

            

            
          
        16. 
        
        
      
        
        
          
      16. 
            1
            

            

                      click_on I18n.t('header.sing_up')
          
        17. 
        
        
      
        
        
          
      17. 
            
            

            

                    end
          
        18. 
        
        
      
        
        
          
      18. 
            
            

            

            
          
        19. 
        
        
      
        
        
          
      19. 
            1
            

            

                    expect(page).to have_text I18n.t('devise.registrations.signed_up_but_unconfirmed')
          
        20. 
        
        
      
        
        
          
      20. 
            
            

            

                  end
          
        21. 
        
        
      
        
        
          
      21. 
            
            

            

                end
          
        22. 
        
        
      
        
        
          
      22. 
            
            

            

            
          
        23. 
        
        
      
        
        
          
      23. 
            1
            

            

                context 'when users is already exits' do
          
        24. 
        
        
      
        
        
          
      24. 
            1
            

            

                  it 'sing_up users' do
          
        25. 
        
        
      
        
        
          
      25. 
            1
            

            

                    within 'form', class: 'new_user', id: 'new_user' do
          
        26. 
        
        
      
        
        
          
      26. 
            1
            

            

                      fill_in 'user_email', with: user.email
          
        27. 
        
        
      
        
        
          
      27. 
            1
            

            

                      fill_in 'user_password', with: user.password
          
        28. 
        
        
      
        
        
          
      28. 
            1
            

            

                      fill_in 'user_password_confirmation', with: user.password
          
        29. 
        
        
      
        
        
          
      29. 
            
            

            

            
          
        30. 
        
        
      
        
        
          
      30. 
            1
            

            

                      click_on I18n.t('header.sing_up')
          
        31. 
        
        
      
        
        
          
      31. 
            
            

            

                    end
          
        32. 
        
        
      
        
        
          
      32. 
            
            

            

            
          
        33. 
        
        
      
        
        
          
      33. 
            1
            

            

                    expect(page).to have_text('Email has already been taken')
          
        34. 
        
        
      
        
        
          
      34. 
            
            

            

                  end
          
        35. 
        
        
      
        
        
          
      35. 
            
            

            

                end
          
        36. 
        
        
      
        
        
          
      36. 
            
            

            

            
          
        37. 
        
        
      
        
        
          
      37. 
            1
            

            

                context 'when unsuccessfully sing_up' do
          
        38. 
        
        
      
        
        
          
      38. 
            1
            

            

                  it 'didn`t sing_up' do
          
        39. 
        
        
      
        
        
          
      39. 
            1
            

            

                    within 'form', class: 'new_user', id: 'new_user' do
          
        40. 
        
        
      
        
        
          
      40. 
            1
            

            

                      fill_in 'user_email', with: FFaker::Internet.email
          
        41. 
        
        
      
        
        
          
      41. 
            1
            

            

                      fill_in 'user_password', with: 'password'
          
        42. 
        
        
      
        
        
          
      42. 
            1
            

            

                      fill_in 'user_password_confirmation', with: 'wrong'
          
        43. 
        
        
      
        
        
          
      43. 
            
            

            

            
          
        44. 
        
        
      
        
        
          
      44. 
            1
            

            

                      click_on I18n.t('header.sing_up')
          
        45. 
        
        
      
        
        
          
      45. 
            
            

            

                    end
          
        46. 
        
        
      
        
        
          
      46. 
            
            

            

            
          
        47. 
        
        
      
        
        
          
      47. 
            1
            

            

                    expect(page).to have_text '1 error prohibited this user from being saved'
          
        48. 
        
        
      
        
        
          
      48. 
            
            

            

                  end
          
        49. 
        
        
      
        
        
          
      49. 
            
            

            

                end
          
        50. 
        
        
      
        
        
          
      50. 
            
            

            

              end
          
        51. 
        
        
      
        
        
          
      51. 
            
            

            

            end
          
        52. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/feature/review_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      28 relevant lines.
      28 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            RSpec.describe 'Review', type: :feature do
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

              include_context 'with api request authentication helper methods'
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

              include_context 'with api request global before and after hooks'
          
        4. 
        
        
      
        
        
          
      4. 
            
            

            

            
          
        5. 
        
        
      
        
        
          
      5. 
            3
            

            

              let(:user) { create(:user).decorate }
          
        6. 
        
        
      
        
        
          
      6. 
            3
            

            

              let(:book) { create(:book).decorate }
          
        7. 
        
        
      
        
        
          
      7. 
            
            

            

            
          
        8. 
        
        
      
        
        
          
      8. 
            1
            

            

              before do
          
        9. 
        
        
      
        
        
          
      9. 
            2
            

            

                sign_in(user)
          
        10. 
        
        
      
        
        
          
      10. 
            
            

            

            
          
        11. 
        
        
      
        
        
          
      11. 
            2
            

            

                visit book_path(book)
          
        12. 
        
        
      
        
        
          
      12. 
            
            

            

              end
          
        13. 
        
        
      
        
        
          
      13. 
            
            

            

            
          
        14. 
        
        
      
        
        
          
      14. 
            1
            

            

              shared_examples 'review' do
          
        15. 
        
        
      
        
        
          
      15. 
            2
            

            

                it 'review' do
          
        16. 
        
        
      
        
        
          
      16. 
            2
            

            

                  find('i', id: rating).click
          
        17. 
        
        
      
        
        
          
      17. 
            
            

            

            
          
        18. 
        
        
      
        
        
          
      18. 
            2
            

            

                  fill_in :title, with: FFaker::Lorem.sentence(title_words)
          
        19. 
        
        
      
        
        
          
      19. 
            2
            

            

                  fill_in :body, with: FFaker::Lorem.sentence(body_words)
          
        20. 
        
        
      
        
        
          
      20. 
            
            

            

            
          
        21. 
        
        
      
        
        
          
      21. 
            2
            

            

                  click_on I18n.t('review.post')
          
        22. 
        
        
      
        
        
          
      22. 
            
            

            

            
          
        23. 
        
        
      
        
        
          
      23. 
            2
            

            

                  expect(page).to have_content(result)
          
        24. 
        
        
      
        
        
          
      24. 
            
            

            

                end
          
        25. 
        
        
      
        
        
          
      25. 
            
            

            

              end
          
        26. 
        
        
      
        
        
          
      26. 
            
            

            

            
          
        27. 
        
        
      
        
        
          
      27. 
            1
            

            

              describe '#post review', js: true do
          
        28. 
        
        
      
        
        
          
      28. 
            1
            

            

                context 'when review posted' do
          
        29. 
        
        
      
        
        
          
      29. 
            2
            

            

                  let(:rating) { "star#{rand(1..5)}" }
          
        30. 
        
        
      
        
        
          
      30. 
            2
            

            

                  let(:title_words) { 3 }
          
        31. 
        
        
      
        
        
          
      31. 
            2
            

            

                  let(:body_words) { 5 }
          
        32. 
        
        
      
        
        
          
      32. 
            2
            

            

                  let(:result) { user.name_or_email }
          
        33. 
        
        
      
        
        
          
      33. 
            
            

            

            
          
        34. 
        
        
      
        
        
          
      34. 
            1
            

            

                  include_examples 'review'
          
        35. 
        
        
      
        
        
          
      35. 
            
            

            

                end
          
        36. 
        
        
      
        
        
          
      36. 
            
            

            

            
          
        37. 
        
        
      
        
        
          
      37. 
            1
            

            

                context 'when review not been posted' do
          
        38. 
        
        
      
        
        
          
      38. 
            2
            

            

                  let(:rating) { "star#{rand(1..5)}" }
          
        39. 
        
        
      
        
        
          
      39. 
            2
            

            

                  let(:title_words) { 80 }
          
        40. 
        
        
      
        
        
          
      40. 
            2
            

            

                  let(:body_words) { 30 }
          
        41. 
        
        
      
        
        
          
      41. 
            2
            

            

                  let(:result) { 'Title is too long (maximum is 80 characters)' }
          
        42. 
        
        
      
        
        
          
      42. 
            
            

            

            
          
        43. 
        
        
      
        
        
          
      43. 
            1
            

            

                  include_examples 'review'
          
        44. 
        
        
      
        
        
          
      44. 
            
            

            

                end
          
        45. 
        
        
      
        
        
          
      45. 
            
            

            

              end
          
        46. 
        
        
      
        
        
          
      46. 
            
            

            

            end
          
        47. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/feature/settings_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      34 relevant lines.
      34 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            RSpec.describe 'Settings', type: :feature do
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

              include_context 'with api request authentication helper methods'
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

              include_context 'with api request global before and after hooks'
          
        4. 
        
        
      
        
        
          
      4. 
            
            

            

            
          
        5. 
        
        
      
        
        
          
      5. 
            4
            

            

              let(:user) { create(:user) }
          
        6. 
        
        
      
        
        
          
      6. 
            
            

            

            
          
        7. 
        
        
      
        
        
          
      7. 
            1
            

            

              before do
          
        8. 
        
        
      
        
        
          
      8. 
            3
            

            

                sign_in(user)
          
        9. 
        
        
      
        
        
          
      9. 
            
            

            

            
          
        10. 
        
        
      
        
        
          
      10. 
            3
            

            

                visit edit_user_path(user.id)
          
        11. 
        
        
      
        
        
          
      11. 
            
            

            

            
          
        12. 
        
        
      
        
        
          
      12. 
            3
            

            

                click_link I18n.t('settings.privacy')
          
        13. 
        
        
      
        
        
          
      13. 
            
            

            

              end
          
        14. 
        
        
      
        
        
          
      14. 
            
            

            

            
          
        15. 
        
        
      
        
        
          
      15. 
            1
            

            

              describe '#email_change' do
          
        16. 
        
        
      
        
        
          
      16. 
            1
            

            

                it 'change email' do
          
        17. 
        
        
      
        
        
          
      17. 
            1
            

            

                  within('div', id: 'email') do
          
        18. 
        
        
      
        
        
          
      18. 
            1
            

            

                    fill_in :email, with: FFaker::Internet.email
          
        19. 
        
        
      
        
        
          
      19. 
            
            

            

            
          
        20. 
        
        
      
        
        
          
      20. 
            1
            

            

                    click_on I18n.t('settings.save')
          
        21. 
        
        
      
        
        
          
      21. 
            
            

            

                  end
          
        22. 
        
        
      
        
        
          
      22. 
            
            

            

            
          
        23. 
        
        
      
        
        
          
      23. 
            1
            

            

                  user.confirm
          
        24. 
        
        
      
        
        
          
      24. 
            
            

            

            
          
        25. 
        
        
      
        
        
          
      25. 
            1
            

            

                  expect(page).to have_content(I18n.t('settings.message.update'))
          
        26. 
        
        
      
        
        
          
      26. 
            
            

            

                end
          
        27. 
        
        
      
        
        
          
      27. 
            
            

            

              end
          
        28. 
        
        
      
        
        
          
      28. 
            
            

            

            
          
        29. 
        
        
      
        
        
          
      29. 
            1
            

            

              describe '#password_change' do
          
        30. 
        
        
      
        
        
          
      30. 
            1
            

            

                context 'when error' do
          
        31. 
        
        
      
        
        
          
      31. 
            1
            

            

                  it 'didnt change password' do
          
        32. 
        
        
      
        
        
          
      32. 
            1
            

            

                    within('div', id: 'password') do
          
        33. 
        
        
      
        
        
          
      33. 
            1
            

            

                      fill_in :current_password, with: user.password
          
        34. 
        
        
      
        
        
          
      34. 
            1
            

            

                      fill_in :password, with: 'newPassword'
          
        35. 
        
        
      
        
        
          
      35. 
            1
            

            

                      fill_in :password_confirmation, with: 'incorrectPassword'
          
        36. 
        
        
      
        
        
          
      36. 
            
            

            

            
          
        37. 
        
        
      
        
        
          
      37. 
            1
            

            

                      click_on I18n.t('settings.save')
          
        38. 
        
        
      
        
        
          
      38. 
            
            

            

                    end
          
        39. 
        
        
      
        
        
          
      39. 
            
            

            

            
          
        40. 
        
        
      
        
        
          
      40. 
            1
            

            

                    user.confirm
          
        41. 
        
        
      
        
        
          
      41. 
            
            

            

            
          
        42. 
        
        
      
        
        
          
      42. 
            1
            

            

                    expect(page).to have_content(I18n.t('settings.error.error'))
          
        43. 
        
        
      
        
        
          
      43. 
            
            

            

                  end
          
        44. 
        
        
      
        
        
          
      44. 
            
            

            

                end
          
        45. 
        
        
      
        
        
          
      45. 
            
            

            

            
          
        46. 
        
        
      
        
        
          
      46. 
            1
            

            

                context 'when successful' do
          
        47. 
        
        
      
        
        
          
      47. 
            1
            

            

                  it 'didnt change password' do
          
        48. 
        
        
      
        
        
          
      48. 
            1
            

            

                    within('div', id: 'password') do
          
        49. 
        
        
      
        
        
          
      49. 
            1
            

            

                      fill_in :current_password, with: user.password
          
        50. 
        
        
      
        
        
          
      50. 
            1
            

            

                      fill_in :password, with: 'newPassword'
          
        51. 
        
        
      
        
        
          
      51. 
            1
            

            

                      fill_in :password_confirmation, with: 'newPassword'
          
        52. 
        
        
      
        
        
          
      52. 
            
            

            

            
          
        53. 
        
        
      
        
        
          
      53. 
            1
            

            

                      click_on I18n.t('settings.save')
          
        54. 
        
        
      
        
        
          
      54. 
            
            

            

                    end
          
        55. 
        
        
      
        
        
          
      55. 
            
            

            

            
          
        56. 
        
        
      
        
        
          
      56. 
            1
            

            

                    user.confirm
          
        57. 
        
        
      
        
        
          
      57. 
            
            

            

            
          
        58. 
        
        
      
        
        
          
      58. 
            1
            

            

                    expect(page).to have_content(I18n.t('devise.failure.unauthenticated'))
          
        59. 
        
        
      
        
        
          
      59. 
            
            

            

                  end
          
        60. 
        
        
      
        
        
          
      60. 
            
            

            

                end
          
        61. 
        
        
      
        
        
          
      61. 
            
            

            

              end
          
        62. 
        
        
      
        
        
          
      62. 
            
            

            

            end
          
        63. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/feature/shipping_spec.rb
      
    
      
      
  73.08%


      lines covered
    
      

    

    
      
      26 relevant lines.
      19 lines covered and
      7 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            RSpec.describe 'Shipping', type: :feature do
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

              include_context 'with api request authentication helper methods'
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

              include_context 'with api request global before and after hooks'
          
        4. 
        
        
      
        
        
          
      4. 
            
            

            

            
          
        5. 
        
        
      
        
        
          
      5. 
            2
            

            

              let(:user) { FactoryBot.create(:user) }
          
        6. 
        
        
      
        
        
          
      6. 
            1
            

            

              let(:attributes_for) { attributes_for(:shipping) }
          
        7. 
        
        
      
        
        
          
      7. 
            
            

            

            
          
        8. 
        
        
      
        
        
          
      8. 
            1
            

            

              describe '#fill_in', js: true do
          
        9. 
        
        
      
        
        
          
      9. 
            1
            

            

                it 'fill in shipping' do
          
        10. 
        
        
      
        
        
          
      10. 
            1
            

            

                  sign_in(user)
          
        11. 
        
        
      
        
        
          
      11. 
            
            

            

            
          
        12. 
        
        
      
        
        
          
      12. 
            1
            

            

                  visit edit_user_path(user.id)
          
        13. 
        
        
      
        
        
          
      13. 
            
            

            

            
          
        14. 
        
        
      
        
        
          
      14. 
            1
            

            

                  within('div#shipping.col-md-5.mb-40') do
          
        15. 
        
        
      
        
        
          
      15. 
            1
            

            

                    find_all('div', class: 'form-group')[0] do
          
        16. 
        
        
      
        
        
          
      16. 
            
            

            

                      fill_in :first_name, with: attributes_for[:first_name]
          
        17. 
        
        
      
        
        
          
      17. 
            
            

            

                    end
          
        18. 
        
        
      
        
        
          
      18. 
            1
            

            

                    find_all('div', class: 'form-group')[1] do
          
        19. 
        
        
      
        
        
          
      19. 
            
            

            

                      fill_in :last_name, with: attributes_for[:last_name]
          
        20. 
        
        
      
        
        
          
      20. 
            
            

            

                    end
          
        21. 
        
        
      
        
        
          
      21. 
            1
            

            

                    find_all('div', class: 'form-group')[2] do
          
        22. 
        
        
      
        
        
          
      22. 
            
            

            

                      fill_in :address, with: attributes_for[:address]
          
        23. 
        
        
      
        
        
          
      23. 
            
            

            

                    end
          
        24. 
        
        
      
        
        
          
      24. 
            1
            

            

                    find_all('div', class: 'form-group')[3] do
          
        25. 
        
        
      
        
        
          
      25. 
            
            

            

                      fill_in :city, with: attributes_for[:city]
          
        26. 
        
        
      
        
        
          
      26. 
            
            

            

                    end
          
        27. 
        
        
      
        
        
          
      27. 
            1
            

            

                    find_all('div', class: 'form-group')[4] do
          
        28. 
        
        
      
        
        
          
      28. 
            
            

            

                      fill_in :zip, with: attributes_for[:zip]
          
        29. 
        
        
      
        
        
          
      29. 
            
            

            

                    end
          
        30. 
        
        
      
        
        
          
      30. 
            1
            

            

                    find_all('div', class: 'form-group')[5] do
          
        31. 
        
        
      
        
        
          
      31. 
            
            

            

                      fill_in :country, with: attributes_for[:country]
          
        32. 
        
        
      
        
        
          
      32. 
            
            

            

                    end
          
        33. 
        
        
      
        
        
          
      33. 
            1
            

            

                    find_all('div', class: 'form-group')[6] do
          
        34. 
        
        
      
        
        
          
      34. 
            
            

            

                      fill_in :phone, with: attributes_for[:phone]
          
        35. 
        
        
      
        
        
          
      35. 
            
            

            

                    end
          
        36. 
        
        
      
        
        
          
      36. 
            1
            

            

                    click_on I18n.t('settings.save')
          
        37. 
        
        
      
        
        
          
      37. 
            
            

            

                  end
          
        38. 
        
        
      
        
        
          
      38. 
            
            

            

            
          
        39. 
        
        
      
        
        
          
      39. 
            1
            

            

                  expect(page).to have_content(I18n.t('settings.message.update'))
          
        40. 
        
        
      
        
        
          
      40. 
            
            

            

                end
          
        41. 
        
        
      
        
        
          
      41. 
            
            

            

              end
          
        42. 
        
        
      
        
        
          
      42. 
            
            

            

            end
          
        43. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/feature/user_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      42 relevant lines.
      42 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            RSpec.describe 'User', type: :feature do
          
        2. 
        
        
      
        
        
          
      2. 
            2
            

            

              let(:user) { build(:user, email: 'test.rspec@rspec.ua') }
          
        3. 
        
        
      
        
        
          
      3. 
            3
            

            

              let(:user_second) { create(:user, email: 'test.rspec-test@rspec.ua') }
          
        4. 
        
        
      
        
        
          
      4. 
            
            

            

            
          
        5. 
        
        
      
        
        
          
      5. 
            1
            

            

              describe '#sing_up' do
          
        6. 
        
        
      
        
        
          
      6. 
            1
            

            

                context 'when successfully sing_up' do
          
        7. 
        
        
      
        
        
          
      7. 
            1
            

            

                  before do
          
        8. 
        
        
      
        
        
          
      8. 
            1
            

            

                    visit new_user_registration_path
          
        9. 
        
        
      
        
        
          
      9. 
            
            

            

            
          
        10. 
        
        
      
        
        
          
      10. 
            1
            

            

                    within 'form', class: 'new_user', id: 'new_user' do
          
        11. 
        
        
      
        
        
          
      11. 
            1
            

            

                      fill_in 'user_email', with: user.email
          
        12. 
        
        
      
        
        
          
      12. 
            1
            

            

                      fill_in 'user_password', with: user.password
          
        13. 
        
        
      
        
        
          
      13. 
            1
            

            

                      fill_in 'user_password_confirmation', with: user.password
          
        14. 
        
        
      
        
        
          
      14. 
            
            

            

            
          
        15. 
        
        
      
        
        
          
      15. 
            1
            

            

                      click_on I18n.t('header.sing_up')
          
        16. 
        
        
      
        
        
          
      16. 
            
            

            

                    end
          
        17. 
        
        
      
        
        
          
      17. 
            
            

            

                  end
          
        18. 
        
        
      
        
        
          
      18. 
            
            

            

            
          
        19. 
        
        
      
        
        
          
      19. 
            1
            

            

                  it 'sing_up user' do
          
        20. 
        
        
      
        
        
          
      20. 
            1
            

            

                    expect(page).to have_text I18n.t('devise.registrations.signed_up_but_unconfirmed')
          
        21. 
        
        
      
        
        
          
      21. 
            
            

            

                  end
          
        22. 
        
        
      
        
        
          
      22. 
            
            

            

                end
          
        23. 
        
        
      
        
        
          
      23. 
            
            

            

            
          
        24. 
        
        
      
        
        
          
      24. 
            1
            

            

                context 'when unsuccessfully sing_up' do
          
        25. 
        
        
      
        
        
          
      25. 
            1
            

            

                  it 'didn`t sing_up' do
          
        26. 
        
        
      
        
        
          
      26. 
            1
            

            

                    visit new_user_registration_path
          
        27. 
        
        
      
        
        
          
      27. 
            
            

            

            
          
        28. 
        
        
      
        
        
          
      28. 
            1
            

            

                    within 'form', class: 'new_user', id: 'new_user' do
          
        29. 
        
        
      
        
        
          
      29. 
            1
            

            

                      fill_in 'user_email', with: FFaker::Internet.email
          
        30. 
        
        
      
        
        
          
      30. 
            1
            

            

                      fill_in 'user_password', with: 'wrong'
          
        31. 
        
        
      
        
        
          
      31. 
            1
            

            

                      fill_in 'user_password_confirmation', with: 'wrong'
          
        32. 
        
        
      
        
        
          
      32. 
            
            

            

            
          
        33. 
        
        
      
        
        
          
      33. 
            1
            

            

                      click_on I18n.t('header.sing_up')
          
        34. 
        
        
      
        
        
          
      34. 
            
            

            

                    end
          
        35. 
        
        
      
        
        
          
      35. 
            
            

            

            
          
        36. 
        
        
      
        
        
          
      36. 
            1
            

            

                    expect(page).to have_text '1 error prohibited this user from being saved'
          
        37. 
        
        
      
        
        
          
      37. 
            
            

            

                  end
          
        38. 
        
        
      
        
        
          
      38. 
            
            

            

                end
          
        39. 
        
        
      
        
        
          
      39. 
            
            

            

              end
          
        40. 
        
        
      
        
        
          
      40. 
            
            

            

            
          
        41. 
        
        
      
        
        
          
      41. 
            1
            

            

              describe '#login' do
          
        42. 
        
        
      
        
        
          
      42. 
            1
            

            

                before do
          
        43. 
        
        
      
        
        
          
      43. 
            2
            

            

                  user_second.confirm
          
        44. 
        
        
      
        
        
          
      44. 
            
            

            

                end
          
        45. 
        
        
      
        
        
          
      45. 
            
            

            

            
          
        46. 
        
        
      
        
        
          
      46. 
            1
            

            

                context 'when successfully login' do
          
        47. 
        
        
      
        
        
          
      47. 
            1
            

            

                  it 'login' do
          
        48. 
        
        
      
        
        
          
      48. 
            1
            

            

                    visit new_user_session_path
          
        49. 
        
        
      
        
        
          
      49. 
            
            

            

            
          
        50. 
        
        
      
        
        
          
      50. 
            1
            

            

                    within 'form', class: 'new_user', id: 'new_user' do
          
        51. 
        
        
      
        
        
          
      51. 
            1
            

            

                      fill_in 'user_email', with: user_second.email
          
        52. 
        
        
      
        
        
          
      52. 
            1
            

            

                      fill_in 'user_password', with: user_second.password
          
        53. 
        
        
      
        
        
          
      53. 
            
            

            

            
          
        54. 
        
        
      
        
        
          
      54. 
            1
            

            

                      click_on I18n.t('header.log_in')
          
        55. 
        
        
      
        
        
          
      55. 
            
            

            

                    end
          
        56. 
        
        
      
        
        
          
      56. 
            
            

            

            
          
        57. 
        
        
      
        
        
          
      57. 
            1
            

            

                    expect(page).to have_text I18n.t('devise.sessions.signed_in')
          
        58. 
        
        
      
        
        
          
      58. 
            
            

            

                  end
          
        59. 
        
        
      
        
        
          
      59. 
            
            

            

                end
          
        60. 
        
        
      
        
        
          
      60. 
            
            

            

            
          
        61. 
        
        
      
        
        
          
      61. 
            1
            

            

                context 'when unsuccessfully login' do
          
        62. 
        
        
      
        
        
          
      62. 
            1
            

            

                  it 'didn`t login' do
          
        63. 
        
        
      
        
        
          
      63. 
            1
            

            

                    visit new_user_session_path
          
        64. 
        
        
      
        
        
          
      64. 
            
            

            

            
          
        65. 
        
        
      
        
        
          
      65. 
            1
            

            

                    within 'form', class: 'new_user', id: 'new_user' do
          
        66. 
        
        
      
        
        
          
      66. 
            1
            

            

                      fill_in 'user_email', with: user_second.email
          
        67. 
        
        
      
        
        
          
      67. 
            1
            

            

                      fill_in 'user_password', with: 'wrong_password'
          
        68. 
        
        
      
        
        
          
      68. 
            
            

            

            
          
        69. 
        
        
      
        
        
          
      69. 
            1
            

            

                      click_on I18n.t('header.log_in')
          
        70. 
        
        
      
        
        
          
      70. 
            
            

            

                    end
          
        71. 
        
        
      
        
        
          
      71. 
            
            

            

            
          
        72. 
        
        
      
        
        
          
      72. 
            1
            

            

                    expect(page).to have_text 'Invalid Email or password.'
          
        73. 
        
        
      
        
        
          
      73. 
            
            

            

                  end
          
        74. 
        
        
      
        
        
          
      74. 
            
            

            

                end
          
        75. 
        
        
      
        
        
          
      75. 
            
            

            

              end
          
        76. 
        
        
      
        
        
          
      76. 
            
            

            

            end
          
        77. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/models/admin_user_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      5 relevant lines.
      5 lines covered and
<<<<<<< HEAD
=======
      20 relevant lines.
      20 lines covered and
>>>>>>> d0dc1f1 (Featire specs)
=======
      20 relevant lines.
      20 lines covered and
>>>>>>> 752f0c0 (Featire specs)
=======
      20 relevant lines.
      20 lines covered and
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
      20 relevant lines.
      20 lines covered and
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
      20 relevant lines.
      20 lines covered and
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
      20 relevant lines.
      20 lines covered and
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
      20 relevant lines.
      20 lines covered and
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
      20 relevant lines.
      20 lines covered and
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
      20 relevant lines.
      20 lines covered and
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            require 'rails_helper'
          
        2. 
        
        
      
        
        
          
      2. 
            
            

            

            
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
            RSpec.describe AdminUser, type: :model do
=======
            RSpec.describe 'Homes', type: :feature do
>>>>>>> d0dc1f1 (Featire specs)
=======
            RSpec.describe 'Homes', type: :feature do
>>>>>>> 752f0c0 (Featire specs)
=======
            RSpec.describe 'Homes', type: :feature do
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
            RSpec.describe 'Homes', type: :feature do
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
            RSpec.describe 'Homes', type: :feature do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
            RSpec.describe 'Homes', type: :feature do
>>>>>>> 08edf50 (Featire specs)
=======
            RSpec.describe 'Homes', type: :feature do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
            RSpec.describe 'Homes', type: :feature do
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
            RSpec.describe 'Homes', type: :feature do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
            RSpec.describe 'Homes', type: :feature do
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
            RSpec.describe 'Homes', type: :feature do
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
            RSpec.describe AdminUser, type: :model do
>>>>>>> 5b7749a (Fix)
          
        4. 
        
        
      
        
        
          
      4. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
              context 'when validations' do
=======
              describe 'Get Started' do
>>>>>>> d0dc1f1 (Featire specs)
=======
              describe 'Get Started' do
>>>>>>> 752f0c0 (Featire specs)
=======
              describe 'Get Started' do
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
              describe 'Get Started' do
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
              describe 'Get Started' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
              describe 'Get Started' do
>>>>>>> 08edf50 (Featire specs)
=======
              describe 'Get Started' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
              describe 'Get Started' do
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
              describe 'Get Started' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
              describe 'Get Started' do
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
              describe 'Get Started' do
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
              context 'when validations' do
>>>>>>> 5b7749a (Fix)
          
        5. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      5. 
            2
=======
          
      6. 
            1
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      7. 
            1
>>>>>>> 752f0c0 (Featire specs)
=======
          
      8. 
            1
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      9. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      10. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      11. 
            1
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      12. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      13. 
            1
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      14. 
            1
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      15. 
            2
>>>>>>> 5b7749a (Fix)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
                it { is_expected.to validate_presence_of(:email) }
=======
                it 'on click move to catalog page' do
>>>>>>> d0dc1f1 (Featire specs)
=======
                it 'on click move to catalog page' do
>>>>>>> 752f0c0 (Featire specs)
=======
                it 'on click move to catalog page' do
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
                it 'on click move to catalog page' do
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                it 'on click move to catalog page' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
                it 'on click move to catalog page' do
>>>>>>> 08edf50 (Featire specs)
=======
                it 'on click move to catalog page' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                it 'on click move to catalog page' do
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                it 'on click move to catalog page' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
                it 'on click move to catalog page' do
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
                it 'on click move to catalog page' do
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
                it { is_expected.to validate_presence_of(:email) }
>>>>>>> 5b7749a (Fix)
          
        16. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      16. 
            2
=======
          
      17. 
            1
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      18. 
            1
>>>>>>> 752f0c0 (Featire specs)
=======
          
      19. 
            1
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      20. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      21. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      22. 
            1
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      23. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      24. 
            1
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      25. 
            1
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      26. 
            2
>>>>>>> 5b7749a (Fix)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
                it { is_expected.to validate_presence_of(:password) }
=======
                  visit root_path
>>>>>>> d0dc1f1 (Featire specs)
=======
                  visit root_path
>>>>>>> 752f0c0 (Featire specs)
=======
                  visit root_path
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
                  visit root_path
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                  visit root_path
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
                  visit root_path
>>>>>>> 08edf50 (Featire specs)
=======
                  visit root_path
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  visit root_path
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                  visit root_path
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
                  visit root_path
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
                  visit root_path
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
                it { is_expected.to validate_presence_of(:password) }
>>>>>>> 5b7749a (Fix)
          
        27. 
        
        
      
        
        
          
      27. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
            
          
        28. 
        
        
      
        
        
          
      28. 
            1
            

            

                context 'when associations' do
          
        29. 
        
        
      
        
        
          
      29. 
            2
            

            

                  it { is_expected.to have_many(:authors_books).dependent(:destroy) }
          
        30. 
        
        
      
        
        
          
      30. 
            2
            

            

                  it { is_expected.to have_many(:books).through(:authors_books) }
          
        31. 
        
        
      
        
        
          
      31. 
            
            

            

                end
          
        32. 
        
        
      
        
        
          
      32. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
              end
          
        33. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      33. 
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      34. 
            
            

            

<<<<<<< HEAD
            
          
        35. 
        
        
      
        
        
          
      35. 
            1
            

            

              describe 'navbar' do
          
        36. 
        
        
      
        
        
          
      36. 
            2
            

            

                let(:books_category) { FactoryBot.create(:books_category) }
          
        37. 
        
        
      
        
        
          
      37. 
            
            

            

            
          
        38. 
        
        
      
        
        
          
      38. 
            1
            

            

                it 'on click home move to root-path' do
          
        39. 
        
        
      
        
        
          
      39. 
            1
            

            

                  visit books_path
          
        40. 
        
        
      
        
        
          
      40. 
            
            

            

            
          
        41. 
        
        
      
        
        
          
      41. 
            1
            

            

                  find('a', id: 'root').click
          
        42. 
        
        
      
        
        
          
      42. 
            
            

            

            
          
        43. 
        
        
      
        
        
          
      43. 
            1
            

            

                  expect(page).to have_content('Get Started')
          
        44. 
        
        
      
        
        
          
      44. 
            
            

            

                end
          
        45. 
        
        
      
        
        
          
      45. 
            
            

            

            
          
        46. 
        
        
      
        
        
          
      46. 
            1
            

            

                it 'on click category name move to root-path with books that belong to this category' do
          
        47. 
        
        
      
        
        
          
      47. 
            1
            

            

                  books_category
          
        48. 
        
        
      
        
        
          
      48. 
            
            

            

            
          
        49. 
        
        
      
        
        
          
      49. 
            1
            

            

                  visit root_path
          
        50. 
        
        
      
        
        
          
      50. 
            
            

            

            
          
        51. 
        
        
      
        
        
          
      51. 
            1
            

            

                  find('a', class: 'dropdown-toggle', text: 'Shop').click
          
        52. 
        
        
      
        
        
          
      52. 
            
            

            

            
          
        53. 
        
        
      
        
        
          
      53. 
            1
            

            

                  within('ul', id: 'nav') do
          
        54. 
        
        
      
        
        
          
      54. 
            1
            

            

                    find('a', class: 'collapse-link', text: books_category.category.name).click
          
        55. 
        
        
      
        
        
          
      55. 
            
            

            

                  end
          
        56. 
        
        
      
        
        
          
      56. 
            
            

            

            
          
        57. 
        
        
      
        
        
          
      57. 
            1
            

            

                  expect(page).to have_content(books_category.category.books.first.title)
          
        58. 
        
        
      
        
        
          
      58. 
            
            

            

                end
          
        59. 
        
        
      
        
        
          
      59. 
            
            

            

              end
          
        60. 
        
        
      
        
        
          
      60. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      61. 
>>>>>>> 5b7749a (Fix)
            
            

            

            end
          
        62. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/models/author_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      8 relevant lines.
      8 lines covered and
=======
      9 relevant lines.
      9 lines covered and
>>>>>>> d0dc1f1 (Featire specs)
=======
      9 relevant lines.
      9 lines covered and
>>>>>>> 752f0c0 (Featire specs)
=======
      9 relevant lines.
      9 lines covered and
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
      9 relevant lines.
      9 lines covered and
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
      9 relevant lines.
      9 lines covered and
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
      9 relevant lines.
      9 lines covered and
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
      9 relevant lines.
      9 lines covered and
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
      9 relevant lines.
      9 lines covered and
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
      9 relevant lines.
      9 lines covered and
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
      8 relevant lines.
      8 lines covered and
>>>>>>> 5b7749a (Fix)
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
            RSpec.describe Author, type: :model do
=======
            require 'rails_helper'
>>>>>>> d0dc1f1 (Featire specs)
=======
            require 'rails_helper'
>>>>>>> 752f0c0 (Featire specs)
=======
            require 'rails_helper'
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
            require 'rails_helper'
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
            require 'rails_helper'
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
            require 'rails_helper'
>>>>>>> 08edf50 (Featire specs)
=======
            require 'rails_helper'
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
            require 'rails_helper'
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
            require 'rails_helper'
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
            require 'rails_helper'
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
            require 'rails_helper'
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
            RSpec.describe Author, type: :model do
>>>>>>> 5b7749a (Fix)
          
        2. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
          
      2. 
            1
            

            

              describe 'author' do
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

                context 'when validations' do
          
        4. 
        
        
      
        
        
          
      4. 
            2
            

            

                  it { is_expected.to validate_presence_of(:first_name) }
          
        5. 
        
        
      
        
        
          
      5. 
            2
            

            

                  it { is_expected.to validate_presence_of(:last_name) }
          
        6. 
        
        
      
        
        
          
      6. 
            
            

            

                end
          
        7. 
        
        
      
        
        
          
      7. 
<<<<<<< HEAD
=======
          
      8. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      9. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
      10. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
          
      11. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      12. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      13. 
>>>>>>> 08edf50 (Featire specs)
=======
          
      14. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      15. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      16. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      17. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      18. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
            
            

            

            
          
        19. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      19. 
=======
          
      20. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      21. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
      22. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
          
      23. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      24. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      25. 
>>>>>>> 08edf50 (Featire specs)
=======
          
      26. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      27. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      28. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      29. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      30. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      31. 
>>>>>>> 5b7749a (Fix)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
                context 'when associations' do
=======
            RSpec.describe Author, type: :model do
>>>>>>> d0dc1f1 (Featire specs)
=======
            RSpec.describe Author, type: :model do
>>>>>>> 752f0c0 (Featire specs)
=======
            RSpec.describe Author, type: :model do
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
            RSpec.describe Author, type: :model do
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
            RSpec.describe Author, type: :model do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
            RSpec.describe Author, type: :model do
>>>>>>> 08edf50 (Featire specs)
=======
            RSpec.describe Author, type: :model do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
            RSpec.describe Author, type: :model do
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
            RSpec.describe Author, type: :model do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
            RSpec.describe Author, type: :model do
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
            RSpec.describe Author, type: :model do
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
                context 'when associations' do
>>>>>>> 5b7749a (Fix)
          
        32. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      32. 
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      33. 
            1
            

            

              describe 'author' do
          
        34. 
        
        
      
        
        
          
      34. 
            1
            

            

                context 'when validations' do
          
        35. 
        
        
      
        
        
          
      35. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      36. 
>>>>>>> 5b7749a (Fix)
            2
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
                  it { is_expected.to have_many(:authors_books).dependent(:destroy) }
=======
                  it { is_expected.to validate_presence_of(:first_name) }
>>>>>>> d0dc1f1 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:first_name) }
>>>>>>> 752f0c0 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:first_name) }
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
                  it { is_expected.to validate_presence_of(:first_name) }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                  it { is_expected.to validate_presence_of(:first_name) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
                  it { is_expected.to validate_presence_of(:first_name) }
>>>>>>> 08edf50 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:first_name) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to validate_presence_of(:first_name) }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                  it { is_expected.to validate_presence_of(:first_name) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
                  it { is_expected.to validate_presence_of(:first_name) }
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
                  it { is_expected.to validate_presence_of(:first_name) }
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to have_many(:authors_books).dependent(:destroy) }
>>>>>>> 5b7749a (Fix)
          
        37. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      37. 
=======
          
      38. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      39. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
      40. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
          
      41. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      42. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      43. 
>>>>>>> 08edf50 (Featire specs)
=======
          
      44. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      45. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      46. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      47. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      48. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      49. 
>>>>>>> 5b7749a (Fix)
            2
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
                  it { is_expected.to have_many(:books).through(:authors_books) }
=======
                  it { is_expected.to validate_presence_of(:last_name) }
>>>>>>> d0dc1f1 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:last_name) }
>>>>>>> 752f0c0 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:last_name) }
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
                  it { is_expected.to validate_presence_of(:last_name) }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                  it { is_expected.to validate_presence_of(:last_name) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
                  it { is_expected.to validate_presence_of(:last_name) }
>>>>>>> 08edf50 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:last_name) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to validate_presence_of(:last_name) }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                  it { is_expected.to validate_presence_of(:last_name) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
                  it { is_expected.to validate_presence_of(:last_name) }
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
                  it { is_expected.to validate_presence_of(:last_name) }
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to have_many(:books).through(:authors_books) }
>>>>>>> 5b7749a (Fix)
          
        50. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      50. 
=======
          
      51. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      52. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
      53. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
          
      54. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      55. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      56. 
>>>>>>> 08edf50 (Featire specs)
=======
          
      57. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      58. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      59. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      60. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      61. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      62. 
>>>>>>> 5b7749a (Fix)
            
            

            

                end
          
        63. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      63. 
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      64. 
            
            

            

            
          
        65. 
        
        
      
        
        
          
      65. 
            1
            

            

                context 'when associations' do
          
        66. 
        
        
      
        
        
          
      66. 
            2
            

            

                  it { is_expected.to have_many(:authors_books).dependent(:destroy) }
          
        67. 
        
        
      
        
        
          
      67. 
            2
            

            

                  it { is_expected.to have_many(:books).through(:authors_books) }
          
        68. 
        
        
      
        
        
          
      68. 
            
            

            

                end
          
        69. 
        
        
      
        
        
          
      69. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      70. 
>>>>>>> 5b7749a (Fix)
            
            

            

              end
          
        71. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      71. 
=======
          
      72. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      73. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
      74. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
          
      75. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      76. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      77. 
>>>>>>> 08edf50 (Featire specs)
=======
          
      78. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      79. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      80. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      81. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      82. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      83. 
>>>>>>> 5b7749a (Fix)
            
            

            

=======
>>>>>>> c7a726c5 (Rebased)
            end
          
        84. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/models/authors_book_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      8 relevant lines.
      8 lines covered and
=======
      9 relevant lines.
      9 lines covered and
>>>>>>> d0dc1f1 (Featire specs)
=======
      9 relevant lines.
      9 lines covered and
>>>>>>> 752f0c0 (Featire specs)
=======
      9 relevant lines.
      9 lines covered and
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
      9 relevant lines.
      9 lines covered and
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
      9 relevant lines.
      9 lines covered and
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
      9 relevant lines.
      9 lines covered and
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
      9 relevant lines.
      9 lines covered and
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
      9 relevant lines.
      9 lines covered and
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
      9 relevant lines.
      9 lines covered and
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
      8 relevant lines.
      8 lines covered and
>>>>>>> 5b7749a (Fix)
=======
      8 relevant lines.
      8 lines covered and
>>>>>>> c7a726c5 (Rebased)
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
            require 'rails_helper'
          
        2. 
        
        
      
        
        
          
      2. 
            
            

            

            
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
=======
>>>>>>> c7a726c5 (Rebased)
            RSpec.describe AuthorsBook, type: :model do
          
        4. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      4. 
=======
          
      5. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      6. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
      7. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
          
      8. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      9. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      10. 
>>>>>>> 08edf50 (Featire specs)
=======
          
      11. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      12. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      13. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      14. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      15. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      16. 
>>>>>>> 5b7749a (Fix)
=======
          
      17. 
>>>>>>> c7a726c5 (Rebased)
            1
            

            

              describe 'authors_book' do
          
        18. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      18. 
=======
          
      19. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      20. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
      21. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
          
      22. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      23. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      24. 
>>>>>>> 08edf50 (Featire specs)
=======
          
      25. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      26. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      27. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      28. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      29. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      30. 
>>>>>>> 5b7749a (Fix)
=======
          
      31. 
>>>>>>> c7a726c5 (Rebased)
            1
            

            

                context 'when validations' do
          
        32. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
=======
>>>>>>> c7a726c5 (Rebased)
          
      32. 
            2
            

            

                  it { is_expected.to validate_presence_of(:book) }
          
        33. 
        
        
      
        
        
          
      33. 
            2
            

            

                  it { is_expected.to validate_presence_of(:author) }
          
        34. 
        
        
      
        
        
          
      34. 
            
            

            

                end
          
        35. 
        
        
      
        
        
          
      35. 
            
            

            

            
          
        36. 
        
        
      
        
        
          
      36. 
            1
            

            

                context 'when associations' do
          
        37. 
        
        
      
        
        
          
      37. 
            2
            

            

                  it { is_expected.to belong_to(:author) }
          
        38. 
        
        
      
        
        
          
      38. 
<<<<<<< HEAD
            2
            

            

                  it { is_expected.to belong_to(:book) }
          
        39. 
        
        
      
        
        
          
      39. 
            
            

            

                end
          
        40. 
        
        
      
        
        
          
      40. 
            
            

            

              end
          
        41. 
        
        
      
        
        
          
      41. 
            
            

            

            end
          
        42. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/models/billing_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      20 relevant lines.
      20 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            RSpec.describe Billing, type: :model do
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

              describe 'billing' do
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

                context 'when validations' do
          
        4. 
        
        
      
        
        
          
      4. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::Name.first_name).for(:first_name) }
          
        5. 
        
        
      
        
        
          
      5. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::Name.first_name).for(:last_name) }
          
        6. 
        
        
      
        
        
<<<<<<< HEAD
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
          
      6. 
            2
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
                  it { is_expected.to allow_values('+919367788755', '8989829304', '+16308520397', '786-307-3615').for(:phone) }
=======
                  it { is_expected.to validate_presence_of(:book) }
>>>>>>> d0dc1f1 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:book) }
>>>>>>> 752f0c0 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:book) }
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
                  it { is_expected.to validate_presence_of(:book) }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                  it { is_expected.to validate_presence_of(:book) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
                  it { is_expected.to validate_presence_of(:book) }
>>>>>>> 08edf50 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:book) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to validate_presence_of(:book) }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                  it { is_expected.to validate_presence_of(:book) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
                  it { is_expected.to validate_presence_of(:book) }
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
                  it { is_expected.to validate_presence_of(:book) }
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to allow_values('+919367788755', '8989829304', '+16308520397', '786-307-3615').for(:phone) }
>>>>>>> 5b7749a (Fix)
          
        7. 
        
        
      
        
        
          
      7. 
            2
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
                  it { is_expected.to allow_values(FFaker::AddressUK.country).for(:country) }
=======
                  it { is_expected.to validate_presence_of(:author) }
>>>>>>> d0dc1f1 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:author) }
>>>>>>> 752f0c0 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:author) }
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
                  it { is_expected.to validate_presence_of(:author) }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                  it { is_expected.to validate_presence_of(:author) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
                  it { is_expected.to validate_presence_of(:author) }
>>>>>>> 08edf50 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:author) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to validate_presence_of(:author) }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                  it { is_expected.to validate_presence_of(:author) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
                  it { is_expected.to validate_presence_of(:author) }
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
                  it { is_expected.to validate_presence_of(:author) }
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to allow_values(FFaker::AddressUK.country).for(:country) }
>>>>>>> 5b7749a (Fix)
          
        8. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
          
      8. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::AddressUK.city).for(:city) }
          
        9. 
        
        
      
        
        
          
      9. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::AddressUA.zip_code).for(:zip) }
          
        10. 
        
        
      
        
        
          
      10. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::Address.street_address).for(:address) }
          
        11. 
        
        
      
        
        
          
      11. 
<<<<<<< HEAD
=======
          
      12. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      13. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
      14. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
          
      15. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      16. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      17. 
>>>>>>> 08edf50 (Featire specs)
=======
          
      18. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      19. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      20. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      21. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      22. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
            
            

            

                end
          
        23. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      23. 
=======
          
      24. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      25. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
      26. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
          
      27. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      28. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      29. 
>>>>>>> 08edf50 (Featire specs)
=======
          
      30. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      31. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      32. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      33. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      34. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      35. 
>>>>>>> 5b7749a (Fix)
            
            

            

            
          
        36. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
          
      36. 
            1
            

            

                context 'when not validations' do
          
        37. 
        
        
      
        
        
          
      37. 
            2
            

            

                  it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:first_name) }
          
        38. 
        
        
      
        
        
          
      38. 
            2
            

            

                  it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:last_name) }
          
        39. 
        
        
      
        
        
          
      39. 
            2
            

            

                  it { is_expected.not_to allow_values('789', '123765', '1-1-1', '+982').for(:phone) }
          
        40. 
        
        
      
        
        
          
      40. 
            2
            

            

                  it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:country) }
          
        41. 
        
        
      
        
        
          
      41. 
            2
            

            

                  it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:city) }
          
        42. 
        
        
      
        
        
          
      42. 
            2
            

            

                  it { is_expected.not_to allow_values('1' * Constants::VALIDATES_ZIP_LENGTH_MAX.next).for(:zip) }
          
        43. 
        
        
      
        
        
          
      43. 
            2
            

            

                  it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:address) }
          
        44. 
        
        
      
        
        
          
      44. 
            
            

            

                end
          
        45. 
        
        
      
        
        
          
      45. 
            
            

            

            
          
        46. 
        
        
      
        
        
          
      46. 
<<<<<<< HEAD
=======
          
      47. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      48. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
      49. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
          
      50. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      51. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      52. 
>>>>>>> 08edf50 (Featire specs)
=======
          
      53. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      54. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      55. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      56. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      57. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
            1
            

            

                context 'when associations' do
          
        58. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      58. 
=======
          
      59. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      60. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
      61. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
          
      62. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      63. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      64. 
>>>>>>> 08edf50 (Featire specs)
=======
          
      65. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      66. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      67. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      68. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      69. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      70. 
>>>>>>> 5b7749a (Fix)
            2
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
                  it { is_expected.to belong_to(:user) }
=======
                  it { is_expected.to belong_to(:author) }
>>>>>>> d0dc1f1 (Featire specs)
=======
                  it { is_expected.to belong_to(:author) }
>>>>>>> 752f0c0 (Featire specs)
=======
                  it { is_expected.to belong_to(:author) }
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
                  it { is_expected.to belong_to(:author) }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                  it { is_expected.to belong_to(:author) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
                  it { is_expected.to belong_to(:author) }
>>>>>>> 08edf50 (Featire specs)
=======
                  it { is_expected.to belong_to(:author) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to belong_to(:author) }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                  it { is_expected.to belong_to(:author) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
                  it { is_expected.to belong_to(:author) }
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
                  it { is_expected.to belong_to(:author) }
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to belong_to(:user) }
>>>>>>> 5b7749a (Fix)
          
        71. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      71. 
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      72. 
=======
>>>>>>> c7a726c5 (Rebased)
            2
            

            

                  it { is_expected.to belong_to(:book) }
          
        73. 
        
        
      
        
        
<<<<<<< HEAD
          
      73. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      74. 
>>>>>>> 5b7749a (Fix)
=======
          
      75. 
>>>>>>> c7a726c5 (Rebased)
            
            

            

                end
          
        76. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      76. 
=======
          
      77. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      78. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
      79. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
          
      80. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      81. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      82. 
>>>>>>> 08edf50 (Featire specs)
=======
          
      83. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      84. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      85. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      86. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      87. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      88. 
>>>>>>> 5b7749a (Fix)
=======
          
      89. 
>>>>>>> c7a726c5 (Rebased)
            
            

            

              end
          
        90. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      90. 
=======
          
      91. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      92. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
      93. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
          
      94. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      95. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      96. 
>>>>>>> 08edf50 (Featire specs)
=======
          
      97. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      98. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      99. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      100. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      101. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      102. 
>>>>>>> 5b7749a (Fix)
=======
          
      103. 
            
            

            

            end
          
        104. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/models/billing_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      20 relevant lines.
      20 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            RSpec.describe Billing, type: :model do
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

              describe 'billing' do
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

                context 'when validations' do
          
        4. 
        
        
      
        
        
          
      4. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::Name.first_name).for(:first_name) }
          
        5. 
        
        
      
        
        
          
      5. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::Name.first_name).for(:last_name) }
          
        6. 
        
        
      
        
        
          
      6. 
            2
            

            

                  it { is_expected.to allow_values('+919367788755', '8989829304', '+16308520397', '786-307-3615').for(:phone) }
          
        7. 
        
        
      
        
        
          
      7. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::AddressUK.country).for(:country) }
          
        8. 
        
        
      
        
        
          
      8. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::AddressUK.city).for(:city) }
          
        9. 
        
        
      
        
        
          
      9. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::AddressUA.zip_code).for(:zip) }
          
        10. 
        
        
      
        
        
          
      10. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::Address.street_address).for(:address) }
          
        11. 
        
        
      
        
        
          
      11. 
            
            

            

                end
          
        12. 
        
        
      
        
        
          
      12. 
            
            

            

            
          
        13. 
        
        
      
        
        
          
      13. 
            1
            

            

                context 'when not validations' do
          
        14. 
        
        
      
        
        
          
      14. 
            2
            

            

                  it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:first_name) }
          
        15. 
        
        
      
        
        
          
      15. 
            2
            

            

                  it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:last_name) }
          
        16. 
        
        
      
        
        
          
      16. 
            2
            

            

                  it { is_expected.not_to allow_values('789', '123765', '1-1-1', '+982').for(:phone) }
          
        17. 
        
        
      
        
        
          
      17. 
            2
            

            

                  it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:country) }
          
        18. 
        
        
      
        
        
          
      18. 
            2
            

            

                  it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:city) }
          
        19. 
        
        
      
        
        
          
      19. 
            2
            

            

                  it { is_expected.not_to allow_values('1' * Constants::VALIDATES_ZIP_LENGTH_MAX.next).for(:zip) }
          
        20. 
        
        
      
        
        
          
      20. 
            2
            

            

                  it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:address) }
          
        21. 
        
        
      
        
        
          
      21. 
            
            

            

                end
          
        22. 
        
        
      
        
        
          
      22. 
            
            

            

            
          
        23. 
        
        
      
        
        
          
      23. 
            1
            

            

                context 'when associations' do
          
        24. 
        
        
      
        
        
          
      24. 
            2
            

            

                  it { is_expected.to belong_to(:user) }
          
        25. 
        
        
      
        
        
          
      25. 
            
            

            

                end
          
        26. 
        
        
      
        
        
          
      26. 
            
            

            

              end
          
        27. 
        
        
      
        
        
          
      27. 
>>>>>>> c7a726c5 (Rebased)
            
            

            

            end
          
        28. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/models/book_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      16 relevant lines.
      16 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
            RSpec.describe Book, type: :model do
=======
            require 'rails_helper'
>>>>>>> d0dc1f1 (Featire specs)
=======
            require 'rails_helper'
>>>>>>> 752f0c0 (Featire specs)
=======
            require 'rails_helper'
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
            require 'rails_helper'
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
            require 'rails_helper'
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
            require 'rails_helper'
>>>>>>> 08edf50 (Featire specs)
=======
            require 'rails_helper'
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
            require 'rails_helper'
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
            require 'rails_helper'
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
            require 'rails_helper'
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
            require 'rails_helper'
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
            RSpec.describe Book, type: :model do
>>>>>>> 5b7749a (Fix)
          
        2. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      2. 
            1
=======
          
      3. 
            
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      4. 
            
>>>>>>> 752f0c0 (Featire specs)
=======
          
      5. 
            
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      6. 
            
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      7. 
            
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      8. 
            
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      9. 
            
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      10. 
            
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      11. 
            
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      12. 
            1
>>>>>>> 5b7749a (Fix)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
              describe 'books' do
=======
            
>>>>>>> d0dc1f1 (Featire specs)
=======
            
>>>>>>> 752f0c0 (Featire specs)
=======
            
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
            
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
            
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
            
>>>>>>> 08edf50 (Featire specs)
=======
            
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
            
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
            
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
            
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
            
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
              describe 'books' do
>>>>>>> 5b7749a (Fix)
          
        13. 
        
        
      
        
        
          
      13. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> c7a726c5 (Rebased)
            RSpec.describe Book, type: :model do
          
        14. 
        
        
      
        
        
          
      14. 
            1
            

            

              describe 'books' do
          
        15. 
        
        
      
        
        
          
      15. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
                context 'when validations' do
          
        16. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
=======
>>>>>>> c7a726c5 (Rebased)
          
      16. 
            2
            

            

                  it { is_expected.to validate_presence_of(:title) }
          
        17. 
        
        
      
        
        
          
      17. 
            2
            

            

                  it { is_expected.to validate_presence_of(:description) }
          
        18. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
          
      18. 
            2
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
                  it { is_expected.to allow_values(Constants::MIN_PRICE_IN_CENTS, Constants::MAX_PRICE_IN_CENTS).for(:price_cents) }
=======
                  it { is_expected.to validate_presence_of(:title) }
>>>>>>> d0dc1f1 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:title) }
>>>>>>> 752f0c0 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:title) }
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
                  it { is_expected.to validate_presence_of(:title) }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                  it { is_expected.to validate_presence_of(:title) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
                  it { is_expected.to validate_presence_of(:title) }
>>>>>>> 08edf50 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:title) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to validate_presence_of(:title) }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                  it { is_expected.to validate_presence_of(:title) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
                  it { is_expected.to validate_presence_of(:title) }
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
                  it { is_expected.to validate_presence_of(:title) }
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to allow_values(Constants::MIN_PRICE_IN_CENTS, Constants::MAX_PRICE_IN_CENTS).for(:price_cents) }
>>>>>>> 5b7749a (Fix)
          
        19. 
        
        
      
        
        
          
      19. 
            2
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
                  it { is_expected.to validate_presence_of(:year_of_publication) }
=======
                  it { is_expected.to validate_presence_of(:description) }
>>>>>>> d0dc1f1 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:description) }
>>>>>>> 752f0c0 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:description) }
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
                  it { is_expected.to validate_presence_of(:description) }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                  it { is_expected.to validate_presence_of(:description) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
                  it { is_expected.to validate_presence_of(:description) }
>>>>>>> 08edf50 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:description) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to validate_presence_of(:description) }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                  it { is_expected.to validate_presence_of(:description) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
                  it { is_expected.to validate_presence_of(:description) }
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
                  it { is_expected.to validate_presence_of(:description) }
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to validate_presence_of(:year_of_publication) }
>>>>>>> 5b7749a (Fix)
          
        20. 
        
        
      
        
        
          
      20. 
=======
          
      21. 
>>>>>>> c7a726c5 (Rebased)
            2
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
                  it { is_expected.to validate_presence_of(:quantity) }
=======
                  it { is_expected.to validate_presence_of(:price) }
>>>>>>> d0dc1f1 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:price) }
>>>>>>> 752f0c0 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:price) }
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
                  it { is_expected.to validate_presence_of(:price) }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                  it { is_expected.to validate_presence_of(:price) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
                  it { is_expected.to validate_presence_of(:price) }
>>>>>>> 08edf50 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:price) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to validate_presence_of(:price) }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                  it { is_expected.to validate_presence_of(:price) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
                  it { is_expected.to validate_presence_of(:price) }
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
                  it { is_expected.to validate_presence_of(:price) }
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to validate_presence_of(:quantity) }
>>>>>>> 5b7749a (Fix)
=======
                  it { is_expected.to allow_values(Constants::MIN_PRICE_IN_CENTS, Constants::MAX_PRICE_IN_CENTS).for(:price_cents) }
>>>>>>> c7a726c5 (Rebased)
          
        22. 
        
        
      
        
        
          
      22. 
            2
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
                  it { is_expected.to validate_presence_of(:materials) }
=======
                  it { is_expected.to validate_presence_of(:year_of_publication) }
>>>>>>> d0dc1f1 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:year_of_publication) }
>>>>>>> 752f0c0 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:year_of_publication) }
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
                  it { is_expected.to validate_presence_of(:year_of_publication) }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                  it { is_expected.to validate_presence_of(:year_of_publication) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
                  it { is_expected.to validate_presence_of(:year_of_publication) }
>>>>>>> 08edf50 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:year_of_publication) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to validate_presence_of(:year_of_publication) }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                  it { is_expected.to validate_presence_of(:year_of_publication) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
                  it { is_expected.to validate_presence_of(:year_of_publication) }
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
                  it { is_expected.to validate_presence_of(:year_of_publication) }
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to validate_presence_of(:materials) }
>>>>>>> 5b7749a (Fix)
          
        23. 
        
        
      
        
        
          
      23. 
            2
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
                  it { is_expected.to validate_presence_of(:quantity) }
          
        24. 
        
        
      
        
        
          
      24. 
            2
            

            

                  it { is_expected.to validate_presence_of(:materials) }
          
        25. 
        
        
      
        
        
          
      25. 
            2
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
                  it { is_expected.to validate_presence_of(:dimensions) }
          
        26. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      26. 
=======
          
      27. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      28. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
      29. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
          
      30. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      31. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      32. 
>>>>>>> 08edf50 (Featire specs)
=======
          
      33. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      34. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      35. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      36. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      37. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      38. 
>>>>>>> 5b7749a (Fix)
=======
          
      39. 
>>>>>>> c7a726c5 (Rebased)
            
            

            

                end
          
        40. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      40. 
=======
          
      41. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      42. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
      43. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
          
      44. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      45. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      46. 
>>>>>>> 08edf50 (Featire specs)
=======
          
      47. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      48. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      49. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      50. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      51. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      52. 
>>>>>>> 5b7749a (Fix)
=======
          
      53. 
>>>>>>> c7a726c5 (Rebased)
            
            

            

            
          
        54. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      54. 
=======
          
      55. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      56. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
      57. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
          
      58. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      59. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      60. 
>>>>>>> 08edf50 (Featire specs)
=======
          
      61. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      62. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      63. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      64. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      65. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      66. 
>>>>>>> 5b7749a (Fix)
=======
          
      67. 
>>>>>>> c7a726c5 (Rebased)
            1
            

            

                context 'when associations' do
          
        68. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      68. 
=======
          
      69. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      70. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
      71. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
          
      72. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      73. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      74. 
>>>>>>> 08edf50 (Featire specs)
=======
          
      75. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      76. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      77. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      78. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      79. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      80. 
>>>>>>> 5b7749a (Fix)
=======
          
      81. 
>>>>>>> c7a726c5 (Rebased)
            2
            

            

                  it { is_expected.to have_many(:authors_books).dependent(:destroy) }
          
        82. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      82. 
=======
          
      83. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      84. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
      85. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
          
      86. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      87. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      88. 
>>>>>>> 08edf50 (Featire specs)
=======
          
      89. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      90. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      91. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      92. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      93. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      94. 
>>>>>>> 5b7749a (Fix)
=======
          
      95. 
>>>>>>> c7a726c5 (Rebased)
            2
            

            

                  it { is_expected.to have_many(:authors).through(:authors_books) }
          
        96. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      96. 
=======
          
      97. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      98. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
      99. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
          
      100. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      101. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      102. 
>>>>>>> 08edf50 (Featire specs)
=======
          
      103. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      104. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      105. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      106. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      107. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      108. 
>>>>>>> 5b7749a (Fix)
=======
          
      109. 
>>>>>>> c7a726c5 (Rebased)
            
            

            

            
          
        110. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      110. 
=======
          
      111. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      112. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
      113. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
          
      114. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      115. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      116. 
>>>>>>> 08edf50 (Featire specs)
=======
          
      117. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      118. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      119. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      120. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      121. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      122. 
>>>>>>> 5b7749a (Fix)
=======
          
      123. 
>>>>>>> c7a726c5 (Rebased)
            2
            

            

                  it { is_expected.to have_many(:books_categories).dependent(:destroy) }
          
        124. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
=======
>>>>>>> c7a726c5 (Rebased)
          
      124. 
            2
            

            

                  it { is_expected.to have_many(:categories).through(:books_categories) }
          
        125. 
        
        
      
        
        
          
      125. 
            
            

            

            
          
        126. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
=======
>>>>>>> c7a726c5 (Rebased)
          
      126. 
            2
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
                  it { is_expected.to have_many(:reviews).dependent(:destroy) }
=======
                  it { is_expected.to have_many(:categories).through(:books_categories) }
>>>>>>> d0dc1f1 (Featire specs)
=======
                  it { is_expected.to have_many(:categories).through(:books_categories) }
>>>>>>> 752f0c0 (Featire specs)
=======
                  it { is_expected.to have_many(:categories).through(:books_categories) }
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
                  it { is_expected.to have_many(:categories).through(:books_categories) }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                  it { is_expected.to have_many(:categories).through(:books_categories) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
                  it { is_expected.to have_many(:categories).through(:books_categories) }
>>>>>>> 08edf50 (Featire specs)
=======
                  it { is_expected.to have_many(:categories).through(:books_categories) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to have_many(:categories).through(:books_categories) }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                  it { is_expected.to have_many(:categories).through(:books_categories) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
                  it { is_expected.to have_many(:categories).through(:books_categories) }
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
                  it { is_expected.to have_many(:categories).through(:books_categories) }
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to have_many(:reviews).dependent(:destroy) }
>>>>>>> 5b7749a (Fix)
=======
                  it { is_expected.to have_many(:reviews).dependent(:destroy) }
>>>>>>> c7a726c5 (Rebased)
          
        127. 
        
        
      
        
        
          
      127. 
            
            

            

                end
          
        128. 
        
        
      
        
        
          
      128. 
            
            

            

              end
          
        129. 
        
        
      
        
        
          
      129. 
            
            

            

            end
          
        130. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/models/books_category_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
=======
>>>>>>> c7a726c5 (Rebased)
      8 relevant lines.
      8 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            RSpec.describe BooksCategory, type: :model do
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

              describe 'books_categories' do
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

                context 'when validations' do
          
        4. 
        
        
      
        
        
          
      4. 
            2
            

            

                  it { is_expected.to validate_presence_of(:book) }
          
        5. 
        
        
      
        
        
          
      5. 
            2
            

            

                  it { is_expected.to validate_presence_of(:category) }
          
        6. 
        
        
      
        
        
          
      6. 
            
            

            

                end
          
        7. 
        
        
      
        
        
          
      7. 
            
            

            

            
          
        8. 
        
        
      
        
        
          
      8. 
            1
            

            

                context 'when associations' do
          
        9. 
        
        
      
        
        
          
      9. 
            2
            

            

                  it { is_expected.to belong_to(:category) }
          
        10. 
        
        
      
        
        
          
      10. 
            2
            

            

                  it { is_expected.to belong_to(:book) }
          
        11. 
        
        
      
        
        
          
      11. 
            
            

            

                end
          
        12. 
        
        
      
        
        
          
      12. 
            
            

            

              end
          
        13. 
        
        
      
        
        
          
      13. 
            
            

            

            end
          
        14. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/models/category_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      7 relevant lines.
      7 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            RSpec.describe Category, type: :model do
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

              describe 'category' do
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

                context 'when validations' do
          
        4. 
        
        
      
        
        
          
      4. 
            2
            

            

                  it { is_expected.to validate_presence_of(:name) }
          
        5. 
        
        
      
        
        
          
      5. 
            
            

            

                end
          
        6. 
        
        
      
        
        
          
      6. 
            
            

            

            
          
        7. 
        
        
      
        
        
          
      7. 
            1
            

            

                context 'when associations' do
          
        8. 
        
        
      
        
        
          
      8. 
            2
            

            

                  it { is_expected.to have_many(:books_categories).dependent(:destroy) }
          
        9. 
        
        
      
        
        
          
      9. 
            2
            

            

                  it { is_expected.to have_many(:books).through(:books_categories) }
          
        10. 
        
        
      
        
        
          
      10. 
            
            

            

                end
          
        11. 
        
        
      
        
        
          
      11. 
            
            

            

              end
          
        12. 
        
        
      
        
        
          
      12. 
            
            

            

            end
          
        13. 
        
        
      
    
      
  
      

      

      
<<<<<<< HEAD
        
      
  
      
    
      spec/models/order_spec.rb
      
=======
        
      
  
      
    
      spec/models/review_spec.rb
      
>>>>>>> c7a726c5 (Rebased)
    
      
      
  100.0%


      lines covered
    
      

    

    
      
<<<<<<< HEAD
<<<<<<< HEAD
      14 relevant lines.
      14 lines covered and
=======
      9 relevant lines.
      9 lines covered and
>>>>>>> d0dc1f1 (Featire specs)
=======
      9 relevant lines.
      9 lines covered and
>>>>>>> 752f0c0 (Featire specs)
=======
      9 relevant lines.
      9 lines covered and
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
      9 relevant lines.
      9 lines covered and
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
      9 relevant lines.
      9 lines covered and
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
      9 relevant lines.
      9 lines covered and
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
      9 relevant lines.
      9 lines covered and
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
      9 relevant lines.
      9 lines covered and
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
      9 relevant lines.
      9 lines covered and
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
      6 relevant lines.
      6 lines covered and
>>>>>>> 5b7749a (Fix)
=======
      14 relevant lines.
      14 lines covered and
>>>>>>> c7a726c5 (Rebased)
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            require 'rails_helper'
          
        2. 
        
        
      
        
        
          
      2. 
            
            

            

            
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
            RSpec.describe Review, type: :model do
=======
            RSpec.describe BooksCategory, type: :model do
>>>>>>> d0dc1f1 (Featire specs)
=======
            RSpec.describe BooksCategory, type: :model do
>>>>>>> 752f0c0 (Featire specs)
=======
            RSpec.describe BooksCategory, type: :model do
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
            RSpec.describe BooksCategory, type: :model do
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
            RSpec.describe BooksCategory, type: :model do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
            RSpec.describe BooksCategory, type: :model do
>>>>>>> 08edf50 (Featire specs)
=======
            RSpec.describe BooksCategory, type: :model do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
            RSpec.describe BooksCategory, type: :model do
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
            RSpec.describe BooksCategory, type: :model do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
            RSpec.describe BooksCategory, type: :model do
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
            RSpec.describe BooksCategory, type: :model do
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
            RSpec.describe Order, type: :model do
=======
            RSpec.describe Review, type: :model do
>>>>>>> c7a726c5 (Rebased)
          
        4. 
        
        
      
        
        
          
      4. 
            1
            

            

<<<<<<< HEAD
              describe 'order' do
=======
              describe 'review' do
>>>>>>> c7a726c5 (Rebased)
          
        5. 
        
        
      
        
        
          
      5. 
            1
            

            

                context 'when associations' do
          
        6. 
        
        
      
        
        
          
      6. 
            2
            

            

<<<<<<< HEAD
                  it { is_expected.to have_many(:order_books).dependent(:destroy) }
=======
                  it { is_expected.to validate_presence_of(:title) }
>>>>>>> c7a726c5 (Rebased)
          
        7. 
        
        
      
        
        
          
      7. 
            2
            

            

<<<<<<< HEAD
                  it { is_expected.to have_many(:books).through(:order_books) }
=======
                  it { is_expected.to validate_presence_of(:body) }
          
        8. 
        
        
      
        
        
          
      8. 
            2
            

            

                  it { is_expected.to validate_presence_of(:rating) }
          
        9. 
        
        
      
        
        
          
      9. 
            2
            

            

                  it { is_expected.to validate_presence_of(:verified) }
          
        10. 
        
        
      
        
        
          
      10. 
            2
            

            

                  it { is_expected.to allow_values('a' * Constants::VALIDATES_TITLE_LENGTH_MAX).for(:title) }
          
        11. 
        
        
      
        
        
          
      11. 
            2
            

            

                  it { is_expected.to allow_values('a' * Constants::VALIDATES_TEXT_LENGTH_MAX).for(:body) }
          
        12. 
        
        
      
        
        
          
      12. 
            2
            

            

                  it { is_expected.to allow_values(1, 2, 3, 4, 5).for(:rating) }
          
        13. 
        
        
      
        
        
          
      13. 
            
            

            

                end
          
        14. 
        
        
      
        
        
          
      14. 
            
            

            

            
          
        15. 
        
        
      
        
        
          
      15. 
            1
            

            

                context 'when associations' do
          
        16. 
        
        
      
        
        
          
      16. 
            2
            

            

                  it { is_expected.to belong_to(:book) }
          
        17. 
        
        
      
        
        
          
      17. 
            2
            

            

                  it { is_expected.to belong_to(:user) }
          
        18. 
        
        
      
        
        
          
      18. 
            
            

            

                end
          
        19. 
        
        
      
        
        
          
      19. 
            
            

            

              end
          
        20. 
        
        
      
        
        
          
      20. 
            
            

            

            end
          
        21. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/models/shipping_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      20 relevant lines.
      20 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            RSpec.describe Shipping, type: :model do
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

              describe 'shipping' do
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

                context 'when validations' do
          
        4. 
        
        
      
        
        
          
      4. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::Name.first_name).for(:first_name) }
          
        5. 
        
        
      
        
        
          
      5. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::Name.first_name).for(:last_name) }
          
        6. 
        
        
      
        
        
          
      6. 
            2
            

            

                  it { is_expected.to allow_values('+919367788755', '8989829304', '+16308520397', '786-307-3615').for(:phone) }
          
        7. 
        
        
      
        
        
          
      7. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::AddressUK.country).for(:country) }
          
        8. 
        
        
      
        
        
          
      8. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::AddressUK.city).for(:city) }
          
        9. 
        
        
      
        
        
          
      9. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::AddressUA.zip_code).for(:zip) }
          
        10. 
        
        
      
        
        
          
      10. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::Address.street_address).for(:address) }
          
        11. 
        
        
      
        
        
          
      11. 
            
            

            

                end
          
        12. 
        
        
      
        
        
          
      12. 
            
            

            

            
          
        13. 
        
        
      
        
        
          
      13. 
            1
            

            

                context 'when not validations' do
          
        14. 
        
        
      
        
        
          
      14. 
            2
            

            

                  it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:first_name) }
          
        15. 
        
        
      
        
        
          
      15. 
            2
            

            

                  it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:last_name) }
          
        16. 
        
        
      
        
        
          
      16. 
            2
            

            

                  it { is_expected.not_to allow_values('789', '123765', '1-1-1', '+982').for(:phone) }
          
        17. 
        
        
      
        
        
          
      17. 
            2
            

            

                  it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:country) }
          
        18. 
        
        
      
        
        
          
      18. 
            2
            

            

                  it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:city) }
          
        19. 
        
        
      
        
        
          
      19. 
            2
            

            

                  it { is_expected.not_to allow_values('1' * Constants::VALIDATES_ZIP_LENGTH_MAX.next).for(:zip) }
          
        20. 
        
        
      
        
        
          
      20. 
            2
            

            

                  it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:address) }
          
        21. 
        
        
      
        
        
          
      21. 
            
            

            

                end
          
        22. 
        
        
      
        
        
          
      22. 
            
            

            

            
          
        23. 
        
        
      
        
        
          
      23. 
            1
            

            

                context 'when associations' do
          
        24. 
        
        
      
        
        
          
      24. 
            2
            

            

                  it { is_expected.to belong_to(:user) }
          
        25. 
        
        
      
        
        
          
      25. 
            
            

            

                end
          
        26. 
        
        
      
        
        
          
      26. 
            
            

            

              end
          
        27. 
        
        
      
        
        
          
      27. 
            
            

            

            end
          
        28. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/models/user_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      9 relevant lines.
      9 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            RSpec.describe User, type: :model do
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

              let(:user) { FactoryBot.create(:user) }
          
        3. 
        
        
      
        
        
          
      3. 
            
            

            

            
          
        4. 
        
        
      
        
        
          
      4. 
            1
            

            

              describe 'author' do
          
        5. 
        
        
      
        
        
          
      5. 
            1
            

            

                context 'when validations' do
          
        6. 
        
        
      
        
        
          
      6. 
            2
            

            

                  it { is_expected.to validate_presence_of(:email) }
          
        7. 
        
        
      
        
        
          
      7. 
            2
            

            

                  it { is_expected.to validate_presence_of(:password) }
>>>>>>> c7a726c5 (Rebased)
          
        8. 
        
        
      
        
        
          
      8. 
            
            

            

                end
          
        9. 
        
        
      
        
        
          
      9. 
            
            

            

              end
          
        10. 
        
        
      
        
        
          
      10. 
            
            

            

            end
          
        11. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/models/review_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      14 relevant lines.
      14 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            require 'rails_helper'
          
        2. 
        
        
      
        
        
          
      2. 
            
            

            

            
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

            RSpec.describe Review, type: :model do
>>>>>>> 5b7749a (Fix)
          
        4. 
        
        
      
        
        
          
      4. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
              describe 'review' do
=======
              describe 'books_categories' do
>>>>>>> d0dc1f1 (Featire specs)
=======
              describe 'books_categories' do
>>>>>>> 752f0c0 (Featire specs)
=======
              describe 'books_categories' do
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
              describe 'books_categories' do
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
              describe 'books_categories' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
              describe 'books_categories' do
>>>>>>> 08edf50 (Featire specs)
=======
              describe 'books_categories' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
              describe 'books_categories' do
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
              describe 'books_categories' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
              describe 'books_categories' do
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
              describe 'books_categories' do
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
              describe 'review' do
>>>>>>> 5b7749a (Fix)
          
        5. 
        
        
      
        
        
          
      5. 
            1
            

            

                context 'when validations' do
          
        6. 
        
        
      
        
        
          
      6. 
            2
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
                  it { is_expected.to validate_presence_of(:title) }
=======
                  it { is_expected.to validate_presence_of(:book) }
>>>>>>> d0dc1f1 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:book) }
>>>>>>> 752f0c0 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:book) }
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
                  it { is_expected.to validate_presence_of(:book) }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                  it { is_expected.to validate_presence_of(:book) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
                  it { is_expected.to validate_presence_of(:book) }
>>>>>>> 08edf50 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:book) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to validate_presence_of(:book) }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                  it { is_expected.to validate_presence_of(:book) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
                  it { is_expected.to validate_presence_of(:book) }
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
                  it { is_expected.to validate_presence_of(:book) }
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to validate_presence_of(:title) }
>>>>>>> 5b7749a (Fix)
          
        7. 
        
        
      
        
        
          
      7. 
            2
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
                  it { is_expected.to validate_presence_of(:body) }
          
        8. 
        
        
      
        
        
          
      8. 
            2
            

            

                  it { is_expected.to validate_presence_of(:rating) }
          
        9. 
        
        
      
        
        
          
      9. 
            2
            

            

                  it { is_expected.to validate_presence_of(:verified) }
          
        10. 
        
        
      
        
        
          
      10. 
            2
            

            

                  it { is_expected.to allow_values('a' * Constants::VALIDATES_TITLE_LENGTH_MAX).for(:title) }
          
        11. 
        
        
      
        
        
          
      11. 
            2
            

            

                  it { is_expected.to allow_values('a' * Constants::VALIDATES_TEXT_LENGTH_MAX).for(:body) }
          
        12. 
        
        
      
        
        
          
      12. 
            2
            

            

                  it { is_expected.to allow_values(1, 2, 3, 4, 5).for(:rating) }
          
        13. 
        
        
      
        
        
          
      13. 
            
            

            

                end
          
        14. 
        
        
      
        
        
          
      14. 
            
            

            

            
          
        15. 
        
        
      
        
        
          
      15. 
            1
            

            

                context 'when associations' do
          
        16. 
        
        
      
        
        
          
      16. 
            2
            

            

                  it { is_expected.to belong_to(:book) }
          
        17. 
        
        
      
        
        
          
      17. 
            2
            

            

                  it { is_expected.to belong_to(:user) }
          
        18. 
        
        
      
        
        
          
      18. 
            
            

            

                end
          
        19. 
        
        
      
        
        
          
      19. 
            
            

            

              end
          
        20. 
        
        
      
        
        
          
      20. 
            
            

            

            end
          
        21. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/models/shipping_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      20 relevant lines.
      20 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            RSpec.describe Shipping, type: :model do
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

              describe 'shipping' do
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

                context 'when validations' do
          
        4. 
        
        
      
        
        
          
      4. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::Name.first_name).for(:first_name) }
          
        5. 
        
        
      
        
        
          
      5. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::Name.first_name).for(:last_name) }
          
        6. 
        
        
      
        
        
          
      6. 
            2
            

            

                  it { is_expected.to allow_values('+919367788755', '8989829304', '+16308520397', '786-307-3615').for(:phone) }
          
        7. 
        
        
      
        
        
          
      7. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::AddressUK.country).for(:country) }
          
        8. 
        
        
      
        
        
          
      8. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::AddressUK.city).for(:city) }
          
        9. 
        
        
      
        
        
          
      9. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::AddressUA.zip_code).for(:zip) }
          
        10. 
        
        
      
        
        
          
      10. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::Address.street_address).for(:address) }
          
        11. 
        
        
      
        
        
          
      11. 
            
            

            

                end
          
        12. 
        
        
      
        
        
          
      12. 
            
            

            

            
          
        13. 
        
        
      
        
        
          
      13. 
            1
            

            

                context 'when not validations' do
          
        14. 
        
        
      
        
        
          
      14. 
            2
            

            

                  it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:first_name) }
          
        15. 
        
        
      
        
        
          
      15. 
            2
            

            

                  it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:last_name) }
          
        16. 
        
        
      
        
        
          
      16. 
            2
            

            

                  it { is_expected.not_to allow_values('789', '123765', '1-1-1', '+982').for(:phone) }
          
        17. 
        
        
      
        
        
          
      17. 
            2
            

            

                  it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:country) }
          
        18. 
        
        
      
        
        
          
      18. 
            2
            

            

                  it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:city) }
          
        19. 
        
        
      
        
        
          
      19. 
            2
            

            

                  it { is_expected.not_to allow_values('1' * Constants::VALIDATES_ZIP_LENGTH_MAX.next).for(:zip) }
          
        20. 
        
        
      
        
        
          
      20. 
            2
            

            

                  it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:address) }
          
        21. 
        
        
      
        
        
          
      21. 
            
            

            

                end
          
        22. 
        
        
      
        
        
          
      22. 
            
            

            

            
          
        23. 
        
        
      
        
        
          
      23. 
            1
            

            

                context 'when associations' do
          
        24. 
        
        
      
        
        
          
      24. 
            2
            

            

                  it { is_expected.to belong_to(:user) }
          
        25. 
        
        
      
        
        
          
      25. 
            
            

            

                end
          
        26. 
        
        
      
        
        
          
      26. 
            
            

            

              end
          
        27. 
        
        
      
        
        
          
      27. 
            
            

            

            end
          
        28. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/models/user_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      8 relevant lines.
      8 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            RSpec.describe User, type: :model do
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

              describe 'author' do
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

                context 'when validations' do
          
        4. 
        
        
      
        
        
          
      4. 
            2
            

            

                  it { is_expected.to validate_presence_of(:email) }
          
        5. 
        
        
      
        
        
          
      5. 
            2
            

            

                  it { is_expected.to validate_presence_of(:password) }
<<<<<<< HEAD
=======
                  it { is_expected.to validate_presence_of(:category) }
>>>>>>> d0dc1f1 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:category) }
>>>>>>> 752f0c0 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:category) }
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
                  it { is_expected.to validate_presence_of(:category) }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                  it { is_expected.to validate_presence_of(:category) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
                  it { is_expected.to validate_presence_of(:category) }
>>>>>>> 08edf50 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:category) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to validate_presence_of(:category) }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                  it { is_expected.to validate_presence_of(:category) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
                  it { is_expected.to validate_presence_of(:category) }
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
                  it { is_expected.to validate_presence_of(:category) }
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
          
        6. 
        
        
      
        
        
          
      6. 
            
            

            

                end
          
        7. 
        
        
      
        
        
<<<<<<< HEAD
          
      7. 
            
            

            

            
          
        8. 
        
        
      
        
        
          
      8. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
                context 'with associations' do
=======
                context 'when associations' do
>>>>>>> d0dc1f1 (Featire specs)
=======
                context 'when associations' do
>>>>>>> 752f0c0 (Featire specs)
=======
                context 'when associations' do
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
                context 'when associations' do
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                context 'when associations' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
                context 'when associations' do
>>>>>>> 08edf50 (Featire specs)
=======
                context 'when associations' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                context 'when associations' do
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                context 'when associations' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
                context 'when associations' do
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
                context 'when associations' do
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
                context 'with associations' do
>>>>>>> c7a726c5 (Rebased)
          
        9. 
        
        
      
        
        
          
      9. 
            2
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
                  it { is_expected.to have_one(:billing) }
=======
                  it { is_expected.to belong_to(:category) }
>>>>>>> d0dc1f1 (Featire specs)
=======
                  it { is_expected.to belong_to(:category) }
>>>>>>> 752f0c0 (Featire specs)
=======
                  it { is_expected.to belong_to(:category) }
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
                  it { is_expected.to belong_to(:category) }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                  it { is_expected.to belong_to(:category) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
                  it { is_expected.to belong_to(:category) }
>>>>>>> 08edf50 (Featire specs)
=======
                  it { is_expected.to belong_to(:category) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to belong_to(:category) }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                  it { is_expected.to belong_to(:category) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
                  it { is_expected.to belong_to(:category) }
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
                  it { is_expected.to belong_to(:category) }
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to have_one(:billing) }
>>>>>>> c7a726c5 (Rebased)
          
        10. 
        
        
      
        
        
          
      10. 
            2
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
                  it { is_expected.to have_one(:shipping) }
=======
                  it { is_expected.to belong_to(:book) }
>>>>>>> d0dc1f1 (Featire specs)
=======
                  it { is_expected.to belong_to(:book) }
>>>>>>> 752f0c0 (Featire specs)
=======
                  it { is_expected.to belong_to(:book) }
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
                  it { is_expected.to belong_to(:book) }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                  it { is_expected.to belong_to(:book) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
                  it { is_expected.to belong_to(:book) }
>>>>>>> 08edf50 (Featire specs)
=======
                  it { is_expected.to belong_to(:book) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to belong_to(:book) }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                  it { is_expected.to belong_to(:book) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
                  it { is_expected.to belong_to(:book) }
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
                  it { is_expected.to belong_to(:book) }
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to have_one(:shipping) }
>>>>>>> c7a726c5 (Rebased)
          
        11. 
        
        
      
        
        
          
      11. 
            
            

            

                end
          
        12. 
        
        
      
        
        
          
      12. 
            
            

            

              end
          
        13. 
        
        
      
        
        
          
      13. 
            
            

            

            end
          
        14. 
        
        
      
    
      
  
      

      

      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
        
      
  
      
    
      spec/queryes/book_query_spec.rb
      
=======
        
      
  
      
    
      spec/models/category_spec.rb
      
>>>>>>> d0dc1f1 (Featire specs)
=======
        
      
  
      
    
      spec/models/category_spec.rb
      
>>>>>>> 752f0c0 (Featire specs)
=======
        
      
  
      
    
      spec/models/category_spec.rb
      
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
        
      
  
      
    
      spec/models/category_spec.rb
      
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
        
      
  
      
    
      spec/models/category_spec.rb
      
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
        
      
  
      
    
      spec/models/category_spec.rb
      
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
        
      
  
      
    
      spec/models/category_spec.rb
      
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
        
      
  
      
    
      spec/models/category_spec.rb
      
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
        
      
  
      
    
      spec/models/category_spec.rb
      
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
        
      
  
      
    
      spec/queryes/book_query_spec.rb
      
>>>>>>> c7a726c5 (Rebased)
    
      
      
  100.0%


      lines covered
    
      

    

    
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      45 relevant lines.
      45 lines covered and
=======
      8 relevant lines.
      8 lines covered and
>>>>>>> d0dc1f1 (Featire specs)
=======
      8 relevant lines.
      8 lines covered and
>>>>>>> 752f0c0 (Featire specs)
=======
      8 relevant lines.
      8 lines covered and
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
      8 relevant lines.
      8 lines covered and
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
      8 relevant lines.
      8 lines covered and
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
      8 relevant lines.
      8 lines covered and
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
      8 relevant lines.
      8 lines covered and
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
      8 relevant lines.
      8 lines covered and
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
      8 relevant lines.
      8 lines covered and
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
      45 relevant lines.
      45 lines covered and
>>>>>>> c7a726c5 (Rebased)
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            require 'rails_helper'
          
        2. 
        
        
      
        
        
          
      2. 
            
            

            

            
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
            RSpec.describe BookQuery do
=======
            RSpec.describe Category, type: :model do
>>>>>>> d0dc1f1 (Featire specs)
=======
            RSpec.describe Category, type: :model do
>>>>>>> 752f0c0 (Featire specs)
=======
            RSpec.describe Category, type: :model do
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
            RSpec.describe Category, type: :model do
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
            RSpec.describe Category, type: :model do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
            RSpec.describe Category, type: :model do
>>>>>>> 08edf50 (Featire specs)
=======
            RSpec.describe Category, type: :model do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
            RSpec.describe Category, type: :model do
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
            RSpec.describe Category, type: :model do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
            RSpec.describe Category, type: :model do
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
            RSpec.describe Category, type: :model do
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
            RSpec.describe BookQuery do
>>>>>>> c7a726c5 (Rebased)
          
        4. 
        
        
      
        
        
          
      4. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
              shared_examples 'sort test' do
=======
              describe 'category' do
>>>>>>> d0dc1f1 (Featire specs)
=======
              describe 'category' do
>>>>>>> 752f0c0 (Featire specs)
=======
              describe 'category' do
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
              describe 'category' do
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
              describe 'category' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
              describe 'category' do
>>>>>>> 08edf50 (Featire specs)
=======
              describe 'category' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
              describe 'category' do
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
              describe 'category' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
              describe 'category' do
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
              describe 'category' do
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
              shared_examples 'sort test' do
>>>>>>> c7a726c5 (Rebased)
          
        5. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      5. 
            5
=======
          
      6. 
            1
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      7. 
            1
>>>>>>> 752f0c0 (Featire specs)
=======
          
      8. 
            1
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      9. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      10. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      11. 
            1
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      12. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      13. 
            1
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      14. 
            1
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      15. 
            5
>>>>>>> c7a726c5 (Rebased)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
                it 'sort' do
=======
                context 'when validations' do
>>>>>>> d0dc1f1 (Featire specs)
=======
                context 'when validations' do
>>>>>>> 752f0c0 (Featire specs)
=======
                context 'when validations' do
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
                context 'when validations' do
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                context 'when validations' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
                context 'when validations' do
>>>>>>> 08edf50 (Featire specs)
=======
                context 'when validations' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                context 'when validations' do
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                context 'when validations' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
                context 'when validations' do
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
                context 'when validations' do
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
                it 'sort' do
>>>>>>> c7a726c5 (Rebased)
          
        16. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      16. 
            5
=======
          
      17. 
            2
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      18. 
            2
>>>>>>> 752f0c0 (Featire specs)
=======
          
      19. 
            2
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      20. 
            2
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      21. 
            2
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      22. 
            2
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      23. 
            2
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      24. 
            2
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      25. 
            2
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      26. 
            5
>>>>>>> c7a726c5 (Rebased)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
                  books
=======
                  it { is_expected.to validate_presence_of(:name) }
>>>>>>> d0dc1f1 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:name) }
>>>>>>> 752f0c0 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:name) }
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
                  it { is_expected.to validate_presence_of(:name) }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                  it { is_expected.to validate_presence_of(:name) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
                  it { is_expected.to validate_presence_of(:name) }
>>>>>>> 08edf50 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:name) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to validate_presence_of(:name) }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                  it { is_expected.to validate_presence_of(:name) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
                  it { is_expected.to validate_presence_of(:name) }
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
                  it { is_expected.to validate_presence_of(:name) }
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
                  books
>>>>>>> c7a726c5 (Rebased)
          
        27. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      27. 
            5
            

            

                  expect(test).to eq(result)
          
        28. 
        
        
      
        
        
          
      28. 
=======
          
      29. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      30. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
      31. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
          
      32. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      33. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
          
      34. 
>>>>>>> 08edf50 (Featire specs)
=======
          
      35. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      36. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      37. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      38. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      39. 
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
            
=======
          
      40. 
            5
>>>>>>> c7a726c5 (Rebased)
            

            

                  expect(test).to eq(result)
          
        41. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      41. 
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      42. 
            
            

            

                end
          
        43. 
        
        
      
        
        
<<<<<<< HEAD
          
      43. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      44. 
>>>>>>> c7a726c5 (Rebased)
            
            

            

              end
          
        45. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> c7a726c5 (Rebased)
          
      45. 
            
            

            

            end
          
        46. 
        
        
      
    
      
  
      

      

      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2fef4a0 (Add login registration pages)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> e60833c (Add login registration pages)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> f416f45 (Add login registration pages)
=======
<<<<<<< HEAD
>>>>>>> 02a399d (Manifest_cache true)
=======
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> bd8bda4 (Manifest_cache true)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 730a8ca (Add login registration pages)
=======
>>>>>>> e1f4d17 (Add login registration pages)
=======
>>>>>>> 26b462d (Add login registration pages)
        
      
  
      
    
      spec/models/user_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      3 relevant lines.
      3 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            require 'rails_helper'
          
        2. 
        
        
      
        
        
          
      2. 
            
            

            

            
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

            RSpec.describe User, type: :model do
          
        4. 
        
        
      
        
        
          
      4. 
            1
            

            

              pending "add some examples to (or delete) #{__FILE__}"
          
        5. 
        
        
      
        
        
          
      5. 
            
            

            

            end
          
        6. 
        
        
      
    
      
  
      

      

      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1214e1f (Add login registration pages)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 2fef4a0 (Add login registration pages)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 730a8ca (Add login registration pages)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> e1f4d17 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e60833c (Add login registration pages)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 998f08d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 64dceec (Manifest_cache true)
=======
=======
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 26b462d (Add login registration pages)
>>>>>>> f416f45 (Add login registration pages)
        
      
  
      
    
      spec/rails_helper.rb
      
    
      
      
  87.5%


      lines covered
    
      

    

    
      
      16 relevant lines.
      14 lines covered and
      2 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            require 'spec_helper'
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

            ENV['RAILS_ENV'] ||= 'test'
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

            require_relative '../config/environment'
          
        4. 
        
        
      
        
        
          
      4. 
            1
            

            

            abort('The Rails environment is running in production mode!') if Rails.env.production?
          
        5. 
        
        
      
        
        
          
      5. 
            1
            

            

            require 'rspec/rails'
          
        6. 
        
        
      
        
        
          
      6. 
            1
            

            

            require 'shoulda-matchers'
          
        7. 
        
        
      
        
        
=======
>>>>>>> 5b7749a (Fix)
          
      7. 
            
            

            

            
          
        8. 
        
        
      
        
        
          
      8. 
            1
            

            

                context 'with associations' do
          
        9. 
        
        
      
        
        
          
      9. 
            2
            

            

                  it { is_expected.to have_one(:billing) }
          
        10. 
        
        
      
        
        
          
      10. 
            2
            

            

                  it { is_expected.to have_one(:shipping) }
          
        11. 
        
        
      
        
        
          
      11. 
            
            

            

                end
          
        12. 
        
        
      
        
        
          
      12. 
            
            

            

              end
          
        13. 
        
        
      
        
        
          
      13. 
            
            

            

            end
          
        14. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/queryes/book_query_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      45 relevant lines.
      45 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            require 'rails_helper'
          
        2. 
        
        
      
        
        
          
      2. 
            
            

            

            
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

            RSpec.describe BookQuery do
          
        4. 
        
        
      
        
        
          
      4. 
            1
            

            

              shared_examples 'sort test' do
          
        5. 
        
        
      
        
        
          
      5. 
            5
            

            

                it 'sort' do
          
        6. 
        
        
      
        
        
          
      6. 
            5
            

            

                  books
          
        7. 
        
        
      
        
        
          
      7. 
            5
            

            

                  expect(test).to eq(result)
          
        8. 
        
        
      
        
        
          
      8. 
            
            

            

                end
          
        9. 
        
        
      
        
        
          
      9. 
            
            

            

              end
          
        10. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 4552227 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 5b7749a (Fix)
          
      10. 
            
            

            

            
          
        11. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
          
      11. 
            3
=======
          
      12. 
            
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      13. 
            
>>>>>>> 752f0c0 (Featire specs)
=======
          
      14. 
            
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      15. 
            
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      16. 
            
>>>>>>> 7a02bbe (Featire specs)
=======
          
      17. 
            
>>>>>>> 4552227 (Featire specs)
=======
          
      18. 
            3
>>>>>>> 5b7749a (Fix)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
              let(:titles) { %w[Adam Zimbabwe] }
=======
            begin
>>>>>>> d0dc1f1 (Featire specs)
=======
            begin
>>>>>>> 752f0c0 (Featire specs)
=======
            begin
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
            begin
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
            begin
>>>>>>> 08edf50 (Featire specs)
=======
            begin
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
            begin
>>>>>>> 4552227 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
=======
              let(:titles) { %w[Adam Zimbabwe] }
>>>>>>> 5b7749a (Fix)
          
        19. 
        
        
      
        
        
          
      19. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
              let(:books_dates) do
=======
              ActiveRecord::Migration.maintain_test_schema!
>>>>>>> d0dc1f1 (Featire specs)
=======
              ActiveRecord::Migration.maintain_test_schema!
>>>>>>> 752f0c0 (Featire specs)
=======
              ActiveRecord::Migration.maintain_test_schema!
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
              ActiveRecord::Migration.maintain_test_schema!
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
              ActiveRecord::Migration.maintain_test_schema!
>>>>>>> 08edf50 (Featire specs)
=======
              ActiveRecord::Migration.maintain_test_schema!
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
              ActiveRecord::Migration.maintain_test_schema!
>>>>>>> 4552227 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
=======
              let(:books_dates) do
>>>>>>> 5b7749a (Fix)
          
        20. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
          
      20. 
            1
=======
          
      21. 
            
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      22. 
            
>>>>>>> 752f0c0 (Featire specs)
=======
          
      23. 
            
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      24. 
            
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      25. 
            
>>>>>>> 7a02bbe (Featire specs)
=======
          
      26. 
            
>>>>>>> 4552227 (Featire specs)
=======
          
      27. 
            1
>>>>>>> 5b7749a (Fix)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
                ['Thu, 25 Aug 2022 15:25:38.761014000 UTC +00:00', 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00']
=======
            rescue ActiveRecord::PendingMigrationError => e
>>>>>>> d0dc1f1 (Featire specs)
=======
            rescue ActiveRecord::PendingMigrationError => e
>>>>>>> 752f0c0 (Featire specs)
=======
            rescue ActiveRecord::PendingMigrationError => e
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
            rescue ActiveRecord::PendingMigrationError => e
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
            rescue ActiveRecord::PendingMigrationError => e
>>>>>>> 08edf50 (Featire specs)
=======
            rescue ActiveRecord::PendingMigrationError => e
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
            rescue ActiveRecord::PendingMigrationError => e
>>>>>>> 4552227 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
=======
                ['Thu, 25 Aug 2022 15:25:38.761014000 UTC +00:00', 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00']
>>>>>>> 5b7749a (Fix)
          
        28. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
          
      28. 
=======
          
      29. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      30. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
      31. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
          
      32. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      33. 
>>>>>>> 08edf50 (Featire specs)
=======
          
      34. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
      35. 
>>>>>>> 4552227 (Featire specs)
=======
          
      36. 
>>>>>>> 5b7749a (Fix)
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
              end
=======
              puts e.to_s.strip
>>>>>>> d0dc1f1 (Featire specs)
=======
              puts e.to_s.strip
>>>>>>> 752f0c0 (Featire specs)
=======
              puts e.to_s.strip
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
              puts e.to_s.strip
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
              puts e.to_s.strip
>>>>>>> 08edf50 (Featire specs)
=======
              puts e.to_s.strip
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
              puts e.to_s.strip
>>>>>>> 4552227 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
=======
              end
>>>>>>> 5b7749a (Fix)
          
        37. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
          
      37. 
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 4552227 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
          
      38. 
            
            

            

              exit 1
          
        39. 
        
        
      
        
        
          
      39. 
            
            

            

            end
          
        40. 
        
        
      
        
        
          
      40. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 4552227 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
=======
          
      41. 
>>>>>>> 5b7749a (Fix)
            
            

            

            
          
        42. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 5b7749a (Fix)
          
      42. 
            1
            

            

              describe 'all books sort' do
          
        43. 
        
        
      
        
        
          
      43. 
            1
            

            

                context 'when sort by title A to Z' do
          
        44. 
        
        
      
        
        
<<<<<<< HEAD
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 4552227 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 5b7749a (Fix)
          
      44. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
                  let(:books) do
=======
            RSpec.configure do |config|
>>>>>>> d0dc1f1 (Featire specs)
=======
            RSpec.configure do |config|
>>>>>>> 752f0c0 (Featire specs)
=======
            RSpec.configure do |config|
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
            RSpec.configure do |config|
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
            RSpec.configure do |config|
>>>>>>> 08edf50 (Featire specs)
=======
            RSpec.configure do |config|
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
            RSpec.configure do |config|
>>>>>>> 4552227 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
=======
                  let(:books) do
>>>>>>> 5b7749a (Fix)
          
        45. 
        
        
      
        
        
          
      45. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
                    create(:book, title: titles.first)
=======
              config.fixture_path = "#{::Rails.root}/spec/fixtures"
>>>>>>> d0dc1f1 (Featire specs)
=======
              config.fixture_path = "#{::Rails.root}/spec/fixtures"
>>>>>>> 752f0c0 (Featire specs)
=======
              config.fixture_path = "#{::Rails.root}/spec/fixtures"
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
              config.fixture_path = "#{::Rails.root}/spec/fixtures"
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
              config.fixture_path = "#{::Rails.root}/spec/fixtures"
>>>>>>> 08edf50 (Featire specs)
=======
              config.fixture_path = "#{::Rails.root}/spec/fixtures"
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
              config.fixture_path = "#{::Rails.root}/spec/fixtures"
>>>>>>> 4552227 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
=======
                    create(:book, title: titles.first)
>>>>>>> 5b7749a (Fix)
          
        46. 
        
        
      
        
        
          
      46. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
                    create(:book, title: titles.second)
=======
              config.use_transactional_fixtures = true
>>>>>>> d0dc1f1 (Featire specs)
=======
              config.use_transactional_fixtures = true
>>>>>>> 752f0c0 (Featire specs)
=======
              config.use_transactional_fixtures = true
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
              config.use_transactional_fixtures = true
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
              config.use_transactional_fixtures = true
>>>>>>> 08edf50 (Featire specs)
=======
              config.use_transactional_fixtures = true
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
              config.use_transactional_fixtures = true
>>>>>>> 4552227 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
=======
                    create(:book, title: titles.second)
>>>>>>> 5b7749a (Fix)
          
        47. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 5b7749a (Fix)
          
      47. 
            
            

            

                  end
          
        48. 
        
        
      
        
        
          
      48. 
            
            

            

            
          
        49. 
        
        
      
        
        
          
      49. 
            2
            

            

                  let(:result) { titles.second }
          
        50. 
        
        
      
        
        
          
      50. 
            2
            

            

                  let(:test) { described_class.query({ sort: 'title DESC' }).first.title }
          
        51. 
        
        
      
        
        
          
      51. 
            
            

            

            
          
        52. 
        
        
      
        
        
          
      52. 
<<<<<<< HEAD
=======
          
      53. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      54. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
      55. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
          
      56. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      57. 
>>>>>>> 08edf50 (Featire specs)
=======
          
      58. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      59. 
>>>>>>> 4552227 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 5b7749a (Fix)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
                  include_examples 'sort test'
=======
              config.infer_spec_type_from_file_location!
>>>>>>> d0dc1f1 (Featire specs)
=======
              config.infer_spec_type_from_file_location!
>>>>>>> 752f0c0 (Featire specs)
=======
              config.infer_spec_type_from_file_location!
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
              config.infer_spec_type_from_file_location!
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
              config.infer_spec_type_from_file_location!
>>>>>>> 08edf50 (Featire specs)
=======
              config.infer_spec_type_from_file_location!
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
              config.infer_spec_type_from_file_location!
>>>>>>> 4552227 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
=======
                  include_examples 'sort test'
>>>>>>> 5b7749a (Fix)
          
        60. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 5b7749a (Fix)
          
      60. 
            
            

            

                end
          
        61. 
        
        
      
        
        
          
      61. 
            
            

            

            
          
        62. 
        
        
      
        
        
          
      62. 
<<<<<<< HEAD
=======
          
      63. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      64. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
      65. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
          
      66. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      67. 
>>>>>>> 08edf50 (Featire specs)
=======
          
      68. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      69. 
>>>>>>> 4552227 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 5b7749a (Fix)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
                context 'when sort title Z to A' do
=======
              config.filter_rails_from_backtrace!
>>>>>>> d0dc1f1 (Featire specs)
=======
              config.filter_rails_from_backtrace!
>>>>>>> 752f0c0 (Featire specs)
=======
              config.filter_rails_from_backtrace!
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
              config.filter_rails_from_backtrace!
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
              config.filter_rails_from_backtrace!
>>>>>>> 08edf50 (Featire specs)
=======
              config.filter_rails_from_backtrace!
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
              config.filter_rails_from_backtrace!
>>>>>>> 4552227 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
=======
                context 'when sort title Z to A' do
>>>>>>> 5b7749a (Fix)
          
        70. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 5b7749a (Fix)
          
      70. 
            1
            

            

                  let(:books) do
          
        71. 
        
        
      
        
        
          
      71. 
            1
            

            

                    create(:book, title: titles.first)
          
        72. 
        
        
      
        
        
          
      72. 
            1
            

            

                    create(:book, title: titles.second)
          
        73. 
        
        
      
        
        
          
      73. 
            
            

            

                  end
          
        74. 
        
        
      
        
        
          
      74. 
            
            

            

            
          
        75. 
        
        
      
        
        
          
      75. 
            2
            

            

                  let(:result) { titles.first }
          
        76. 
        
        
      
        
        
          
      76. 
            2
            

            

                  let(:test) { described_class.query({ sort: 'title' }).first.title }
          
        77. 
        
        
      
        
        
          
      77. 
            
            

            

            
          
        78. 
        
        
      
        
        
          
      78. 
            1
            

            

                  include_examples 'sort test'
          
        79. 
        
        
      
        
        
          
      79. 
            
            

            

                end
          
        80. 
        
        
      
        
        
          
      80. 
            
            

            

            
          
        81. 
        
        
      
        
        
          
      81. 
            1
            

            

                context 'when sort by price High to Low' do
          
        82. 
        
        
      
        
        
          
      82. 
            1
            

            

                  let(:books) do
          
        83. 
        
        
      
        
        
          
      83. 
            1
            

            

                    create(:book, price_cents: 75)
          
        84. 
        
        
      
        
        
          
      84. 
            1
            

            

                    create(:book, price_cents: 23)
          
        85. 
        
        
      
        
        
          
      85. 
            
            

            

                  end
          
        86. 
        
        
      
        
        
          
      86. 
            
            

            

            
          
        87. 
        
        
      
        
        
          
      87. 
            2
            

            

                  let(:result) { 75 }
          
        88. 
        
        
      
        
        
          
      88. 
            2
            

            

                  let(:test) { described_class.query({ sort: 'price_cents DESC' }).first.price_cents }
          
        89. 
        
        
      
        
        
          
      89. 
            
            

            

            
          
        90. 
        
        
      
        
        
          
      90. 
            1
            

            

                  include_examples 'sort test'
          
        91. 
        
        
      
        
        
          
      91. 
            
            

            

                end
          
        92. 
        
        
      
        
        
          
      92. 
            
            

            

            
          
        93. 
        
        
      
        
        
          
      93. 
            1
            

            

                context 'when sort price Low to High' do
          
        94. 
        
        
      
        
        
          
      94. 
            1
            

            

                  let(:books) do
          
        95. 
        
        
      
        
        
          
      95. 
            1
            

            

                    create(:book, price_cents: 75)
          
        96. 
        
        
      
        
        
          
      96. 
            1
            

            

                    create(:book, price_cents: 23)
          
        97. 
        
        
      
        
        
          
      97. 
            
            

            

                  end
          
        98. 
        
        
      
        
        
          
      98. 
            
            

            

            
          
        99. 
        
        
      
        
        
          
      99. 
            2
            

            

                  let(:result) { 23 }
          
        100. 
        
        
      
        
        
          
      100. 
            2
            

            

                  let(:test) { described_class.query({ sort: 'price_cents' }).first.price_cents }
          
        101. 
        
        
      
        
        
          
      101. 
            
            

            

            
          
        102. 
        
        
      
        
        
          
      102. 
            1
            

            

                  include_examples 'sort test'
          
        103. 
        
        
      
        
        
          
      103. 
            
            

            

                end
          
        104. 
        
        
      
        
        
          
      104. 
            
            

            

            
          
        105. 
        
        
      
        
        
          
      105. 
            1
            

            

                context 'when sort by Newest' do
          
        106. 
        
        
      
        
        
          
      106. 
            1
            

            

                  let(:books) do
          
        107. 
        
        
      
        
        
          
      107. 
            1
            

            

                    create(:book, created_at: books_dates.first)
          
        108. 
        
        
      
        
        
          
      108. 
            1
            

            

                    create(:book, created_at: books_dates.second)
          
        109. 
        
        
      
        
        
          
      109. 
            
            

            

                  end
          
        110. 
        
        
      
        
        
          
      110. 
            
            

            

            
          
        111. 
        
        
      
        
        
          
      111. 
            2
            

            

                  let(:result) { books_dates.first }
          
        112. 
        
        
      
        
        
          
      112. 
            2
            

            

                  let(:test) { described_class.query({ sort: 'created_at DESC' }).first.created_at }
          
        113. 
        
        
      
        
        
          
      113. 
            
            

            

            
          
        114. 
        
        
      
        
        
          
      114. 
            1
            

            

                  include_examples 'sort test'
          
        115. 
        
        
      
        
        
          
      115. 
            
            

            

                end
          
        116. 
        
        
      
        
        
          
      116. 
            
            

            

              end
          
        117. 
        
        
      
        
        
          
      117. 
<<<<<<< HEAD
=======
          
      118. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      119. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
      120. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
          
      121. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      122. 
>>>>>>> 08edf50 (Featire specs)
=======
          
      123. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      124. 
>>>>>>> 4552227 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 5b7749a (Fix)
            
            

            

            end
          
        125. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/support/configs/capybara.rb
      
    
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 64dceec (Manifest_cache true)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      
  36.84%
=======
<<<<<<< HEAD
      
  100.0%
=======
      
  36.84%
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
=======
      
  100.0%
>>>>>>> 752f0c0 (Featire specs)
=======
      
  36.84%
>>>>>>> bd8bda4 (Manifest_cache true)
=======
      
  100.0%
>>>>>>> 4e81ea2 (Featire specs)
=======
      
  36.84%
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
      
  100.0%
>>>>>>> 08edf50 (Featire specs)
=======
      
  36.84%
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
      
  100.0%
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
      
  100.0%
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
      
  36.84%
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
=======
      
  100.0%
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
      
  100.0%
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
      
  36.84%
>>>>>>> 998f08d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 64dceec (Manifest_cache true)
=======
=======
      
  100.0%
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
      
  100.0%
>>>>>>> 5b7749a (Fix)


      lines covered
    
      

    

    
      
      19 relevant lines.
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 64dceec (Manifest_cache true)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
      19 lines covered and
>>>>>>> a5d032d (Fix)
      0 lines missed.
=======
      7 lines covered and
      12 lines missed.
>>>>>>> 845dac1 (Manifest_cache true)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 64dceec (Manifest_cache true)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      7 lines covered and
      12 lines missed.
=======
<<<<<<< HEAD
      19 lines covered and
      0 lines missed.
=======
      7 lines covered and
      12 lines missed.
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
=======
      19 lines covered and
      0 lines missed.
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 59d75f9 (Featire specs)
=======
=======
      7 lines covered and
      12 lines missed.
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 96aecde (Manifest_cache true)
=======
=======
      19 lines covered and
      0 lines missed.
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
=======
=======
      7 lines covered and
      12 lines missed.
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2722d07 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 2722d07 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
      19 lines covered and
      0 lines missed.
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> e54deeb (Featire specs)
=======
=======
      7 lines covered and
      12 lines missed.
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
      19 lines covered and
      0 lines missed.
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
=======
      19 lines covered and
      0 lines missed.
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
=======
      7 lines covered and
      12 lines missed.
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
=======
=======
      19 lines covered and
      0 lines missed.
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
=======
      19 lines covered and
      0 lines missed.
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
=======
      7 lines covered and
      12 lines missed.
>>>>>>> 998f08d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 64dceec (Manifest_cache true)
=======
=======
=======
      19 lines covered and
      0 lines missed.
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
=======
      19 lines covered and
      0 lines missed.
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
    
      

    

  
      

  
          
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 64dceec (Manifest_cache true)
          
      1. 
            1
=======
          
      2. 
            
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      3. 
            
>>>>>>> 752f0c0 (Featire specs)
=======
          
      4. 
            
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      5. 
            
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      6. 
            
>>>>>>> 7a02bbe (Featire specs)
=======
          
      7. 
            
>>>>>>> 4552227 (Featire specs)
=======
          
      8. 
            1
>>>>>>> 5b7749a (Fix)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 5b7749a (Fix)
            RSpec.describe 'Author' do
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
            Capybara.configure do |config|
=======
            
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9620751 (Featire specs)
=======
=======
            
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 59d75f9 (Featire specs)
=======
=======
            
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
=======
=======
            
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54deeb (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
            
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> e54deeb (Featire specs)
=======
=======
            
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
=======
            
>>>>>>> 4552227 (Featire specs)
>>>>>>> 94841b5 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
          
        9. 
        
        
      
        
        
          
      9. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
          
      10. 
>>>>>>> 02a399d (Manifest_cache true)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      11. 
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> 64dceec (Manifest_cache true)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
              include_context 'with api request authentication helper methods'
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
              config.asset_host = 'http://localhost:3000'
=======
            Capybara.configure do |config|
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9620751 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 9620751 (Featire specs)
=======
=======
            Capybara.configure do |config|
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
=======
=======
>>>>>>> 7c4ea7f (Fix)
            Capybara.configure do |config|
>>>>>>> 94841b5 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
          
        12. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
          
      12. 
=======
          
      13. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
      14. 
>>>>>>> 36356d3 (Featire specs)
=======
          
      15. 
>>>>>>> 64dceec (Manifest_cache true)
            1
            

            

              config.asset_host = 'http://localhost:3000'
<<<<<<< HEAD
>>>>>>> 4552227 (Featire specs)
          
        16. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
          
      16. 
=======
          
      17. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
      18. 
>>>>>>> 4552227 (Featire specs)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
              include_context 'with api request global before and after hooks'
          
        19. 
        
        
      
        
        
          
      19. 
            
            

            

            
          
        20. 
        
        
      
        
        
          
      20. 
            2
            

            

              let(:first_name) { FFaker::Name.first_name }
          
        21. 
        
        
      
        
        
          
      21. 
            2
            

            

              let(:last_name) { FFaker::Name.last_name }
          
        22. 
        
        
      
        
        
          
      22. 
            
            

            

            
          
        23. 
        
        
      
        
        
          
      23. 
            2
            

            

              let(:new_name) { FFaker::Name.first_name }
          
        24. 
        
        
      
        
        
          
      24. 
            2
            

            

              let(:old_name) { author.first_name }
          
        25. 
        
        
      
        
        
          
      25. 
            
            

            

            
          
        26. 
        
        
      
        
        
          
      26. 
            4
            

            

              let(:author) { create(:author) }
          
        27. 
        
        
      
        
        
          
      27. 
            
            

            

            
          
        28. 
        
        
      
        
        
          
      28. 
            1
            

            

              before do
          
        29. 
        
        
      
        
        
          
      29. 
            4
            

            

                sign_in(create(:admin_user), :admin_user)
          
        30. 
        
        
      
        
        
          
      30. 
            
            

            

              end
          
        31. 
        
        
      
        
        
          
      31. 
            
            

            

            
          
        32. 
        
        
      
        
        
          
      32. 
            1
            

            

              it 'can create an author' do
          
        33. 
        
        
      
        
        
          
      33. 
            1
            

            

                visit 'admin/authors'
          
        34. 
        
        
      
        
        
          
      34. 
            
            

            

            
          
        35. 
        
        
      
        
        
          
      35. 
            1
            

            

                click_link('New Author')
          
        36. 
        
        
      
        
        
          
      36. 
            
            

            

            
          
        37. 
        
        
      
        
        
          
      37. 
            1
            

            

                fill_in 'author[first_name]', with: first_name
          
        38. 
        
        
      
        
        
          
      38. 
            1
            

            

                fill_in 'author[last_name]', with: last_name
          
        39. 
        
        
      
        
        
          
      39. 
            
            

            

            
          
        40. 
        
        
      
        
        
          
      40. 
            2
            

            

                expect { click_button('Create Author') }.to change(Author, :count).from(0).to(1)
          
        41. 
        
        
      
        
        
          
      41. 
            
            

            

              end
          
        42. 
        
        
      
        
        
          
      42. 
            
            

            

            
          
        43. 
        
        
      
        
        
          
      43. 
            1
            

            

              it 'can delete an author' do
          
        44. 
        
        
      
        
        
          
      44. 
            1
            

            

                author
          
        45. 
        
        
      
        
        
          
      45. 
            
            

            

            
          
        46. 
        
        
      
        
        
          
      46. 
            1
            

            

                visit 'admin/authors'
          
        47. 
        
        
      
        
        
          
      47. 
            
            

            

            
          
        48. 
        
        
      
        
        
          
      48. 
            2
            

            

                expect { click_link('Delete') }.to change(Author, :count).from(1).to(0)
          
        49. 
        
        
      
        
        
          
      49. 
            
            

            

              end
          
        50. 
        
        
      
        
        
          
      50. 
            
            

            

            
          
        51. 
        
        
      
        
        
          
      51. 
            1
            

            

              it 'can view an author' do
          
        52. 
        
        
      
        
        
          
      52. 
            1
            

            

                author
          
        53. 
        
        
      
        
        
          
      53. 
            
            

            

            
          
        54. 
        
        
      
        
        
          
      54. 
            1
            

            

                visit 'admin/authors'
          
        55. 
        
        
      
        
        
          
      55. 
            
            

            

            
          
        56. 
        
        
      
        
        
          
      56. 
            1
            

            

                click_link('View')
          
        57. 
        
        
      
        
        
          
      57. 
            
            

            

            
          
        58. 
        
        
      
        
        
          
      58. 
            1
            

            

                expect(page).to have_content(author.first_name)
          
        59. 
        
        
      
        
        
          
      59. 
            
            

            

              end
          
        60. 
        
        
      
        
        
          
      60. 
            
            

            

            
          
        61. 
        
        
      
        
        
          
      61. 
            1
            

            

              it 'can edit an author' do
          
        62. 
        
        
      
        
        
          
      62. 
            1
            

            

                author
          
        63. 
        
        
      
        
        
          
      63. 
            
            

            

            
          
        64. 
        
        
      
        
        
          
      64. 
            1
            

            

                visit 'admin/authors'
          
        65. 
        
        
      
        
        
          
      65. 
            
            

            

            
          
        66. 
        
        
      
        
        
          
      66. 
            1
            

            

                click_link('Edit')
          
        67. 
        
        
      
        
        
          
      67. 
            
            

            

            
          
        68. 
        
        
      
        
        
          
      68. 
            1
            

            

                fill_in 'author[first_name]', with: new_name
          
        69. 
        
        
      
        
        
          
      69. 
            
            

            

            
          
        70. 
        
        
      
        
        
          
      70. 
            4
            

            

                expect { click_button('Update Author') }.to change { author.reload.first_name }.from(old_name).to(new_name)
          
        71. 
        
        
      
        
        
          
      71. 
            
            

            

              end
          
        72. 
        
        
      
        
        
          
      72. 
            
            

            

            end
          
        73. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/feature/admin/book_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      32 relevant lines.
      32 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            RSpec.describe 'Book' do
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

              include_context 'with api request authentication helper methods'
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

              include_context 'with api request global before and after hooks'
          
        4. 
        
        
      
        
        
          
      4. 
            
            

            

            
          
        5. 
        
        
      
        
        
          
      5. 
<<<<<<< HEAD
=======
=======
          
      6. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      7. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
=======
=======
          
      8. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      9. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
          
      10. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      11. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      12. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      13. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
          
      14. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
=======
          
      15. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
=======
=======
          
      16. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      17. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
=======
          
      18. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
            5
            

            

<<<<<<< HEAD
              let(:book) { create(:book) }
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 009401d (Featire specs)
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
              let(:book) { create(:book) }
=======
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
              let(:book) { create(:book) }
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
              let(:category_one) { FactoryBot.create(:category) }
          
        19. 
        
        
      
        
        
          
      19. 
            3
            

            

              let(:category_two) { FactoryBot.create(:category) }
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 84809242 (Featire specs)
=======
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 9440753 (Featire specs)
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
          
        20. 
        
        
      
        
        
          
      20. 
            1
            

            

              let(:params) do
          
        21. 
        
        
      
        
        
<<<<<<< HEAD
          
      21. 
            1
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
          
      22. 
            1
=======
          
      23. 
            4
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      24. 
            4
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
          
      25. 
            4
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      26. 
            4
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      27. 
            4
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      28. 
            4
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
          
      29. 
            4
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> 4d4cf6b4 (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
=======
=======
          
      30. 
            4
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      31. 
            4
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
=======
          
      32. 
            4
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
            

            

                { title: FFaker::Book.title,
          
        33. 
        
        
      
        
        
          
      33. 
            
            

            

                  description: FFaker::Book.description,
          
        34. 
        
        
      
        
        
          
      34. 
            
            

            

<<<<<<< HEAD
                  price_cents: FFaker::Number.rand(1..100),
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
                  price_cents: FFaker::Number.rand(1..100),
=======
                  price: FFaker::Number.rand(1..100),
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
                  price: FFaker::Number.rand(1..100),
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
=======
=======
                  price: FFaker::Number.rand(1..100),
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                  price: FFaker::Number.rand(1..100),
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
                  price: FFaker::Number.rand(1..100),
>>>>>>> 4e81ea2 (Featire specs)
=======
                  price: FFaker::Number.rand(1..100),
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
                  price: FFaker::Number.rand(1..100),
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  price: FFaker::Number.rand(1..100),
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
                  price: FFaker::Number.rand(1..100),
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
=======
                  price: FFaker::Number.rand(1..100),
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
=======
=======
                  price: FFaker::Number.rand(1..100),
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  price: FFaker::Number.rand(1..100),
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
=======
                  price: FFaker::Number.rand(1..100),
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
          
        35. 
        
        
      
        
        
          
      35. 
            
            

            

                  dimensions: FFaker::Book.cover,
          
        36. 
        
        
      
        
        
          
      36. 
            
            

            

                  year_of_publication: FFaker::Number.rand(1900..2022),
          
        37. 
        
        
      
        
        
          
      37. 
            
            

            

                  materials: 'Soft cover',
          
        38. 
        
        
      
        
        
          
      38. 
            
            

            

                  quantity: FFaker::Number.rand(2..5) }
          
        39. 
        
        
      
        
        
          
      39. 
            
            

            

              end
          
        40. 
        
        
      
        
        
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      40. 
            
            

            

            
          
        41. 
        
        
      
        
        
          
      41. 
            1
            

            

              before do
          
        42. 
        
        
      
        
        
          
      42. 
            4
            

            

                sign_in(create(:admin_user), :admin_user)
          
        43. 
        
        
      
        
        
          
      43. 
            
            

            

            
          
        44. 
        
        
      
        
        
          
      44. 
            4
            

            

                book
          
        45. 
        
        
      
        
        
          
      45. 
            
            

            

            
          
        46. 
        
        
      
        
        
          
      46. 
            4
            

            

                visit 'admin/books'
          
        47. 
        
        
      
        
        
          
      47. 
            
            

            

              end
          
        48. 
        
        
      
        
        
          
      48. 
            
            

            

            
          
        49. 
        
        
      
        
        
          
      49. 
            1
            

            

              it 'can create an category' do
          
        50. 
        
        
      
        
        
          
      50. 
            1
            

            

                click_link('New Book')
          
        51. 
        
        
      
        
        
          
      51. 
            
            

            

            
          
        52. 
        
        
      
        
        
          
      52. 
            1
            

            

                fill_in 'book[title]', with: params[:title]
          
        53. 
        
        
      
        
        
          
      53. 
            1
            

            

                fill_in 'book[description]', with: params[:description]
          
        54. 
        
        
      
        
        
          
      54. 
            1
            

            

                fill_in 'book[year_of_publication]', with: params[:year_of_publication]
          
        55. 
        
        
      
        
        
          
      55. 
            1
            

            

                fill_in 'book[price_cents]', with: params[:price_cents]
          
        56. 
        
        
      
        
        
          
      56. 
            1
            

            

                fill_in 'book[materials]', with: params[:materials]
          
        57. 
        
        
      
        
        
          
      57. 
            1
            

            

                fill_in 'book[dimensions]', with: params[:dimensions]
          
        58. 
        
        
      
        
        
          
      58. 
            1
            

            

                fill_in 'book[quantity]', with: params[:quantity]
          
        59. 
        
        
      
        
        
          
      59. 
            
            

            

            
          
        60. 
        
        
      
        
        
          
      60. 
            1
            

            

                click_button('Create Book')
          
        61. 
        
        
      
        
        
          
      61. 
            
            

            

            
          
        62. 
        
        
      
        
        
          
      62. 
            1
            

            

                expect(page).to have_content(params[:title])
          
        63. 
        
        
      
        
        
          
      63. 
            
            

            

              end
          
        64. 
        
        
      
        
        
          
      64. 
            
            

            

            
          
        65. 
        
        
      
        
        
          
      65. 
            1
            

            

              it 'can delete an book' do
          
        66. 
        
        
      
        
        
          
      66. 
            1
            

            

                click_link('Delete')
          
        67. 
        
        
      
        
        
          
      67. 
            
            

            

            
          
        68. 
        
        
      
        
        
          
      68. 
            1
            

            

                expect(page).not_to have_content(book.title)
          
        69. 
        
        
      
        
        
          
      69. 
            
            

            

              end
          
        70. 
        
        
      
        
        
          
      70. 
            
            

            

            
          
        71. 
        
        
      
        
        
          
      71. 
            1
            

            

              it 'can view an book' do
          
        72. 
        
        
      
        
        
          
      72. 
            1
            

            

                click_link('View')
          
        73. 
        
        
      
        
        
          
      73. 
            
            

            

            
          
        74. 
        
        
      
        
        
          
      74. 
            1
            

            

                expect(page).to have_content(book.title)
          
        75. 
        
        
      
        
        
          
      75. 
            
            

            

              end
          
        76. 
        
        
      
        
        
          
      76. 
            
            

            

            
          
        77. 
        
        
      
        
        
          
      77. 
            1
            

            

              it 'can edit an book' do
          
        78. 
        
        
      
        
        
          
      78. 
            1
            

            

                click_link('Edit')
          
        79. 
        
        
      
        
        
          
      79. 
            
            

            

            
          
        80. 
        
        
      
        
        
          
      80. 
            1
            

            

                fill_in 'book[title]', with: 'New title'
          
        81. 
        
        
      
        
        
          
      81. 
            
            

            

            
          
        82. 
        
        
      
        
        
          
      82. 
            1
            

            

                click_button('Update Book')
          
        83. 
        
        
      
        
        
          
      83. 
            
            

            

            
          
        84. 
        
        
      
        
        
          
      84. 
            1
            

            

                expect(page).to have_content('New title')
          
        85. 
        
        
      
        
        
          
      85. 
            
            

            

              end
          
        86. 
        
        
      
        
        
          
      86. 
            
            

            

            end
          
        87. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/feature/admin/category_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      25 relevant lines.
      25 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            RSpec.describe 'Category' do
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

              include_context 'with api request authentication helper methods'
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

              include_context 'with api request global before and after hooks'
          
        4. 
        
        
      
        
        
          
      4. 
            
            

            

            
          
        5. 
        
        
      
        
        
          
      5. 
            2
            

            

              let(:category_name) { FFaker::Book.genre }
          
        6. 
        
        
      
        
        
          
      6. 
            
            

            

            
          
        7. 
        
        
      
        
        
          
      7. 
            5
            

            

              let(:category) { create(:category) }
          
        8. 
        
        
      
        
        
          
      8. 
            
            

            

            
          
        9. 
        
        
      
        
        
          
      9. 
            1
            

            

              before do
          
        10. 
        
        
      
        
        
          
      10. 
            4
            

            

                sign_in(create(:admin_user), :admin_user)
          
        11. 
        
        
      
        
        
          
      11. 
            
            

            

            
          
        12. 
        
        
      
        
        
          
      12. 
            4
            

            

                category
          
        13. 
        
        
      
        
        
          
      13. 
            
            

            

            
          
        14. 
        
        
      
        
        
          
      14. 
            4
            

            

                visit 'admin/categories'
          
        15. 
        
        
      
        
        
          
      15. 
            
<<<<<<< HEAD
=======
=======
          
      16. 
            7
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
>>>>>>> 3e9f99d (Featire specs)
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
          
      17. 
            7
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 6b6d1c2d (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
=======
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
=======
>>>>>>> 416166f (Featire specs)
>>>>>>> a2206025 (Featire specs)
          
      18. 
            7
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      19. 
            7
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
          
      20. 
            7
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 37e48018 (Featire specs)
=======
          
      21. 
            7
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
          
      22. 
            7
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> fc3774fd (Featire specs)
            

            

<<<<<<< HEAD
              end
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
=======
          
      23. 
            7
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      24. 
            7
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
=======
          
      25. 
            7
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2612be03 (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2612be03 (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
          
      26. 
            7
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      27. 
            7
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
=======
          
      28. 
            7
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
>>>>>>> da3a9a3 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
              end
=======
              let(:book) { FactoryBot.create(:book) }
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
              let(:book) { FactoryBot.create(:book) }
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
=======
=======
              let(:book) { FactoryBot.create(:book) }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
              let(:book) { FactoryBot.create(:book) }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
              let(:book) { FactoryBot.create(:book) }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
              let(:book) { FactoryBot.create(:book) }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
              let(:book) { FactoryBot.create(:book) }
>>>>>>> 4e81ea2 (Featire specs)
=======
              let(:book) { FactoryBot.create(:book) }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
              let(:book) { FactoryBot.create(:book) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
              let(:book) { FactoryBot.create(:book) }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
              let(:book) { FactoryBot.create(:book) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
              let(:book) { FactoryBot.create(:book) }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
              let(:book) { FactoryBot.create(:book) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
              let(:book) { FactoryBot.create(:book) }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
              let(:book) { FactoryBot.create(:book) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
              let(:book) { FactoryBot.create(:book) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
              let(:book) { FactoryBot.create(:book) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
              let(:book) { FactoryBot.create(:book) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
              let(:book) { FactoryBot.create(:book) }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
              let(:book) { FactoryBot.create(:book) }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
        29. 
        
        
      
        
        
          
      29. 
            
            

            

            
          
        30. 
        
        
      
        
        
          
      30. 
            1
            

            

<<<<<<< HEAD
              it 'can create an category' do
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
              it 'can create an category' do
=======
              describe '#show book' do
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
              describe '#show book' do
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
=======
=======
              describe '#show book' do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
              describe '#show book' do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
              describe '#show book' do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
              describe '#show book' do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
              describe '#show book' do
>>>>>>> 4e81ea2 (Featire specs)
=======
              describe '#show book' do
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
              describe '#show book' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
              describe '#show book' do
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
              describe '#show book' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
              describe '#show book' do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
              describe '#show book' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
              describe '#show book' do
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
              describe '#show book' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
              describe '#show book' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
              describe '#show book' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
              describe '#show book' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
              describe '#show book' do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
              describe '#show book' do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
        31. 
        
        
      
        
        
          
      31. 
            1
            

            

<<<<<<< HEAD
                click_link('New Category')
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
                click_link('New Category')
=======
                it 'show books info' do
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
                it 'show books info' do
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
=======
=======
                it 'show books info' do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                it 'show books info' do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
                it 'show books info' do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                it 'show books info' do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
                it 'show books info' do
>>>>>>> 4e81ea2 (Featire specs)
=======
                it 'show books info' do
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
                it 'show books info' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                it 'show books info' do
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
                it 'show books info' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
                it 'show books info' do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
                it 'show books info' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                it 'show books info' do
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
                it 'show books info' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
                it 'show books info' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
                it 'show books info' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
                it 'show books info' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
                it 'show books info' do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
                it 'show books info' do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
        32. 
        
        
      
        
        
<<<<<<< HEAD
          
      32. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 009401d (Featire specs)
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 4d4cf6b4 (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      33. 
=======
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
<<<<<<< HEAD
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
<<<<<<< HEAD
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
          
      34. 
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> e1ecabbe (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 4d4cf6b4 (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
          
      35. 
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
          
      36. 
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      37. 
            1
            

            

                  visit "books/#{book.id}"
          
        38. 
        
        
      
        
        
          
      38. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 84809242 (Featire specs)
=======
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 9440753 (Featire specs)
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            
            

            

            
          
        39. 
        
        
      
        
        
<<<<<<< HEAD
          
      39. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      40. 
=======
          
      41. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
          
      42. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
=======
=======
          
      43. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      44. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
          
      45. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      46. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
          
      47. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      48. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      49. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      50. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
          
      51. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
          
      52. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
          
      53. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      54. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
          
      55. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
          
      56. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
          
      57. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
          
      58. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
          
      59. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
          
      60. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            1
            

            

<<<<<<< HEAD
                fill_in 'category[name]', with: category_name
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
                fill_in 'category[name]', with: category_name
=======
                  expect(page).to have_content(book.title)
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
                  expect(page).to have_content(book.title)
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
=======
=======
                  expect(page).to have_content(book.title)
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                  expect(page).to have_content(book.title)
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
                  expect(page).to have_content(book.title)
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                  expect(page).to have_content(book.title)
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
                  expect(page).to have_content(book.title)
>>>>>>> 4e81ea2 (Featire specs)
=======
                  expect(page).to have_content(book.title)
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
                  expect(page).to have_content(book.title)
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  expect(page).to have_content(book.title)
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
                  expect(page).to have_content(book.title)
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
                  expect(page).to have_content(book.title)
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
                  expect(page).to have_content(book.title)
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  expect(page).to have_content(book.title)
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
                  expect(page).to have_content(book.title)
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
                  expect(page).to have_content(book.title)
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
                  expect(page).to have_content(book.title)
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
                  expect(page).to have_content(book.title)
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
                  expect(page).to have_content(book.title)
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
                  expect(page).to have_content(book.title)
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
        61. 
        
        
      
        
        
<<<<<<< HEAD
          
      61. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      62. 
=======
          
      63. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
          
      64. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
=======
=======
          
      65. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      66. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
          
      67. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      68. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
          
      69. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      70. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
            
            

            

<<<<<<< HEAD
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
=======
          
      71. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
=======
          
      72. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      73. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 2612be03 (Featire specs)
=======
          
      74. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
=======
          
      75. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
            
            

            

<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      76. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      77. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
      78. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 610b6138 (Featire specs)
=======
=======
          
      79. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
          
      80. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
=======
=======
          
      81. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
          
      82. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
          
      83. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      84. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
=======
          
      85. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
>>>>>>> da3a9a3 (Featire specs)
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            
          
        86. 
        
        
      
        
        
          
      86. 
            1
            

            

                click_button('Create Category')
<<<<<<< HEAD
=======
=======
                end
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
                end
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
=======
=======
                end
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                end
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
                end
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                end
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
                end
>>>>>>> 4e81ea2 (Featire specs)
=======
                end
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
                end
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                end
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
                end
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
                end
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
                end
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                end
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
                end
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
                end
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
                end
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
                end
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
                end
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
                end
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
        87. 
        
        
      
        
        
          
      87. 
            
            

            

            
          
        88. 
        
        
      
        
        
          
      88. 
            1
            

            

<<<<<<< HEAD
                expect(page).to have_content(category_name)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
                expect(page).to have_content(category_name)
=======
                it 'clicked Beck to results' do
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
                it 'clicked Beck to results' do
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
=======
=======
                it 'clicked Beck to results' do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                it 'clicked Beck to results' do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
                it 'clicked Beck to results' do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                it 'clicked Beck to results' do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
                it 'clicked Beck to results' do
>>>>>>> 4e81ea2 (Featire specs)
=======
                it 'clicked Beck to results' do
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
                it 'clicked Beck to results' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                it 'clicked Beck to results' do
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
                it 'clicked Beck to results' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
                it 'clicked Beck to results' do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
                it 'clicked Beck to results' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                it 'clicked Beck to results' do
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
                it 'clicked Beck to results' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
                it 'clicked Beck to results' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
                it 'clicked Beck to results' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
                it 'clicked Beck to results' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
                it 'clicked Beck to results' do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
                it 'clicked Beck to results' do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
        89. 
        
        
      
        
        
<<<<<<< HEAD
          
      89. 
            
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      90. 
            
=======
          
      91. 
            1
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
>>>>>>> 3e9f99d (Featire specs)
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
          
      92. 
            1
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 6b6d1c2d (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
=======
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
=======
>>>>>>> 416166f (Featire specs)
>>>>>>> a2206025 (Featire specs)
          
      93. 
            1
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      94. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
          
      95. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 37e48018 (Featire specs)
=======
          
      96. 
            1
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
          
      97. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> fc3774fd (Featire specs)
            

            

<<<<<<< HEAD
              end
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
=======
          
      98. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      99. 
            1
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
=======
          
      100. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2612be03 (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2612be03 (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
          
      101. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      102. 
            1
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
=======
          
      103. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
>>>>>>> da3a9a3 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
              end
=======
                  visit "books/#{book.id}"
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
                  visit "books/#{book.id}"
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
=======
=======
                  visit "books/#{book.id}"
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                  visit "books/#{book.id}"
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
                  visit "books/#{book.id}"
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                  visit "books/#{book.id}"
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
                  visit "books/#{book.id}"
>>>>>>> 4e81ea2 (Featire specs)
=======
                  visit "books/#{book.id}"
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
                  visit "books/#{book.id}"
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  visit "books/#{book.id}"
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
                  visit "books/#{book.id}"
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
                  visit "books/#{book.id}"
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
                  visit "books/#{book.id}"
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  visit "books/#{book.id}"
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
                  visit "books/#{book.id}"
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
                  visit "books/#{book.id}"
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
                  visit "books/#{book.id}"
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
                  visit "books/#{book.id}"
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
                  visit "books/#{book.id}"
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
                  visit "books/#{book.id}"
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
        104. 
        
        
      
        
        
          
      104. 
            
            

            

            
          
        105. 
        
        
      
        
        
          
      105. 
            1
            

            

<<<<<<< HEAD
              it 'can delete an category' do
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
              it 'can delete an category' do
=======
                  find('a', class: 'general-back-link').click
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
                  find('a', class: 'general-back-link').click
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
=======
=======
                  find('a', class: 'general-back-link').click
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                  find('a', class: 'general-back-link').click
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
                  find('a', class: 'general-back-link').click
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                  find('a', class: 'general-back-link').click
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
                  find('a', class: 'general-back-link').click
>>>>>>> 4e81ea2 (Featire specs)
=======
                  find('a', class: 'general-back-link').click
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
                  find('a', class: 'general-back-link').click
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  find('a', class: 'general-back-link').click
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
                  find('a', class: 'general-back-link').click
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
                  find('a', class: 'general-back-link').click
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
                  find('a', class: 'general-back-link').click
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  find('a', class: 'general-back-link').click
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
                  find('a', class: 'general-back-link').click
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
                  find('a', class: 'general-back-link').click
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
                  find('a', class: 'general-back-link').click
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
                  find('a', class: 'general-back-link').click
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
                  find('a', class: 'general-back-link').click
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
                  find('a', class: 'general-back-link').click
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
        106. 
        
        
      
        
        
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      106. 
            1
            

            

                click_link('Delete')
          
        107. 
        
        
      
        
        
          
      107. 
<<<<<<< HEAD
=======
=======
          
      108. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
          
      109. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
=======
=======
          
      110. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      111. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
          
      112. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      113. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
          
      114. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      115. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      116. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      117. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
          
      118. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
          
      119. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
          
      120. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      121. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
          
      122. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
          
      123. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
          
      124. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
          
      125. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
          
      126. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
          
      127. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            
            

            

            
          
        128. 
        
        
      
        
        
<<<<<<< HEAD
          
      128. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      129. 
=======
          
      130. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
          
      131. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
=======
=======
          
      132. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      133. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
          
      134. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      135. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
          
      136. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      137. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      138. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      139. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
          
      140. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
          
      141. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
          
      142. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      143. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
          
      144. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
          
      145. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
          
      146. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
          
      147. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
          
      148. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
          
      149. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            1
            

            

<<<<<<< HEAD
                expect(page).not_to have_content(category.name)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 009401d (Featire specs)
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 4d4cf6b4 (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
                expect(page).not_to have_content(category.name)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
<<<<<<< HEAD
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
<<<<<<< HEAD
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
                expect(page).not_to have_content(category.name)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> e1ecabbe (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 4d4cf6b4 (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
                expect(page).not_to have_content(category.name)
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
                expect(page).not_to have_content(category.name)
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
                  expect(page).to have_content('Catalog')
          
        150. 
        
        
      
        
        
          
      150. 
            
            

            

                end
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 84809242 (Featire specs)
=======
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 9440753 (Featire specs)
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
        151. 
        
        
      
        
        
          
      151. 
            
            

            

<<<<<<< HEAD
              end
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
              end
=======
            
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
            
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
=======
=======
            
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
            
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
            
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
            
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
            
>>>>>>> 4e81ea2 (Featire specs)
=======
            
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
            
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
            
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
            
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
            
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
            
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
            
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
            
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
            
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
            
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
            
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
            
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
            
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
        152. 
        
        
      
        
        
<<<<<<< HEAD
          
      152. 
            
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      153. 
            
=======
          
      154. 
            1
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
>>>>>>> 3e9f99d (Featire specs)
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
          
      155. 
            1
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 6b6d1c2d (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
=======
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
=======
>>>>>>> 416166f (Featire specs)
>>>>>>> a2206025 (Featire specs)
          
      156. 
            1
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      157. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
          
      158. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 37e48018 (Featire specs)
=======
          
      159. 
            1
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
          
      160. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> fc3774fd (Featire specs)
            

            

<<<<<<< HEAD
            
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
=======
          
      161. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      162. 
            1
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
=======
          
      163. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2612be03 (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2612be03 (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
          
      164. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      165. 
            1
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
=======
          
      166. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
>>>>>>> da3a9a3 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            
=======
                context 'when test read more' do
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
                context 'when test read more' do
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
=======
=======
                context 'when test read more' do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                context 'when test read more' do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
                context 'when test read more' do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                context 'when test read more' do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
                context 'when test read more' do
>>>>>>> 4e81ea2 (Featire specs)
=======
                context 'when test read more' do
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
                context 'when test read more' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                context 'when test read more' do
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
                context 'when test read more' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
                context 'when test read more' do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
                context 'when test read more' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                context 'when test read more' do
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
                context 'when test read more' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
                context 'when test read more' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
                context 'when test read more' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
                context 'when test read more' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
                context 'when test read more' do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
                context 'when test read more' do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
        167. 
        
        
      
        
        
          
      167. 
            1
            

            

<<<<<<< HEAD
              it 'can view an category' do
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
              it 'can view an category' do
=======
                  it 'show read more' do
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
                  it 'show read more' do
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
=======
=======
                  it 'show read more' do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                  it 'show read more' do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
                  it 'show read more' do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                  it 'show read more' do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
                  it 'show read more' do
>>>>>>> 4e81ea2 (Featire specs)
=======
                  it 'show read more' do
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
                  it 'show read more' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it 'show read more' do
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
                  it 'show read more' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
                  it 'show read more' do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
                  it 'show read more' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it 'show read more' do
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
                  it 'show read more' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
                  it 'show read more' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
                  it 'show read more' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
                  it 'show read more' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
                  it 'show read more' do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
                  it 'show read more' do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
        168. 
        
        
      
        
        
          
      168. 
            1
            

            

<<<<<<< HEAD
                click_link('View')
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
                click_link('View')
=======
                    visit "books/#{book.id}"
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
                    visit "books/#{book.id}"
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
=======
=======
                    visit "books/#{book.id}"
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                    visit "books/#{book.id}"
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
                    visit "books/#{book.id}"
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                    visit "books/#{book.id}"
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
                    visit "books/#{book.id}"
>>>>>>> 4e81ea2 (Featire specs)
=======
                    visit "books/#{book.id}"
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
                    visit "books/#{book.id}"
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                    visit "books/#{book.id}"
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
                    visit "books/#{book.id}"
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
                    visit "books/#{book.id}"
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
                    visit "books/#{book.id}"
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                    visit "books/#{book.id}"
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
                    visit "books/#{book.id}"
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
                    visit "books/#{book.id}"
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
                    visit "books/#{book.id}"
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
                    visit "books/#{book.id}"
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
                    visit "books/#{book.id}"
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
                    visit "books/#{book.id}"
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
        169. 
        
        
      
        
        
          
      169. 
            
            

            

            
          
        170. 
        
        
      
        
        
          
      170. 
            1
            

            

<<<<<<< HEAD
                expect(page).to have_content(category.name)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
                expect(page).to have_content(category.name)
=======
                    expect(page).to have_content('Read More')
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
                    expect(page).to have_content('Read More')
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
=======
=======
                    expect(page).to have_content('Read More')
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                    expect(page).to have_content('Read More')
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
                    expect(page).to have_content('Read More')
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                    expect(page).to have_content('Read More')
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
                    expect(page).to have_content('Read More')
>>>>>>> 4e81ea2 (Featire specs)
=======
                    expect(page).to have_content('Read More')
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
                    expect(page).to have_content('Read More')
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                    expect(page).to have_content('Read More')
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
                    expect(page).to have_content('Read More')
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
                    expect(page).to have_content('Read More')
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
                    expect(page).to have_content('Read More')
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                    expect(page).to have_content('Read More')
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
                    expect(page).to have_content('Read More')
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
                    expect(page).to have_content('Read More')
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
                    expect(page).to have_content('Read More')
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
                    expect(page).to have_content('Read More')
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
                    expect(page).to have_content('Read More')
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
                    expect(page).to have_content('Read More')
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
        171. 
        
        
      
        
        
          
      171. 
            
            

            

<<<<<<< HEAD
              end
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
              end
=======
                  end
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
                  end
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
=======
=======
                  end
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                  end
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
                  end
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                  end
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
                  end
>>>>>>> 4e81ea2 (Featire specs)
=======
                  end
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
                  end
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  end
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
                  end
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
                  end
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
                  end
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  end
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
                  end
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
                  end
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
                  end
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
                  end
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
                  end
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
                  end
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
        172. 
        
        
      
        
        
          
      172. 
            
            

            

            
          
        173. 
        
        
      
        
        
          
      173. 
            1
            

            

<<<<<<< HEAD
              it 'can edit an category' do
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
              it 'can edit an category' do
=======
                  it 'clicked read more', js: true do
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
                  it 'clicked read more', js: true do
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
=======
=======
                  it 'clicked read more', js: true do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                  it 'clicked read more', js: true do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
                  it 'clicked read more', js: true do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                  it 'clicked read more', js: true do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
                  it 'clicked read more', js: true do
>>>>>>> 4e81ea2 (Featire specs)
=======
                  it 'clicked read more', js: true do
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
                  it 'clicked read more', js: true do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it 'clicked read more', js: true do
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
                  it 'clicked read more', js: true do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
                  it 'clicked read more', js: true do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
                  it 'clicked read more', js: true do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it 'clicked read more', js: true do
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
                  it 'clicked read more', js: true do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
                  it 'clicked read more', js: true do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
                  it 'clicked read more', js: true do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
                  it 'clicked read more', js: true do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
                  it 'clicked read more', js: true do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
                  it 'clicked read more', js: true do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
        174. 
        
        
      
        
        
          
      174. 
            1
            

            

<<<<<<< HEAD
                click_link('Edit')
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
                click_link('Edit')
=======
                    visit "books/#{book.id}"
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
                    visit "books/#{book.id}"
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
=======
=======
                    visit "books/#{book.id}"
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                    visit "books/#{book.id}"
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
                    visit "books/#{book.id}"
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                    visit "books/#{book.id}"
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
                    visit "books/#{book.id}"
>>>>>>> 4e81ea2 (Featire specs)
=======
                    visit "books/#{book.id}"
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
                    visit "books/#{book.id}"
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                    visit "books/#{book.id}"
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
                    visit "books/#{book.id}"
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
                    visit "books/#{book.id}"
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
                    visit "books/#{book.id}"
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                    visit "books/#{book.id}"
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
                    visit "books/#{book.id}"
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
                    visit "books/#{book.id}"
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
                    visit "books/#{book.id}"
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
                    visit "books/#{book.id}"
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
                    visit "books/#{book.id}"
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
                    visit "books/#{book.id}"
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
        175. 
        
        
      
        
        
          
      175. 
            
            

            

            
          
        176. 
        
        
      
        
        
          
      176. 
            1
            

            

<<<<<<< HEAD
                fill_in 'category[name]', with: 'New Genre'
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
                fill_in 'category[name]', with: 'New Genre'
=======
                    click_link 'Read More'
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
                    click_link 'Read More'
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
=======
=======
                    click_link 'Read More'
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                    click_link 'Read More'
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
                    click_link 'Read More'
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                    click_link 'Read More'
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
                    click_link 'Read More'
>>>>>>> 4e81ea2 (Featire specs)
=======
                    click_link 'Read More'
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
                    click_link 'Read More'
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                    click_link 'Read More'
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
                    click_link 'Read More'
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
                    click_link 'Read More'
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
                    click_link 'Read More'
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                    click_link 'Read More'
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
                    click_link 'Read More'
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
                    click_link 'Read More'
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
                    click_link 'Read More'
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
                    click_link 'Read More'
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
                    click_link 'Read More'
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
                    click_link 'Read More'
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
        177. 
        
        
      
        
        
          
      177. 
            
            

            

            
          
        178. 
        
        
      
        
        
          
      178. 
            1
            

            

<<<<<<< HEAD
                click_button('Update Category')
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
                click_button('Update Category')
=======
                    expect(page).not_to have_content('Read More')
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
                    expect(page).not_to have_content('Read More')
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
=======
=======
                    expect(page).not_to have_content('Read More')
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                    expect(page).not_to have_content('Read More')
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
                    expect(page).not_to have_content('Read More')
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                    expect(page).not_to have_content('Read More')
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
                    expect(page).not_to have_content('Read More')
>>>>>>> 4e81ea2 (Featire specs)
=======
                    expect(page).not_to have_content('Read More')
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
                    expect(page).not_to have_content('Read More')
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                    expect(page).not_to have_content('Read More')
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
                    expect(page).not_to have_content('Read More')
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
                    expect(page).not_to have_content('Read More')
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
                    expect(page).not_to have_content('Read More')
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                    expect(page).not_to have_content('Read More')
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
                    expect(page).not_to have_content('Read More')
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
                    expect(page).not_to have_content('Read More')
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
                    expect(page).not_to have_content('Read More')
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
                    expect(page).not_to have_content('Read More')
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
                    expect(page).not_to have_content('Read More')
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
                    expect(page).not_to have_content('Read More')
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
        179. 
        
        
      
        
        
          
      179. 
            
            

            

<<<<<<< HEAD
            
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            
=======
                  end
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
                  end
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
=======
=======
                  end
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                  end
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
                  end
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                  end
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
                  end
>>>>>>> 4e81ea2 (Featire specs)
=======
                  end
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
                  end
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  end
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
                  end
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
                  end
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
                  end
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  end
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
                  end
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
                  end
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
                  end
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
                  end
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
                  end
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
                  end
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
        180. 
        
        
      
        
        
<<<<<<< HEAD
          
      180. 
            1
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      181. 
            1
=======
          
      182. 
            
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
>>>>>>> 3e9f99d (Featire specs)
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
          
      183. 
            
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 6b6d1c2d (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
=======
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
=======
>>>>>>> 416166f (Featire specs)
>>>>>>> a2206025 (Featire specs)
          
      184. 
            
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      185. 
            
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
          
      186. 
            
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 37e48018 (Featire specs)
=======
          
      187. 
            
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
          
      188. 
            
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> fc3774fd (Featire specs)
            

            

<<<<<<< HEAD
                expect(page).to have_content('New Genre')
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
=======
          
      189. 
            
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      190. 
            
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
=======
          
      191. 
            
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2612be03 (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2612be03 (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
          
      192. 
            
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      193. 
            
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
=======
          
      194. 
            
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
>>>>>>> da3a9a3 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
                expect(page).to have_content('New Genre')
=======
                end
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
                end
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
=======
=======
                end
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                end
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
                end
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                end
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
                end
>>>>>>> 4e81ea2 (Featire specs)
=======
                end
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
                end
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                end
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
                end
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
                end
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
                end
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                end
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
                end
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
                end
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
                end
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
                end
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
                end
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
                end
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
        195. 
        
        
      
        
        
          
      195. 
            
            

            

<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
              end
          
        196. 
        
        
      
        
        
          
      196. 
            
            

            

            end
          
        197. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/feature/billing_spec.rb
      
    
      
      
  73.08%


      lines covered
    
      

    

    
      
      26 relevant lines.
      19 lines covered and
      7 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            RSpec.describe 'Billing', type: :feature do
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

              include_context 'with api request authentication helper methods'
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

              include_context 'with api request global before and after hooks'
          
        4. 
        
        
      
        
        
          
      4. 
            
            

            

<<<<<<< HEAD
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            
          
        5. 
        
        
      
        
        
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      5. 
            2
            

            

              let(:user) { create(:user) }
          
        6. 
        
        
      
        
        
          
      6. 
            1
            

            

              let(:attributes_for) { attributes_for(:billing) }
          
        7. 
        
        
      
        
        
          
      7. 
            
            

            

            
          
        8. 
        
        
      
        
        
          
      8. 
            1
            

            

              describe '#fill_in', js: true do
          
        9. 
        
        
      
        
        
          
      9. 
            1
            

            

                it 'fill in billing' do
          
        10. 
        
        
      
        
        
          
      10. 
            1
            

            

                  sign_in(user)
          
        11. 
        
        
      
        
        
          
      11. 
            
            

            

            
          
        12. 
        
        
      
        
        
          
      12. 
            1
            

            

                  visit edit_user_path(user.id)
          
        13. 
        
        
      
        
        
          
      13. 
            
            

            

            
          
        14. 
        
        
      
        
        
          
      14. 
            1
            

            

                  within('div#billing.col-md-5.mb-40') do
          
        15. 
        
        
      
        
        
          
      15. 
            1
            

            

                    find_all('div', class: 'form-group')[0] do
          
        16. 
        
        
      
        
        
          
      16. 
            
            

            

                      fill_in :first_name, with: attributes_for[:first_name]
          
        17. 
        
        
      
        
        
          
      17. 
            
            

            

                    end
          
        18. 
        
        
      
        
        
          
      18. 
            1
            

            

                    find_all('div', class: 'form-group')[1] do
          
        19. 
        
        
      
        
        
          
      19. 
            
            

            

                      fill_in :last_name, with: attributes_for[:last_name]
          
        20. 
        
        
      
        
        
          
      20. 
            
            

            

                    end
          
        21. 
        
        
      
        
        
          
      21. 
            1
            

            

                    find_all('div', class: 'form-group')[2] do
          
        22. 
        
        
      
        
        
          
      22. 
            
            

            

                      fill_in :address, with: attributes_for[:address]
          
        23. 
        
        
      
        
        
          
      23. 
            
            

            

                    end
          
        24. 
        
        
      
        
        
          
      24. 
            1
            

            

                    find_all('div', class: 'form-group')[3] do
          
        25. 
        
        
      
        
        
          
      25. 
            
            

            

                      fill_in :city, with: attributes_for[:city]
          
        26. 
        
        
      
        
        
          
      26. 
            
            

            

                    end
          
        27. 
        
        
      
        
        
          
      27. 
            1
            

            

                    find_all('div', class: 'form-group')[4] do
          
        28. 
        
        
      
        
        
          
      28. 
            
            

            

                      fill_in :zip, with: attributes_for[:zip]
          
        29. 
        
        
      
        
        
          
      29. 
            
            

            

                    end
          
        30. 
        
        
      
        
        
          
      30. 
            1
            

            

                    find_all('div', class: 'form-group')[5] do
          
        31. 
        
        
      
        
        
          
      31. 
            
            

            

                      fill_in :country, with: attributes_for[:country]
          
        32. 
        
        
      
        
        
          
      32. 
            
            

            

                    end
          
        33. 
        
        
      
        
        
          
      33. 
            1
            

            

                    find_all('div', class: 'form-group')[6] do
          
        34. 
        
        
      
        
        
          
      34. 
            
            

            

                      fill_in :phone, with: attributes_for[:phone]
          
        35. 
        
        
      
        
        
          
      35. 
            
            

            

                    end
          
        36. 
        
        
      
        
        
          
      36. 
            1
            

            

                    click_on I18n.t('settings.save')
          
        37. 
        
        
      
        
        
          
      37. 
            
            

            

                  end
          
        38. 
        
        
      
        
        
          
      38. 
            
            

            

            
          
        39. 
        
        
      
        
        
          
      39. 
            1
            

            

                  expect(page).to have_content(I18n.t('settings.message.update'))
          
        40. 
        
        
      
        
        
          
      40. 
            
            

            

                end
          
        41. 
        
        
      
        
        
          
      41. 
            
            

            

              end
          
        42. 
        
        
      
        
        
          
      42. 
            
            

            

            end
          
        43. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/feature/book_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      104 relevant lines.
      104 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            RSpec.describe 'Book', type: :feature do
          
        2. 
        
        
      
        
        
          
      2. 
            5
            

            

              let(:category_one) { create(:category) }
          
        3. 
        
        
      
        
        
          
      3. 
            3
            

            

              let(:category_two) { create(:category) }
          
        4. 
        
        
      
        
        
          
      4. 
            1
            

            

              let(:params) do
          
        5. 
        
        
      
        
        
          
      5. 
            4
            

            

                { title: FFaker::Book.title,
          
        6. 
        
        
      
        
        
          
      6. 
            
            

            

                  description: FFaker::Book.description,
          
        7. 
        
        
      
        
        
          
      7. 
            
            

            

                  price_cents: FFaker::Number.rand(1..100),
          
        8. 
        
        
      
        
        
          
      8. 
            
            

            

                  dimensions: FFaker::Book.cover,
          
        9. 
        
        
      
        
        
          
      9. 
            
            

            

                  year_of_publication: FFaker::Number.rand(1900..2022),
          
        10. 
        
        
      
        
        
          
      10. 
            
            

            

                  materials: 'Soft cover',
          
        11. 
        
        
      
        
        
          
      11. 
            
            

            

                  quantity: FFaker::Number.rand(2..5) }
          
        12. 
        
        
      
        
        
          
      12. 
            
            

            

              end
          
        13. 
        
        
      
        
        
          
      13. 
            7
            

            

              let(:book) { create(:book).decorate }
          
        14. 
        
        
      
        
        
          
      14. 
            
            

            

            
          
        15. 
        
        
      
        
        
          
      15. 
            1
            

            

              describe '#show book' do
          
        16. 
        
        
      
        
        
          
      16. 
            1
            

            

                it 'show books info' do
          
        17. 
        
        
      
        
        
          
      17. 
            1
            

            

                  visit "books/#{book.id}"
          
        18. 
        
        
      
        
        
          
      18. 
            
            

            

            
          
        19. 
        
        
      
        
        
          
      19. 
            1
            

            

                  expect(page).to have_content(book.title)
          
        20. 
        
        
      
        
        
          
      20. 
            
            

            

                end
          
        21. 
        
        
      
        
        
          
      21. 
            
            

            

            
          
        22. 
        
        
      
        
        
          
      22. 
            1
            

            

                it 'clicked Beck to results' do
          
        23. 
        
        
      
        
        
          
      23. 
            1
            

            

                  visit "books/#{book.id}"
          
        24. 
        
        
      
        
        
          
      24. 
            
            

            

            
          
        25. 
        
        
      
        
        
          
      25. 
            1
            

            

                  find('a', class: 'general-back-link').click
          
        26. 
        
        
      
        
        
          
      26. 
            
            

            

            
          
        27. 
        
        
      
        
        
          
      27. 
            1
            

            

                  expect(page).to have_content(I18n.t('catalog_page.title'))
          
        28. 
        
        
      
        
        
          
      28. 
            
            

            

                end
          
        29. 
        
        
      
        
        
          
      29. 
            
            

            

            
          
        30. 
        
        
      
        
        
          
      30. 
            1
            

            

                context 'when test read more' do
          
        31. 
        
        
      
        
        
          
      31. 
            1
            

            

                  it 'show read more' do
          
        32. 
        
        
      
        
        
          
      32. 
            1
            

            

                    visit "books/#{book.id}"
          
        33. 
        
        
      
        
        
          
      33. 
            
            

            

            
          
        34. 
        
        
      
        
        
          
      34. 
            1
            

            

                    expect(page).to have_content(I18n.t('book_page.read_more'))
          
        35. 
        
        
      
        
        
          
      35. 
            
            

            

                  end
          
        36. 
        
        
      
        
        
          
      36. 
            
            

            

            
          
        37. 
        
        
      
        
        
          
      37. 
            1
            

            

                  it 'clicked read more', js: true do
          
        38. 
        
        
      
        
        
          
      38. 
            1
            

            

                    visit "books/#{book.id}"
          
        39. 
        
        
      
        
        
          
      39. 
            
            

            

            
          
        40. 
        
        
      
        
        
          
      40. 
            1
            

            

                    click_link 'Read More'
          
        41. 
        
        
      
        
        
          
      41. 
            
            

            

            
          
        42. 
        
        
      
        
        
          
      42. 
            1
            

            

                    expect(page).not_to have_content(I18n.t('book_page.read_more'))
          
        43. 
        
        
      
        
        
          
      43. 
            
            

            

                  end
          
        44. 
        
        
      
        
        
          
      44. 
            
            

            

                end
          
        45. 
        
        
      
        
        
          
      45. 
            
            

            

            
          
        46. 
        
        
      
        
        
          
      46. 
<<<<<<< HEAD
=======
=======
          
      47. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
          
      48. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
=======
=======
          
      49. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      50. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
          
      51. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      52. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
          
      53. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      54. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      55. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      56. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
          
      57. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
          
      58. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
          
      59. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      60. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
          
      61. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
          
      62. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
          
      63. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
          
      64. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
          
      65. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
          
      66. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            1
            

            

                context 'when quantity changes', js: true do
          
        67. 
        
        
      
        
        
<<<<<<< HEAD
          
      67. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      68. 
=======
          
      69. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
          
      70. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
=======
=======
          
      71. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      72. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
          
      73. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      74. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
          
      75. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      76. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      77. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      78. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
          
      79. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
          
      80. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
          
      81. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      82. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
          
      83. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
          
      84. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
          
      85. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
          
      86. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
          
      87. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
          
      88. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            1
            

            

                  before do
          
        89. 
        
        
      
        
        
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      89. 
            2
            

            

                    visit "books/#{book.id}"
          
        90. 
        
        
      
        
        
          
      90. 
            
            

            

            
          
        91. 
        
        
      
        
        
<<<<<<< HEAD
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      91. 
            2
            

            

<<<<<<< HEAD
                    find('a', class: 'inc').click
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
                    find('a', class: 'inc').click
=======
                    visit "books/#{book.id}"
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
                    visit "books/#{book.id}"
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
=======
=======
                    visit "books/#{book.id}"
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                    visit "books/#{book.id}"
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
                    visit "books/#{book.id}"
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                    visit "books/#{book.id}"
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
                    visit "books/#{book.id}"
>>>>>>> 4e81ea2 (Featire specs)
=======
                    visit "books/#{book.id}"
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
                    visit "books/#{book.id}"
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                    visit "books/#{book.id}"
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
                    visit "books/#{book.id}"
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
                    visit "books/#{book.id}"
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
                    visit "books/#{book.id}"
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                    visit "books/#{book.id}"
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
                    visit "books/#{book.id}"
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
                    visit "books/#{book.id}"
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
                    visit "books/#{book.id}"
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
                    visit "books/#{book.id}"
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
                    visit "books/#{book.id}"
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
                    visit "books/#{book.id}"
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
        92. 
        
        
      
        
        
          
      92. 
            
            

            

<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
                  end
          
        93. 
        
        
      
        
        
          
      93. 
            
            

            

<<<<<<< HEAD
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            
          
        94. 
        
        
      
        
        
<<<<<<< HEAD
          
      94. 
            1
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
          
      95. 
            1
=======
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
          
      96. 
            1
=======
          
      97. 
            2
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      98. 
            2
>>>>>>> 752f0c0 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                  it 'increase quantity' do
>>>>>>> 2a25e4c (Featire specs)
=======
          
      99. 
            2
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
          
      100. 
            2
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 6b6d1c2d (Featire specs)
<<<<<<< HEAD
=======
=======
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
=======
>>>>>>> 416166f (Featire specs)
>>>>>>> a2206025 (Featire specs)
          
      101. 
            2
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      102. 
            2
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 2ee03d3 (Featire specs)
            

            

>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
      103. 
            2
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
            

            

                    find('a', class: 'inc').click
          
        104. 
        
        
      
        
        
          
      104. 
            
            

            

                  end
          
        105. 
        
        
      
        
        
          
      105. 
            
            

            

            
          
        106. 
        
        
      
        
        
          
      106. 
            1
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
<<<<<<< HEAD
=======
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
          
      107. 
            2
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
            

            

<<<<<<< HEAD
                    find('a', class: 'inc').click
          
        108. 
        
        
      
        
        
          
      108. 
            
            

            

                  end
          
        109. 
        
        
      
        
        
          
      109. 
            
            

            

            
          
        110. 
        
        
      
        
        
          
      110. 
            1
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
                  it 'increase quantity' do
>>>>>>> 610b6138 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> e1ecabbe (Featire specs)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
          
      111. 
            2
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
            

            

<<<<<<< HEAD
                    find('a', class: 'inc').click
          
        112. 
        
        
      
        
        
          
      112. 
            
            

            

                  end
          
        113. 
        
        
      
        
        
          
      113. 
            
            

            

            
          
        114. 
        
        
      
        
        
          
      114. 
            1
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
          
      115. 
            2
=======
                  it 'increase quantity' do
>>>>>>> c033601 (Rebased)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
                  it 'increase quantity' do
=======
                    find('a', class: 'inc').click
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
=======
=======
                    find('a', class: 'inc').click
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
          
        116. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
          
      116. 
            1
>>>>>>> 2a25e4c (Featire specs)
            

            

                    find('a', class: 'inc').click
          
        117. 
        
        
      
        
        
<<<<<<< HEAD
          
      117. 
=======
          
      118. 
=======
          
      119. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 2a25e4c (Featire specs)
=======
=======
          
      120. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
            
            

            

                  end
          
        121. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
          
      121. 
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
          
      122. 
=======
          
      123. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 2a25e4c (Featire specs)
=======
=======
          
      124. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
            
            

            

            
          
        125. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
          
      125. 
            1
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
                  it 'increase quantity' do
>>>>>>> 9d98d9ab (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
<<<<<<< HEAD
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
                  it 'increase quantity' do
>>>>>>> fc3774fd (Featire specs)
=======
<<<<<<< HEAD
                  it 'increase quantity' do
>>>>>>> d8dd3b4a (Featire specs)
=======
<<<<<<< HEAD
                  it 'increase quantity' do
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
                  it 'increase quantity' do
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                  it 'increase quantity' do
=======
                  it 'increase quantity', js: true do
>>>>>>> 752f0c0 (Featire specs)
=======
                  it 'increase quantity', js: true do
>>>>>>> 4e81ea2 (Featire specs)
=======
                  it 'increase quantity', js: true do
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
=======
=======
=======
                  it 'increase quantity' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
                  it 'increase quantity' do
>>>>>>> c033601 (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
=======
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
=======
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
                  it 'increase quantity' do
=======
                    find('a', class: 'inc').click
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
>>>>>>> ecb02dbf (Featire specs)
>>>>>>> a636fda (Featire specs)
=======
=======
                    find('a', class: 'inc').click
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
=======
                    find('a', class: 'inc').click
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
=======
                    find('a', class: 'inc').click
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
=======
                  it 'increase quantity' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 37e48018 (Featire specs)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
                  it 'increase quantity', js: true do
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
=======
                  it 'increase quantity' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
=======
                  it 'increase quantity' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
                  it 'increase quantity', js: true do
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
                  it 'increase quantity' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
=======
                  it 'increase quantity' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
                  it 'increase quantity', js: true do
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
=======
                  it 'increase quantity' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
=======
=======
                  it 'increase quantity' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
                  it 'increase quantity', js: true do
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
=======
=======
                  it 'increase quantity' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
        126. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
          
      126. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 009401d (Featire specs)
=======
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
>>>>>>> afa56d1 (Featire specs)
          
      127. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5506bd0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 009401d (Featire specs)
=======
=======
>>>>>>> ed32b84 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
          
      128. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b5ac3004 (Featire specs)
>>>>>>> ed32b84 (Featire specs)
=======
          
      129. 
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
          
      130. 
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
          
      131. 
=======
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
          
      132. 
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> da3a9a3 (Featire specs)
>>>>>>> b5ac3004 (Featire specs)
          
      133. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      134. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> d8abfed3 (Featire specs)
=======
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2612be03 (Featire specs)
=======
          
      135. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
          
      136. 
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> e5752db (Featire specs)
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
          
      137. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
          
      138. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
          
      139. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
          
      140. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
          
      141. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
          
      142. 
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
          
      143. 
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
                    expect(page).to have_content("€#{Money.new(book.price_cents * 2)}")
          
        144. 
        
        
      
        
        
          
      144. 
<<<<<<< HEAD
=======
=======
          
      145. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
          
      146. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
=======
=======
          
      147. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      148. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
          
      149. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      150. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
          
      151. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      152. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
          
      153. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
          
      154. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
>>>>>>> afa56d1 (Featire specs)
>>>>>>> e1ecabbe (Featire specs)
            
            

            

                  end
          
        155. 
        
        
      
        
        
<<<<<<< HEAD
          
      155. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 2ee03d3 (Featire specs)
>>>>>>> afa56d1 (Featire specs)
>>>>>>> e1ecabbe (Featire specs)
          
      156. 
=======
          
      157. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
          
      158. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
=======
=======
          
      159. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      160. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
          
      161. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      162. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
          
      163. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      164. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
          
      165. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
          
      166. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
>>>>>>> afa56d1 (Featire specs)
>>>>>>> e1ecabbe (Featire specs)
            
            

            

            
          
        167. 
        
        
      
        
        
<<<<<<< HEAD
          
      167. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 2ee03d3 (Featire specs)
>>>>>>> afa56d1 (Featire specs)
>>>>>>> e1ecabbe (Featire specs)
          
      168. 
=======
          
      169. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
          
      170. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
=======
=======
          
      171. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      172. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
          
      173. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      174. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
          
      175. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      176. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
          
      177. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
          
      178. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
          
      179. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
>>>>>>> afa56d1 (Featire specs)
>>>>>>> e1ecabbe (Featire specs)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
=======
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
>>>>>>> afa56d1 (Featire specs)
                  it 'decrease quantity' do
>>>>>>> 610b6138 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
                  it 'decrease quantity' do
>>>>>>> 84809242 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
                  it 'decrease quantity' do
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                  it 'decrease quantity' do
=======
                  it 'decrease quantity', js: true do
>>>>>>> 752f0c0 (Featire specs)
=======
                  it 'decrease quantity', js: true do
>>>>>>> 4e81ea2 (Featire specs)
=======
                  it 'decrease quantity', js: true do
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
=======
=======
=======
                  it 'decrease quantity' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
                  it 'decrease quantity' do
>>>>>>> c033601 (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
>>>>>>> afa56d1 (Featire specs)
>>>>>>> e1ecabbe (Featire specs)
                  it 'decrease quantity' do
=======
                  it 'increase quantity', js: true do
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
>>>>>>> 3cf8dd4 (Featire specs)
>>>>>>> aa4361fd (Featire specs)
>>>>>>> a636fda (Featire specs)
=======
=======
                  it 'increase quantity', js: true do
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
=======
                  it 'increase quantity', js: true do
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
=======
                  it 'increase quantity', js: true do
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
>>>>>>> afa56d1 (Featire specs)
>>>>>>> e1ecabbe (Featire specs)
          
        180. 
        
        
      
        
        
<<<<<<< HEAD
          
      180. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
>>>>>>> afa56d1 (Featire specs)
>>>>>>> e1ecabbe (Featire specs)
          
      181. 
=======
          
      182. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
          
      183. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
=======
=======
          
      184. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      185. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
          
      186. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      187. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
          
      188. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      189. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
          
      190. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
          
      191. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
          
      192. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
>>>>>>> afa56d1 (Featire specs)
>>>>>>> e1ecabbe (Featire specs)
            1
            

            

<<<<<<< HEAD
                    find('a', class: 'dec').click
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 009401d (Featire specs)
=======
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
>>>>>>> afa56d1 (Featire specs)
>>>>>>> e1ecabbe (Featire specs)
                    find('a', class: 'dec').click
=======
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
<<<<<<< HEAD
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
<<<<<<< HEAD
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
                    find('a', class: 'dec').click
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> e1ecabbe (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 4d4cf6b4 (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
                    find('a', class: 'dec').click
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
                    find('a', class: 'dec').click
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
                    expect(page).to have_content("€#{book.price * 2}")
          
        193. 
        
        
      
        
        
          
      193. 
            
            

            

                  end
          
        194. 
        
        
      
        
        
          
      194. 
            
            

            

            
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 84809242 (Featire specs)
=======
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 9440753 (Featire specs)
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
        195. 
        
        
      
        
        
          
      195. 
            1
            

            

<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
                  it 'decrease quantity', js: true do
<<<<<<< HEAD
=======
=======
                  it 'decrease quantity' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
                  it 'decrease quantity', js: true do
<<<<<<< HEAD
<<<<<<< HEAD
=======
                  it 'decrease quantity', js: true do
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
                  it 'decrease quantity', js: true do
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
                  it 'decrease quantity' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
=======
                  it 'decrease quantity', js: true do
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
<<<<<<< HEAD
=======
=======
                  it 'decrease quantity' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
                  it 'decrease quantity', js: true do
<<<<<<< HEAD
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 904663c (Featire specs)
                  it 'decrease quantity', js: true do
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
                  it 'decrease quantity', js: true do
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
=======
                  it 'decrease quantity' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
=======
=======
                  it 'decrease quantity' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
                  it 'decrease quantity' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
                  it 'decrease quantity', js: true do
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
=======
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
=======
=======
                  it 'decrease quantity' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 3e9f99d (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
                  it 'decrease quantity', js: true do
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
                  it 'decrease quantity' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
                  it 'decrease quantity', js: true do
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
                  it 'decrease quantity', js: true do
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
                  it 'decrease quantity', js: true do
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
        196. 
        
        
      
        
        
          
      196. 
            1
            

            

                    find('a', class: 'dec').click
          
        197. 
        
        
      
        
        
          
      197. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 84809242 (Featire specs)
=======
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 9440753 (Featire specs)
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
                    expect(page).to have_content("€#{book.price}")
          
        198. 
        
        
      
        
        
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      198. 
            
            

            

                  end
          
        199. 
        
        
      
        
        
          
      199. 
            
            

            

                end
          
        200. 
        
        
      
        
        
<<<<<<< HEAD
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      200. 
            
            

            

<<<<<<< HEAD
              end
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
              end
=======
                  end
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
                  end
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
=======
=======
                  end
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                  end
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
                  end
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                  end
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
                  end
>>>>>>> 4e81ea2 (Featire specs)
=======
                  end
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
                  end
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  end
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
                  end
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
                  end
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
                  end
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  end
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
                  end
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
                  end
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
                  end
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
                  end
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
                  end
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
                  end
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
        201. 
        
        
      
        
        
          
      201. 
            
            

            

<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
                end
          
        202. 
        
        
      
        
        
          
      202. 
            
            

            

              end
          
        203. 
        
        
      
        
        
          
      203. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 84809242 (Featire specs)
=======
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 9440753 (Featire specs)
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            
          
        204. 
        
        
      
        
        
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      204. 
            1
            

            

              describe '#catalog' do
          
        205. 
        
        
      
        
        
          
      205. 
            1
            

            

                describe 'filter by category' do
          
        206. 
        
        
      
        
        
<<<<<<< HEAD
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      206. 
            1
            

            

<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
              describe '#catalog' do
          
        207. 
        
        
      
        
        
          
      207. 
            1
            

            

                describe 'filter by category' do
          
        208. 
        
        
      
        
        
          
      208. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 84809242 (Featire specs)
=======
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 9440753 (Featire specs)
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
                  before do
          
        209. 
        
        
      
        
        
<<<<<<< HEAD
          
      209. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      210. 
=======
          
      211. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
          
      212. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
=======
=======
          
      213. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      214. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
          
      215. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      216. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
          
      217. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      218. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      219. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      220. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
          
      221. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
          
      222. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
          
      223. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      224. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
          
      225. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
          
      226. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
          
      227. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
          
      228. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
          
      229. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
          
      230. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            2
            

            

                    category_one.books.create(params)
          
        231. 
        
        
      
        
        
<<<<<<< HEAD
          
      231. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      232. 
=======
          
      233. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
          
      234. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
=======
=======
          
      235. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      236. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
          
      237. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      238. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
          
      239. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      240. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      241. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      242. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
          
      243. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
          
      244. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
          
      245. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      246. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
          
      247. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
          
      248. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
          
      249. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
          
      250. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
          
      251. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
          
      252. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            2
            

            

                    visit books_path
          
        253. 
        
        
      
        
        
<<<<<<< HEAD
          
      253. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      254. 
=======
          
      255. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
          
      256. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
=======
=======
          
      257. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      258. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
          
      259. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      260. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
          
      261. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      262. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      263. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      264. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
          
      265. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
          
      266. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
          
      267. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      268. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
          
      269. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
          
      270. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
          
      271. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
          
      272. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
          
      273. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
          
      274. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            
            

            

                  end
          
        275. 
        
        
      
        
        
<<<<<<< HEAD
          
      275. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      276. 
=======
          
      277. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
          
      278. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
=======
=======
          
      279. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      280. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
          
      281. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      282. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
          
      283. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      284. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      285. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      286. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
          
      287. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
          
      288. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
          
      289. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      290. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
          
      291. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
          
      292. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
          
      293. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
          
      294. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
          
      295. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
          
      296. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            
            

            

            
          
        297. 
        
        
      
        
        
<<<<<<< HEAD
          
      297. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      298. 
=======
          
      299. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
          
      300. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
=======
=======
          
      301. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      302. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
          
      303. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      304. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
          
      305. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      306. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      307. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      308. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
          
      309. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
          
      310. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
          
      311. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      312. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
          
      313. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
          
      314. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
          
      315. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
          
      316. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
          
      317. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
          
      318. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            1
            

            

                  after do
          
        319. 
        
        
      
        
        
<<<<<<< HEAD
          
      319. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      320. 
=======
          
      321. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
          
      322. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
=======
=======
          
      323. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      324. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
          
      325. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      326. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
          
      327. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      328. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      329. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      330. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
          
      331. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
          
      332. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
          
      333. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      334. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
          
      335. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
          
      336. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
          
      337. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
          
      338. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
          
      339. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
          
      340. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            2
            

            

                    category_one.destroy
          
        341. 
        
        
      
        
        
<<<<<<< HEAD
          
      341. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      342. 
=======
          
      343. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
          
      344. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
=======
=======
          
      345. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      346. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
          
      347. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      348. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
          
      349. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      350. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      351. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      352. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
          
      353. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
          
      354. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
          
      355. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      356. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
          
      357. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
          
      358. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
          
      359. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
          
      360. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
          
      361. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
          
      362. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            
            

            

                  end
          
        363. 
        
        
      
        
        
<<<<<<< HEAD
          
      363. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      364. 
=======
          
      365. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
          
      366. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
=======
=======
          
      367. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      368. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
          
      369. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      370. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
          
      371. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      372. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      373. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      374. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
          
      375. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
          
      376. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
          
      377. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      378. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
          
      379. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
          
      380. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
          
      381. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
          
      382. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
          
      383. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
          
      384. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            
            

            

            
          
        385. 
        
        
      
        
        
<<<<<<< HEAD
          
      385. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      386. 
=======
          
      387. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
          
      388. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
=======
=======
          
      389. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      390. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
          
      391. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      392. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
          
      393. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      394. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      395. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      396. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
          
      397. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
          
      398. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
          
      399. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      400. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
          
      401. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
          
      402. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
          
      403. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
          
      404. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
          
      405. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
          
      406. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            1
            

            

                  it 'show book count for category' do
          
        407. 
        
        
      
        
        
<<<<<<< HEAD
          
      407. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      408. 
=======
          
      409. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
          
      410. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
=======
=======
          
      411. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      412. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
          
      413. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      414. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
          
      415. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      416. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      417. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      418. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
          
      419. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
          
      420. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
          
      421. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      422. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
          
      423. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
          
      424. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
          
      425. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
          
      426. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
          
      427. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
          
      428. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            1
            

            

                    expect(page).to have_content(category_one.books.size)
          
        429. 
        
        
      
        
        
<<<<<<< HEAD
          
      429. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      430. 
=======
          
      431. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
          
      432. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
=======
=======
          
      433. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      434. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
          
      435. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      436. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
          
      437. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      438. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      439. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      440. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
          
      441. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
          
      442. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
          
      443. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      444. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
          
      445. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
          
      446. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
          
      447. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
          
      448. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
          
      449. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
          
      450. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            
            

            

                  end
          
        451. 
        
        
      
        
        
<<<<<<< HEAD
          
      451. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      452. 
=======
          
      453. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
          
      454. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
=======
=======
          
      455. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      456. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
          
      457. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      458. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
          
      459. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      460. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      461. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      462. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
          
      463. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
          
      464. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
          
      465. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      466. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
          
      467. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
          
      468. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
          
      469. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
          
      470. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
          
      471. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
          
      472. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            
            

            

            
          
        473. 
        
        
      
        
        
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      473. 
            1
            

            

                  it 'filter book by category' do
          
        474. 
        
        
      
        
        
          
      474. 
            1
            

            

                    within 'ul', class: 'list-inline pt-10 mb-25 mr-240', id: 'filter' do
          
        475. 
        
        
      
        
        
<<<<<<< HEAD
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      475. 
            1
            

            

<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
                  it 'filter book by category' do
          
        476. 
        
        
      
        
        
          
      476. 
            1
            

            

                    within 'ul', class: 'list-inline pt-10 mb-25 mr-240', id: 'filter' do
          
        477. 
        
        
      
        
        
          
      477. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 84809242 (Featire specs)
=======
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 9440753 (Featire specs)
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
                      click_on category_one.name
          
        478. 
        
        
      
        
        
<<<<<<< HEAD
          
      478. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      479. 
=======
          
      480. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
          
      481. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
=======
=======
          
      482. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      483. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
          
      484. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      485. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
          
      486. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      487. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      488. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      489. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
          
      490. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
          
      491. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
          
      492. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      493. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
          
      494. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
          
      495. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
          
      496. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
          
      497. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
          
      498. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
          
      499. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            
            

            

                    end
          
        500. 
        
        
      
        
        
<<<<<<< HEAD
          
      500. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      501. 
=======
          
      502. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
          
      503. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
=======
=======
          
      504. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      505. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
          
      506. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      507. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
          
      508. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      509. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      510. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      511. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
          
      512. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
          
      513. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
          
      514. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      515. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
          
      516. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
          
      517. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
          
      518. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
          
      519. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
          
      520. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
          
      521. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            
            

            

            
          
        522. 
        
        
      
        
        
<<<<<<< HEAD
          
      522. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      523. 
=======
          
      524. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
          
      525. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
=======
=======
          
      526. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      527. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
          
      528. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      529. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
          
      530. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      531. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      532. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      533. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
          
      534. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
          
      535. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
          
      536. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      537. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
          
      538. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
          
      539. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
          
      540. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
          
      541. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
          
      542. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
          
      543. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            1
            

            

                    expect(page).to have_content(category_one.books.first.title)
          
        544. 
        
        
      
        
        
<<<<<<< HEAD
          
      544. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      545. 
=======
          
      546. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
          
      547. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
=======
=======
          
      548. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      549. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
          
      550. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      551. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
          
      552. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      553. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      554. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      555. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
          
      556. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
          
      557. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
          
      558. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      559. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
          
      560. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
          
      561. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
          
      562. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
          
      563. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
          
      564. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
          
      565. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            
            

            

                  end
          
        566. 
        
        
      
        
        
<<<<<<< HEAD
          
      566. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      567. 
=======
          
      568. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
          
      569. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
=======
=======
          
      570. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      571. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
          
      572. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      573. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
          
      574. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      575. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      576. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      577. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
          
      578. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
          
      579. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
          
      580. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      581. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
          
      582. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
          
      583. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
          
      584. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
          
      585. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
          
      586. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
          
      587. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            
            

            

                end
          
        588. 
        
        
      
        
        
<<<<<<< HEAD
          
      588. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      589. 
=======
          
      590. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
          
      591. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
=======
=======
          
      592. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      593. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
          
      594. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      595. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
          
      596. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      597. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      598. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      599. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
          
      600. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
          
      601. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
          
      602. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      603. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
          
      604. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
          
      605. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
          
      606. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
          
      607. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
          
      608. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
          
      609. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            
            

            

            
          
        610. 
        
        
      
        
        
<<<<<<< HEAD
          
      610. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      611. 
=======
          
      612. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
          
      613. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
=======
=======
          
      614. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      615. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
          
      616. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      617. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
          
      618. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      619. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      620. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      621. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
          
      622. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
          
      623. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
          
      624. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      625. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
          
      626. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
          
      627. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
          
      628. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
          
      629. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
          
      630. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
          
      631. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            1
            

            

                describe 'filter by all books' do
          
        632. 
        
        
      
        
        
<<<<<<< HEAD
          
      632. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      633. 
=======
          
      634. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
          
      635. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
=======
=======
          
      636. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      637. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
          
      638. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      639. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
          
      640. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      641. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      642. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      643. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
          
      644. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
          
      645. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
          
      646. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      647. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
          
      648. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
          
      649. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
          
      650. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
          
      651. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
          
      652. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
          
      653. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            1
            

            

                  before do
          
        654. 
        
        
      
        
        
<<<<<<< HEAD
          
      654. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      655. 
=======
          
      656. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
          
      657. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
=======
=======
          
      658. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      659. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
          
      660. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      661. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
          
      662. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      663. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      664. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      665. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
          
      666. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
          
      667. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
          
      668. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      669. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
          
      670. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
          
      671. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
          
      672. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
          
      673. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
          
      674. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
          
      675. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            2
            

            

                    category_one.books.create(params)
          
        676. 
        
        
      
        
        
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      676. 
            2
            

            

                    category_two.books.create(params)
          
        677. 
        
        
      
        
        
          
      677. 
            
            

            

            
          
        678. 
        
        
      
        
        
<<<<<<< HEAD
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      678. 
            2
            

            

<<<<<<< HEAD
                    visit books_path
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
                    visit books_path
=======
                    category_two.books.create(params)
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
                    category_two.books.create(params)
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
=======
=======
                    category_two.books.create(params)
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                    category_two.books.create(params)
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
                    category_two.books.create(params)
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                    category_two.books.create(params)
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
                    category_two.books.create(params)
>>>>>>> 4e81ea2 (Featire specs)
=======
                    category_two.books.create(params)
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
                    category_two.books.create(params)
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                    category_two.books.create(params)
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
                    category_two.books.create(params)
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
                    category_two.books.create(params)
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
                    category_two.books.create(params)
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                    category_two.books.create(params)
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
                    category_two.books.create(params)
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
                    category_two.books.create(params)
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
                    category_two.books.create(params)
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
                    category_two.books.create(params)
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
                    category_two.books.create(params)
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
                    category_two.books.create(params)
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
        679. 
        
        
      
        
        
          
      679. 
            
            

            

            
          
        680. 
        
        
      
        
        
          
      680. 
            2
            

            

<<<<<<< HEAD
                    click_on I18n.t('catalog_page.all')
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
                    click_on I18n.t('catalog_page.all')
=======
                    visit books_path
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
                    visit books_path
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
=======
=======
                    visit books_path
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                    visit books_path
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
                    visit books_path
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                    visit books_path
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
                    visit books_path
>>>>>>> 4e81ea2 (Featire specs)
=======
                    visit books_path
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
                    visit books_path
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                    visit books_path
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
                    visit books_path
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
                    visit books_path
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
                    visit books_path
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                    visit books_path
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
                    visit books_path
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
                    visit books_path
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
                    visit books_path
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
                    visit books_path
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
                    visit books_path
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
                    visit books_path
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
        681. 
        
        
      
        
        
          
      681. 
            
            

            

<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            
          
        682. 
        
        
      
        
        
          
      682. 
            2
            

            

                    click_on 'All'
          
        683. 
        
        
      
        
        
          
      683. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 84809242 (Featire specs)
=======
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 9440753 (Featire specs)
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
                  end
          
        684. 
        
        
      
        
        
<<<<<<< HEAD
          
      684. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      685. 
=======
          
      686. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
          
      687. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
=======
=======
          
      688. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      689. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
          
      690. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      691. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
          
      692. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      693. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      694. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      695. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
          
      696. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
          
      697. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
          
      698. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      699. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
          
      700. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
          
      701. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
          
      702. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
          
      703. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
          
      704. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
          
      705. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            
            

            

            
          
        706. 
        
        
      
        
        
<<<<<<< HEAD
          
      706. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      707. 
=======
          
      708. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
          
      709. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
=======
=======
          
      710. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      711. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
          
      712. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      713. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
          
      714. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      715. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      716. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      717. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
          
      718. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
          
      719. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
          
      720. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      721. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
          
      722. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
          
      723. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
          
      724. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
          
      725. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
          
      726. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
          
      727. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            1
            

            

                  after do
          
        728. 
        
        
      
        
        
<<<<<<< HEAD
          
      728. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      729. 
=======
          
      730. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
          
      731. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
=======
=======
          
      732. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      733. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
          
      734. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      735. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
          
      736. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      737. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      738. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      739. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
          
      740. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
          
      741. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
          
      742. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      743. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
          
      744. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
          
      745. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
          
      746. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
          
      747. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
          
      748. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
          
      749. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            2
            

            

                    category_one.destroy
          
        750. 
        
        
      
        
        
<<<<<<< HEAD
          
      750. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      751. 
=======
          
      752. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
          
      753. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
=======
=======
          
      754. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      755. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
          
      756. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      757. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
          
      758. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      759. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      760. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      761. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
          
      762. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
          
      763. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
          
      764. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      765. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
          
      766. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
          
      767. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
          
      768. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
          
      769. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
          
      770. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
          
      771. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            2
            

            

                    category_two.destroy
          
        772. 
        
        
      
        
        
<<<<<<< HEAD
          
      772. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      773. 
=======
          
      774. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
          
      775. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
=======
=======
          
      776. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      777. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
          
      778. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      779. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
          
      780. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      781. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      782. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      783. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
          
      784. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
          
      785. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
          
      786. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      787. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
          
      788. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
          
      789. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
          
      790. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
          
      791. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
          
      792. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
          
      793. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            
            

            

                  end
          
        794. 
        
        
      
        
        
<<<<<<< HEAD
          
      794. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      795. 
=======
          
      796. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
          
      797. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
=======
=======
          
      798. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      799. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
          
      800. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      801. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
          
      802. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      803. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      804. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      805. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
          
      806. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
          
      807. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
          
      808. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      809. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
          
      810. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
          
      811. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
          
      812. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
          
      813. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
          
      814. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
          
      815. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            
            

            

            
          
        816. 
        
        
      
        
        
<<<<<<< HEAD
          
      816. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      817. 
=======
          
      818. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
          
      819. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
=======
=======
          
      820. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      821. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
          
      822. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      823. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
          
      824. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      825. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      826. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      827. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
          
      828. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
          
      829. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
          
      830. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      831. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
          
      832. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
          
      833. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
          
      834. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
          
      835. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
          
      836. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
          
      837. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            1
            

            

                  it 'shown books for first category' do
          
        838. 
        
        
      
        
        
<<<<<<< HEAD
          
      838. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      839. 
=======
          
      840. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
          
      841. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
=======
=======
          
      842. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      843. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
          
      844. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      845. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
          
      846. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      847. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      848. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      849. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
          
      850. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
          
      851. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
          
      852. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      853. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
          
      854. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
          
      855. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
          
      856. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
          
      857. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
          
      858. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
          
      859. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            1
            

            

                    expect(page).to have_content(category_one.books.first.title)
          
        860. 
        
        
      
        
        
<<<<<<< HEAD
          
      860. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      861. 
=======
          
      862. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
          
      863. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
=======
=======
          
      864. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      865. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
          
      866. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      867. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
          
      868. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      869. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      870. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      871. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
          
      872. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
          
      873. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
          
      874. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      875. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
          
      876. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
          
      877. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
          
      878. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
          
      879. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
          
      880. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
          
      881. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            
            

            

                  end
          
        882. 
        
        
      
        
        
<<<<<<< HEAD
          
      882. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      883. 
=======
          
      884. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
          
      885. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
=======
=======
          
      886. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      887. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
          
      888. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      889. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
          
      890. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      891. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      892. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      893. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
          
      894. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
          
      895. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
          
      896. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      897. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
          
      898. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
          
      899. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
          
      900. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
          
      901. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
          
      902. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
          
      903. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            
            

            

            
          
        904. 
        
        
      
        
        
<<<<<<< HEAD
          
      904. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      905. 
=======
          
      906. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
          
      907. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
=======
=======
          
      908. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      909. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
          
      910. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      911. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
          
      912. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      913. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      914. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      915. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
          
      916. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
          
      917. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
          
      918. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      919. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
          
      920. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
          
      921. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
          
      922. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
          
      923. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
          
      924. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
          
      925. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            1
            

            

                  it 'shown books for second category' do
          
        926. 
        
        
      
        
        
<<<<<<< HEAD
          
      926. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      927. 
=======
          
      928. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
          
      929. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
=======
=======
          
      930. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      931. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
          
      932. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      933. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
          
      934. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      935. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      936. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      937. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
          
      938. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
          
      939. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
          
      940. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      941. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
          
      942. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
          
      943. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
          
      944. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
          
      945. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
          
      946. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
          
      947. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            1
            

            

                    expect(page).to have_content(category_two.books.first.title)
          
        948. 
        
        
      
        
        
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      948. 
            
            

            

                  end
          
        949. 
        
        
      
        
        
          
      949. 
            
            

            

                end
          
        950. 
        
        
      
        
        
<<<<<<< HEAD
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      950. 
            
            

            

<<<<<<< HEAD
              end
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
              end
=======
                  end
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
                  end
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
=======
=======
                  end
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                  end
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
                  end
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                  end
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
                  end
>>>>>>> 4e81ea2 (Featire specs)
=======
                  end
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
                  end
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  end
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
                  end
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
                  end
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
                  end
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  end
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
                  end
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
                  end
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
                  end
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
                  end
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
                  end
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
                  end
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
        951. 
        
        
      
        
        
          
      951. 
            
            

            

<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
                end
          
        952. 
        
        
      
        
        
          
      952. 
            
            

            

              end
          
        953. 
        
        
      
        
        
          
      953. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 84809242 (Featire specs)
=======
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 9440753 (Featire specs)
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            
          
        954. 
        
        
      
        
        
<<<<<<< HEAD
          
      954. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      955. 
=======
          
      956. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
          
      957. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
=======
=======
          
      958. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      959. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
          
      960. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      961. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
          
      962. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      963. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      964. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      965. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
          
      966. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
          
      967. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
          
      968. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      969. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
          
      970. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
          
      971. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
          
      972. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
          
      973. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
          
      974. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
          
      975. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            1
            

            

              describe 'load_more' do
          
        976. 
        
        
      
        
        
<<<<<<< HEAD
          
      976. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      977. 
=======
          
      978. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
          
      979. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
=======
=======
          
      980. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      981. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
          
      982. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      983. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
          
      984. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      985. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      986. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      987. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
          
      988. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
          
      989. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
          
      990. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      991. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
          
      992. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
          
      993. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
          
      994. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
          
      995. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
          
      996. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
          
      997. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            1
            

            

                before do
          
        998. 
        
        
      
        
        
<<<<<<< HEAD
          
      998. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      999. 
=======
          
      1000. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
          
      1001. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
=======
=======
          
      1002. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      1003. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
          
      1004. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      1005. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
          
      1006. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      1007. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      1008. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      1009. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
          
      1010. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
          
      1011. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
          
      1012. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      1013. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
          
      1014. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
          
      1015. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
          
      1016. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
          
      1017. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
          
      1018. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
          
      1019. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            3
            

            

<<<<<<< HEAD
<<<<<<< HEAD
                  24.times do
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                  24.times do
=======
=======
>>>>>>> 9a49b7b (Rebased)
=======
>>>>>>> 70fcacc (Featire specs)
=======
>>>>>>> ae409ca (Featire specs)
=======
>>>>>>> 379a979 (Featire specs)
=======
>>>>>>> adc21e0 (Featire specs)
=======
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4d90e3d (Featire specs)
=======
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4d90e3d (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
                  (BooksController::PAGINATION_PER_PAGE * 2).times do
=======
                  24.times do
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
                  24.times do
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
>>>>>>> 9c0d812 (Featire specs)
=======
                  24.times do
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
                  24.times do
>>>>>>> 34509eee (Featire specs)
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
                  (BooksController::PAGINATION_PER_PAGE * 2).times do
=======
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> ed32b84 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
                  (BooksController::PAGINATION_PER_PAGE * 2).times do
=======
                  24.times do
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
                  24.times do
>>>>>>> 9c0d812 (Featire specs)
=======
                  24.times do
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
                  24.times do
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
                  (BooksController::PAGINATION_PER_PAGE * 2).times do
=======
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
>>>>>>> afa56d1 (Featire specs)
                  (BooksController::PAGINATION_PER_PAGE * 2).times do
=======
                  24.times do
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                  (BooksController::PAGINATION_PER_PAGE * 2).times do
=======
                  24.times do
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
                  24.times do
=======
                  (BooksController::PAGINATION_PER_PAGE * 2).times do
=======
                  24.times do
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
=======
                  24.times do
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
=======
                  24.times do
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                  (BooksController::PAGINATION_PER_PAGE * 2).times do
=======
<<<<<<< HEAD
                  24.times do
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
                  24.times do
>>>>>>> 9c0d812 (Featire specs)
=======
                  24.times do
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
=======
                  24.times do
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                  (BooksController::PAGINATION_PER_PAGE * 2).times do
=======
<<<<<<< HEAD
                  24.times do
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
                  24.times do
>>>>>>> 9c0d812 (Featire specs)
=======
                  24.times do
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
=======
                  24.times do
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
                  (BooksController::PAGINATION_PER_PAGE * 2).times do
=======
=======
=======
>>>>>>> 6da9530 (Featire specs)
>>>>>>> 0f8241bb (Featire specs)
                  (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do
>>>>>>> 752f0c0 (Featire specs)
=======
                  (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do
>>>>>>> 4e81ea2 (Featire specs)
=======
                  (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 84003439 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 416166f (Featire specs)
>>>>>>> a2206025 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9bfbd88 (Featire specs)
>>>>>>> 610b6138 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
>>>>>>> fc3774fd (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 9bfbd88 (Featire specs)
<<<<<<< HEAD
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 6da9530 (Featire specs)
=======
=======
                  (BooksController::PAGINATION_PER_PAGE * 2).times do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bb5c652 (Fix book_spec decrease quantity and price)
=======
=======
                  24.times do
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> 9a49b7b (Rebased)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
                  24.times do
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
                  24.times do
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> da3a9a3 (Featire specs)
>>>>>>> b5ac3004 (Featire specs)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
                  24.times do
>>>>>>> c033601 (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
>>>>>>> 3cf8dd4 (Featire specs)
>>>>>>> aa4361fd (Featire specs)
                  24.times do
=======
                  (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 216fe41 (Featire specs)
>>>>>>> f3d746cb (Featire specs)
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
=======
>>>>>>> 3e9f99d (Featire specs)
>>>>>>> 3cf8dd4 (Featire specs)
>>>>>>> aa4361fd (Featire specs)
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 70fcacc (Featire specs)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 009401d (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
                  (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ae409ca (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 416166f (Featire specs)
=======
=======
                  (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
>>>>>>> 379a979 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> adc21e0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
=======
=======
                  (BooksController::PAGINATION_PER_PAGE * 2).times do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 37e48018 (Featire specs)
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
=======
=======
=======
                  (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d90e3d (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
=======
=======
                  (BooksController::PAGINATION_PER_PAGE * 2).times do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                  (BooksController::PAGINATION_PER_PAGE * 2).times do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
                  (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                  (BooksController::PAGINATION_PER_PAGE * 2).times do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d90e3d (Featire specs)
<<<<<<< HEAD
>>>>>>> 37e48018 (Featire specs)
=======
=======
=======
=======
                  (BooksController::PAGINATION_PER_PAGE * 2).times do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                  (BooksController::PAGINATION_PER_PAGE * 2).times do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
                  (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
=======
                  (BooksController::PAGINATION_PER_PAGE * 2).times do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
=======
=======
                  (BooksController::PAGINATION_PER_PAGE * 2).times do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
                  (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
=======
=======
                  (BooksController::PAGINATION_PER_PAGE * 2).times do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
        1020. 
        
        
      
        
        
<<<<<<< HEAD
          
      1020. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      1021. 
=======
          
      1022. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
          
      1023. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
=======
=======
          
      1024. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      1025. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
          
      1026. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      1027. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
          
      1028. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      1029. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      1030. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      1031. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
          
      1032. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
          
      1033. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
          
      1034. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      1035. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
          
      1036. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
          
      1037. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
          
      1038. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
          
      1039. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
          
      1040. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
          
      1041. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            72
            

            

<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
                    books << create(:book)
          
        1042. 
        
        
      
        
        
          
      1042. 
            
            

            

                  end
          
        1043. 
        
        
      
        
        
          
      1043. 
            
            

            

                end
<<<<<<< HEAD
=======
=======
                    books << FactoryBot.create(:book)
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
                    books << FactoryBot.create(:book)
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
=======
=======
                    books << FactoryBot.create(:book)
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                    books << FactoryBot.create(:book)
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
                    books << FactoryBot.create(:book)
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                    books << FactoryBot.create(:book)
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
                    books << FactoryBot.create(:book)
>>>>>>> 4e81ea2 (Featire specs)
=======
                    books << FactoryBot.create(:book)
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
                    books << FactoryBot.create(:book)
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                    books << FactoryBot.create(:book)
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
                    books << FactoryBot.create(:book)
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
                    books << FactoryBot.create(:book)
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
                    books << FactoryBot.create(:book)
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                    books << FactoryBot.create(:book)
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
                    books << FactoryBot.create(:book)
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
                    books << FactoryBot.create(:book)
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
                    books << FactoryBot.create(:book)
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
                    books << FactoryBot.create(:book)
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
                    books << FactoryBot.create(:book)
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
                    books << FactoryBot.create(:book)
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
        1044. 
        
        
      
        
        
          
      1044. 
            
            

            

<<<<<<< HEAD
            
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            
=======
                  end
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
                  end
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
=======
=======
                  end
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                  end
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
                  end
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                  end
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
                  end
>>>>>>> 4e81ea2 (Featire specs)
=======
                  end
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
                  end
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  end
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
                  end
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
                  end
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
                  end
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  end
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
                  end
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
                  end
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
                  end
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
                  end
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
                  end
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
                  end
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
        1045. 
        
        
      
        
        
<<<<<<< HEAD
          
      1045. 
            4
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      1046. 
            4
=======
          
      1047. 
            
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
>>>>>>> 3e9f99d (Featire specs)
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
          
      1048. 
            
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 6b6d1c2d (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
=======
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
=======
>>>>>>> 416166f (Featire specs)
>>>>>>> a2206025 (Featire specs)
          
      1049. 
            
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      1050. 
            
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
          
      1051. 
            
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 37e48018 (Featire specs)
=======
          
      1052. 
            
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
          
      1053. 
            
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> fc3774fd (Featire specs)
            

            

<<<<<<< HEAD
                let(:books) { [] }
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
=======
          
      1054. 
            
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      1055. 
            
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
=======
          
      1056. 
            
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2612be03 (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2612be03 (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
          
      1057. 
            
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      1058. 
            
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
=======
          
      1059. 
            
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
>>>>>>> da3a9a3 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
                let(:books) { [] }
=======
                end
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
                end
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
=======
=======
                end
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                end
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
                end
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                end
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
                end
>>>>>>> 4e81ea2 (Featire specs)
=======
                end
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
                end
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                end
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
                end
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
                end
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
                end
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                end
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
                end
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
                end
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
                end
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
                end
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
                end
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
                end
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
        1060. 
        
        
      
        
        
          
      1060. 
            
            

            

            
          
        1061. 
        
        
      
        
        
<<<<<<< HEAD
          
      1061. 
            1
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      1062. 
            1
=======
          
      1063. 
            4
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
>>>>>>> 3e9f99d (Featire specs)
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
          
      1064. 
            4
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 6b6d1c2d (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
=======
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
=======
>>>>>>> 416166f (Featire specs)
>>>>>>> a2206025 (Featire specs)
          
      1065. 
            4
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      1066. 
            4
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
          
      1067. 
            4
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 37e48018 (Featire specs)
=======
          
      1068. 
            4
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
          
      1069. 
            4
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> fc3774fd (Featire specs)
            

            

<<<<<<< HEAD
                it 'show books without view more button' do
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
=======
          
      1070. 
            4
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      1071. 
            4
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
=======
          
      1072. 
            4
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2612be03 (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2612be03 (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
          
      1073. 
            4
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      1074. 
            4
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
=======
          
      1075. 
            4
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
>>>>>>> da3a9a3 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
                it 'show books without view more button' do
=======
                let(:books) { [] }
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
                let(:books) { [] }
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
=======
=======
                let(:books) { [] }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                let(:books) { [] }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
                let(:books) { [] }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                let(:books) { [] }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
                let(:books) { [] }
>>>>>>> 4e81ea2 (Featire specs)
=======
                let(:books) { [] }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
                let(:books) { [] }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                let(:books) { [] }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
                let(:books) { [] }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
                let(:books) { [] }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
                let(:books) { [] }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                let(:books) { [] }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
                let(:books) { [] }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
                let(:books) { [] }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
                let(:books) { [] }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
                let(:books) { [] }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
                let(:books) { [] }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
                let(:books) { [] }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
        1076. 
        
        
      
        
        
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      1076. 
            1
            

            

                  visit books_path
          
        1077. 
        
        
      
        
        
          
      1077. 
<<<<<<< HEAD
=======
=======
          
      1078. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
          
      1079. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
=======
=======
          
      1080. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      1081. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
          
      1082. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      1083. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
          
      1084. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      1085. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      1086. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      1087. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
          
      1088. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
          
      1089. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
          
      1090. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      1091. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
          
      1092. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
          
      1093. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
          
      1094. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
          
      1095. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
          
      1096. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
          
      1097. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            
            

            

            
          
        1098. 
        
        
      
        
        
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      1098. 
            1
            

            

                it 'show books without view more button' do
          
        1099. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 84809242 (Featire specs)
=======
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 9440753 (Featire specs)
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      1099. 
            1
            

            

<<<<<<< HEAD
                  find('a', id: 'view_more', class: 'view_more').click
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
                  find('a', id: 'view_more', class: 'view_more').click
=======
                  visit books_path
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
                  visit books_path
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
=======
=======
                  visit books_path
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                  visit books_path
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
                  visit books_path
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                  visit books_path
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
                  visit books_path
>>>>>>> 4e81ea2 (Featire specs)
=======
                  visit books_path
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
                  visit books_path
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  visit books_path
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
                  visit books_path
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
                  visit books_path
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
                  visit books_path
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  visit books_path
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
                  visit books_path
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
                  visit books_path
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
                  visit books_path
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
                  visit books_path
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
                  visit books_path
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
                  visit books_path
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
        1100. 
        
        
      
        
        
          
      1100. 
            
            

            

            
          
        1101. 
        
        
      
        
        
          
      1101. 
            1
            

            

<<<<<<< HEAD
                  expect(page).not_to have_css('a', class: 'view_more hidden', id: 'view_more')
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
                  expect(page).not_to have_css('a', class: 'view_more hidden', id: 'view_more')
=======
                  find('a', id: 'view_more', class: 'view_more').click
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
                  find('a', id: 'view_more', class: 'view_more').click
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
=======
=======
                  find('a', id: 'view_more', class: 'view_more').click
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                  find('a', id: 'view_more', class: 'view_more').click
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
                  find('a', id: 'view_more', class: 'view_more').click
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                  find('a', id: 'view_more', class: 'view_more').click
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
                  find('a', id: 'view_more', class: 'view_more').click
>>>>>>> 4e81ea2 (Featire specs)
=======
                  find('a', id: 'view_more', class: 'view_more').click
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
                  find('a', id: 'view_more', class: 'view_more').click
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  find('a', id: 'view_more', class: 'view_more').click
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
                  find('a', id: 'view_more', class: 'view_more').click
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
                  find('a', id: 'view_more', class: 'view_more').click
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
                  find('a', id: 'view_more', class: 'view_more').click
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  find('a', id: 'view_more', class: 'view_more').click
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
                  find('a', id: 'view_more', class: 'view_more').click
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
                  find('a', id: 'view_more', class: 'view_more').click
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
                  find('a', id: 'view_more', class: 'view_more').click
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
                  find('a', id: 'view_more', class: 'view_more').click
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
                  find('a', id: 'view_more', class: 'view_more').click
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
                  find('a', id: 'view_more', class: 'view_more').click
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
        1102. 
        
        
      
        
        
          
      1102. 
            
            

            

<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            
          
        1103. 
        
        
      
        
        
          
      1103. 
            1
            

            

                  expect(page).not_to have_css('a', class: 'view_more hidden', id: 'view_more')
          
        1104. 
        
        
      
        
        
          
      1104. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 84809242 (Featire specs)
=======
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 9440753 (Featire specs)
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
                end
          
        1105. 
        
        
      
        
        
<<<<<<< HEAD
          
      1105. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      1106. 
=======
          
      1107. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
          
      1108. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
=======
=======
          
      1109. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      1110. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
          
      1111. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      1112. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
          
      1113. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      1114. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      1115. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      1116. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
          
      1117. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
          
      1118. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
          
      1119. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      1120. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
          
      1121. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
          
      1122. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
          
      1123. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
          
      1124. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
          
      1125. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
          
      1126. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            
            

            

            
          
        1127. 
        
        
      
        
        
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      1127. 
            1
            

            

                context 'when view more' do
          
        1128. 
        
        
      
        
        
          
      1128. 
            1
            

            

                  it 'show books with view more button' do
          
        1129. 
        
        
      
        
        
<<<<<<< HEAD
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      1129. 
            1
            

            

<<<<<<< HEAD
                    visit books_path
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
                    visit books_path
=======
                context 'when view more' do
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
                context 'when view more' do
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
=======
=======
                context 'when view more' do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                context 'when view more' do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
                context 'when view more' do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                context 'when view more' do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
                context 'when view more' do
>>>>>>> 4e81ea2 (Featire specs)
=======
                context 'when view more' do
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
                context 'when view more' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                context 'when view more' do
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
                context 'when view more' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
                context 'when view more' do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
                context 'when view more' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                context 'when view more' do
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
                context 'when view more' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
                context 'when view more' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
                context 'when view more' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
                context 'when view more' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
                context 'when view more' do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
                context 'when view more' do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
        1130. 
        
        
      
        
        
<<<<<<< HEAD
          
      1130. 
            
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      1131. 
            
=======
          
      1132. 
            1
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
>>>>>>> 3e9f99d (Featire specs)
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
          
      1133. 
            1
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 6b6d1c2d (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
=======
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
=======
>>>>>>> 416166f (Featire specs)
>>>>>>> a2206025 (Featire specs)
          
      1134. 
            1
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      1135. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
          
      1136. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 37e48018 (Featire specs)
=======
          
      1137. 
            1
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
          
      1138. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> fc3774fd (Featire specs)
            

            

<<<<<<< HEAD
            
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
=======
          
      1139. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      1140. 
            1
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
=======
          
      1141. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2612be03 (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2612be03 (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
          
      1142. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      1143. 
            1
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
=======
          
      1144. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
>>>>>>> da3a9a3 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            
=======
                  it 'show books with view more button' do
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
                  it 'show books with view more button' do
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
=======
=======
                  it 'show books with view more button' do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                  it 'show books with view more button' do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
                  it 'show books with view more button' do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                  it 'show books with view more button' do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
                  it 'show books with view more button' do
>>>>>>> 4e81ea2 (Featire specs)
=======
                  it 'show books with view more button' do
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
                  it 'show books with view more button' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it 'show books with view more button' do
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
                  it 'show books with view more button' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
                  it 'show books with view more button' do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
                  it 'show books with view more button' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it 'show books with view more button' do
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
                  it 'show books with view more button' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
                  it 'show books with view more button' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
                  it 'show books with view more button' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
                  it 'show books with view more button' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
                  it 'show books with view more button' do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
                  it 'show books with view more button' do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
        1145. 
        
        
      
        
        
          
      1145. 
            1
            

            

<<<<<<< HEAD
                    expect(page).to have_css('a', class: 'view_more')
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
                    expect(page).to have_css('a', class: 'view_more')
=======
                    visit books_path
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
                    visit books_path
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
=======
=======
                    visit books_path
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                    visit books_path
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
                    visit books_path
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                    visit books_path
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
                    visit books_path
>>>>>>> 4e81ea2 (Featire specs)
=======
                    visit books_path
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
                    visit books_path
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                    visit books_path
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
                    visit books_path
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
                    visit books_path
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
                    visit books_path
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                    visit books_path
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
                    visit books_path
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
                    visit books_path
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
                    visit books_path
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
                    visit books_path
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
                    visit books_path
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
                    visit books_path
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
        1146. 
        
        
      
        
        
          
      1146. 
            
            

            

<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            
          
        1147. 
        
        
      
        
        
          
      1147. 
            1
            

            

                    expect(page).to have_css('a', class: 'view_more')
          
        1148. 
        
        
      
        
        
          
      1148. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 84809242 (Featire specs)
=======
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 9440753 (Featire specs)
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
                  end
          
        1149. 
        
        
      
        
        
<<<<<<< HEAD
          
      1149. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      1150. 
=======
          
      1151. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
          
      1152. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
=======
=======
          
      1153. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      1154. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
          
      1155. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      1156. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
          
      1157. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      1158. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      1159. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      1160. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
          
      1161. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
          
      1162. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
          
      1163. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      1164. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
          
      1165. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
          
      1166. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
          
      1167. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
          
      1168. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
          
      1169. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
          
      1170. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            
            

            

            
          
        1171. 
        
        
      
        
        
<<<<<<< HEAD
          
      1171. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      1172. 
=======
          
      1173. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
          
      1174. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
=======
=======
          
      1175. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      1176. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
          
      1177. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      1178. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
          
      1179. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      1180. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      1181. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      1182. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
          
      1183. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
          
      1184. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
          
      1185. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      1186. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
          
      1187. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
          
      1188. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
          
      1189. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
          
      1190. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
          
      1191. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
          
      1192. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            1
            

            

                  it 'show loaded books', js: true do
          
        1193. 
        
        
      
        
        
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      1193. 
            1
            

            

                    visit books_path
          
        1194. 
        
        
      
        
        
          
      1194. 
            
            

            

            
          
        1195. 
        
        
      
        
        
<<<<<<< HEAD
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      1195. 
            1
            

            

<<<<<<< HEAD
                    find('a', class: 'view_more').click
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
                    find('a', class: 'view_more').click
=======
                    visit books_path
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
                    visit books_path
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
=======
=======
                    visit books_path
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                    visit books_path
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
                    visit books_path
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                    visit books_path
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
                    visit books_path
>>>>>>> 4e81ea2 (Featire specs)
=======
                    visit books_path
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
                    visit books_path
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                    visit books_path
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
                    visit books_path
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
                    visit books_path
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
                    visit books_path
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                    visit books_path
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
                    visit books_path
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
                    visit books_path
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
                    visit books_path
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
                    visit books_path
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
                    visit books_path
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
                    visit books_path
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
        1196. 
        
        
      
        
        
          
      1196. 
            
            

            

            
          
        1197. 
        
        
      
        
        
          
      1197. 
            1
            

            

<<<<<<< HEAD
                    expect(page).to have_content(books.last.title)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
                    expect(page).to have_content(books.last.title)
=======
                    find('a', id: 'view_more', class: 'view_more').click
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
                    find('a', id: 'view_more', class: 'view_more').click
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
=======
=======
                    find('a', id: 'view_more', class: 'view_more').click
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                    find('a', id: 'view_more', class: 'view_more').click
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
                    find('a', id: 'view_more', class: 'view_more').click
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                    find('a', id: 'view_more', class: 'view_more').click
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
                    find('a', id: 'view_more', class: 'view_more').click
>>>>>>> 4e81ea2 (Featire specs)
=======
                    find('a', id: 'view_more', class: 'view_more').click
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
                    find('a', id: 'view_more', class: 'view_more').click
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                    find('a', id: 'view_more', class: 'view_more').click
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
                    find('a', id: 'view_more', class: 'view_more').click
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
                    find('a', id: 'view_more', class: 'view_more').click
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
                    find('a', id: 'view_more', class: 'view_more').click
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                    find('a', id: 'view_more', class: 'view_more').click
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
                    find('a', id: 'view_more', class: 'view_more').click
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
                    find('a', id: 'view_more', class: 'view_more').click
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
                    find('a', id: 'view_more', class: 'view_more').click
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
                    find('a', id: 'view_more', class: 'view_more').click
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
                    find('a', id: 'view_more', class: 'view_more').click
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
                    find('a', id: 'view_more', class: 'view_more').click
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
        1198. 
        
        
      
        
        
          
      1198. 
            
            

            

<<<<<<< HEAD
                  end
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
                  end
=======
            
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
            
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
=======
=======
            
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
            
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
            
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
            
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
            
>>>>>>> 4e81ea2 (Featire specs)
=======
            
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
            
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
            
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
            
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
            
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
            
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
            
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
            
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
            
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
            
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
            
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
            
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
            
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
        1199. 
        
        
      
        
        
<<<<<<< HEAD
          
      1199. 
            
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      1200. 
            
=======
          
      1201. 
            1
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
>>>>>>> 3e9f99d (Featire specs)
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
          
      1202. 
            1
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 6b6d1c2d (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
=======
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
=======
>>>>>>> 416166f (Featire specs)
>>>>>>> a2206025 (Featire specs)
          
      1203. 
            1
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      1204. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
          
      1205. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 37e48018 (Featire specs)
=======
          
      1206. 
            1
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
          
      1207. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> fc3774fd (Featire specs)
            

            

<<<<<<< HEAD
                end
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
=======
          
      1208. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      1209. 
            1
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
=======
          
      1210. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2612be03 (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2612be03 (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
          
      1211. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      1212. 
            1
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
=======
          
      1213. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
>>>>>>> da3a9a3 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
                end
=======
                    expect(page).to have_content(books.last.title)
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
                    expect(page).to have_content(books.last.title)
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
=======
=======
                    expect(page).to have_content(books.last.title)
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                    expect(page).to have_content(books.last.title)
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
                    expect(page).to have_content(books.last.title)
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                    expect(page).to have_content(books.last.title)
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
                    expect(page).to have_content(books.last.title)
>>>>>>> 4e81ea2 (Featire specs)
=======
                    expect(page).to have_content(books.last.title)
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
                    expect(page).to have_content(books.last.title)
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                    expect(page).to have_content(books.last.title)
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
                    expect(page).to have_content(books.last.title)
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
                    expect(page).to have_content(books.last.title)
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
                    expect(page).to have_content(books.last.title)
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                    expect(page).to have_content(books.last.title)
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
                    expect(page).to have_content(books.last.title)
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
                    expect(page).to have_content(books.last.title)
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
                    expect(page).to have_content(books.last.title)
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
                    expect(page).to have_content(books.last.title)
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
                    expect(page).to have_content(books.last.title)
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
                    expect(page).to have_content(books.last.title)
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
        1214. 
        
        
      
        
        
          
      1214. 
            
            

            

<<<<<<< HEAD
              end
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
              end
=======
                  end
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
                  end
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
=======
=======
                  end
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                  end
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
                  end
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                  end
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
                  end
>>>>>>> 4e81ea2 (Featire specs)
=======
                  end
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
                  end
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  end
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
                  end
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
                  end
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
                  end
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  end
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
                  end
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
                  end
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
                  end
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
                  end
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
                  end
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
                  end
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
        1215. 
        
        
      
        
        
          
      1215. 
            
            

            

<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
                end
          
        1216. 
        
        
      
        
        
          
      1216. 
            
            

            

              end
          
        1217. 
        
        
      
        
        
          
      1217. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 84809242 (Featire specs)
=======
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 9440753 (Featire specs)
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            
          
        1218. 
        
        
      
        
        
<<<<<<< HEAD
          
      1218. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      1219. 
=======
          
      1220. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
          
      1221. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
=======
=======
          
      1222. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      1223. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
          
      1224. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      1225. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
          
      1226. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      1227. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      1228. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      1229. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
          
      1230. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
          
      1231. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
          
      1232. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      1233. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
          
      1234. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
          
      1235. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
          
      1236. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
          
      1237. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
          
      1238. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
          
      1239. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            1
            

            

              describe 'sort' do
          
        1240. 
        
        
      
        
        
<<<<<<< HEAD
          
      1240. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      1241. 
=======
          
      1242. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
          
      1243. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
=======
=======
          
      1244. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      1245. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
          
      1246. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      1247. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
          
      1248. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      1249. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      1250. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      1251. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
          
      1252. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
          
      1253. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
          
      1254. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      1255. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
          
      1256. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
          
      1257. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
          
      1258. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
          
      1259. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
          
      1260. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
          
      1261. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            1
            

            

                shared_examples 'sort test' do
          
        1262. 
        
        
      
        
        
<<<<<<< HEAD
          
      1262. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      1263. 
=======
          
      1264. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
          
      1265. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
=======
=======
          
      1266. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      1267. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
          
      1268. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      1269. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
          
      1270. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      1271. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      1272. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      1273. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
          
      1274. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
          
      1275. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
          
      1276. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      1277. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
          
      1278. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
          
      1279. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
          
      1280. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
          
      1281. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
          
      1282. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
          
      1283. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            5
            

            

                  it 'sort books' do
          
        1284. 
        
        
      
        
        
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      1284. 
            5
            

            

                    create(:book, title: 'Zimbabwe', price_cents: 75,
          
        1285. 
        
        
      
        
        
          
      1285. 
            
            

            

                                  created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
          
        1286. 
        
        
      
        
        
<<<<<<< HEAD
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      1286. 
            5
            

            

<<<<<<< HEAD
                    create(:book, title: 'Anna', price_cents: 23,
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
                    create(:book, title: 'Anna', price_cents: 23,
=======
                    FactoryBot.create(:book, title: 'Zimbabwe', price: 75,
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
                    FactoryBot.create(:book, title: 'Zimbabwe', price: 75,
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
=======
=======
                    FactoryBot.create(:book, title: 'Zimbabwe', price: 75,
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                    FactoryBot.create(:book, title: 'Zimbabwe', price: 75,
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
                    FactoryBot.create(:book, title: 'Zimbabwe', price: 75,
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                    FactoryBot.create(:book, title: 'Zimbabwe', price: 75,
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
                    FactoryBot.create(:book, title: 'Zimbabwe', price: 75,
>>>>>>> 4e81ea2 (Featire specs)
=======
                    FactoryBot.create(:book, title: 'Zimbabwe', price: 75,
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
                    FactoryBot.create(:book, title: 'Zimbabwe', price: 75,
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                    FactoryBot.create(:book, title: 'Zimbabwe', price: 75,
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
                    FactoryBot.create(:book, title: 'Zimbabwe', price: 75,
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
                    FactoryBot.create(:book, title: 'Zimbabwe', price: 75,
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
                    FactoryBot.create(:book, title: 'Zimbabwe', price: 75,
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                    FactoryBot.create(:book, title: 'Zimbabwe', price: 75,
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
                    FactoryBot.create(:book, title: 'Zimbabwe', price: 75,
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
                    FactoryBot.create(:book, title: 'Zimbabwe', price: 75,
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
                    FactoryBot.create(:book, title: 'Zimbabwe', price: 75,
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
                    FactoryBot.create(:book, title: 'Zimbabwe', price: 75,
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
                    FactoryBot.create(:book, title: 'Zimbabwe', price: 75,
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
                    FactoryBot.create(:book, title: 'Zimbabwe', price: 75,
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
        1287. 
        
        
      
        
        
          
      1287. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
                                  created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00')
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                                  created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00')
=======
=======
>>>>>>> 9a49b7b (Rebased)
=======
>>>>>>> 70fcacc (Featire specs)
=======
>>>>>>> ae409ca (Featire specs)
=======
>>>>>>> 379a979 (Featire specs)
=======
>>>>>>> adc21e0 (Featire specs)
=======
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4d90e3d (Featire specs)
=======
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4d90e3d (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
                                             created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
=======
                                  created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00')
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
                                  created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00')
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
>>>>>>> 9c0d812 (Featire specs)
=======
                                  created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00')
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
                                  created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00')
>>>>>>> 34509eee (Featire specs)
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
                                             created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
=======
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> ed32b84 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
                                             created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
=======
                                  created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00')
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
                                  created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00')
>>>>>>> 9c0d812 (Featire specs)
=======
                                  created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00')
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
                                  created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00')
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
                                             created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
=======
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
>>>>>>> afa56d1 (Featire specs)
                                             created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
=======
                                  created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00')
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                                             created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
=======
                                  created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00')
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
                                  created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00')
=======
                                             created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
=======
                                  created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00')
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
=======
                                  created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00')
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
=======
                                  created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00')
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                                             created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
=======
<<<<<<< HEAD
                                  created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00')
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
                                  created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00')
>>>>>>> 9c0d812 (Featire specs)
=======
                                  created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00')
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
=======
                                  created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00')
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                                             created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
=======
<<<<<<< HEAD
                                  created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00')
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
                                  created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00')
>>>>>>> 9c0d812 (Featire specs)
=======
                                  created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00')
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
=======
                                  created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00')
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
                                             created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
=======
=======
=======
>>>>>>> 6da9530 (Featire specs)
>>>>>>> 0f8241bb (Featire specs)
                                      created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
>>>>>>> 752f0c0 (Featire specs)
=======
                                      created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
>>>>>>> 4e81ea2 (Featire specs)
=======
                                      created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 84003439 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 416166f (Featire specs)
>>>>>>> a2206025 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9bfbd88 (Featire specs)
>>>>>>> 610b6138 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
>>>>>>> fc3774fd (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 9bfbd88 (Featire specs)
<<<<<<< HEAD
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 6da9530 (Featire specs)
=======
=======
                                             created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bb5c652 (Fix book_spec decrease quantity and price)
=======
=======
                                  created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00')
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> 9a49b7b (Rebased)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
                                  created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00')
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
                                  created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00')
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> da3a9a3 (Featire specs)
>>>>>>> b5ac3004 (Featire specs)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
                                  created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00')
>>>>>>> c033601 (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
>>>>>>> 3cf8dd4 (Featire specs)
>>>>>>> aa4361fd (Featire specs)
                                  created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00')
=======
                                      created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 216fe41 (Featire specs)
>>>>>>> f3d746cb (Featire specs)
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
=======
>>>>>>> 3e9f99d (Featire specs)
>>>>>>> 3cf8dd4 (Featire specs)
>>>>>>> aa4361fd (Featire specs)
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 70fcacc (Featire specs)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 009401d (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
                                      created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ae409ca (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 416166f (Featire specs)
=======
=======
                                      created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
>>>>>>> 379a979 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> adc21e0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
=======
=======
                                             created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 37e48018 (Featire specs)
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
=======
=======
=======
                                      created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d90e3d (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
=======
=======
                                             created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                                             created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
                                      created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                                             created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d90e3d (Featire specs)
<<<<<<< HEAD
>>>>>>> 37e48018 (Featire specs)
=======
=======
=======
=======
                                             created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
                                             created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
                                      created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
=======
                                             created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
=======
=======
                                             created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
                                      created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
=======
=======
                                             created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
        1288. 
        
        
      
        
        
<<<<<<< HEAD
          
      1288. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 009401d (Featire specs)
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 4d4cf6b4 (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      1289. 
=======
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
<<<<<<< HEAD
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
<<<<<<< HEAD
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
          
      1290. 
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> e1ecabbe (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 4d4cf6b4 (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
          
      1291. 
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
          
      1292. 
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      1293. 
            5
            

            

                    FactoryBot.create(:book, title: 'Anna', price: 23, created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00')
          
        1294. 
        
        
      
        
        
          
      1294. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 84809242 (Featire specs)
=======
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 9440753 (Featire specs)
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            
            

            

            
          
        1295. 
        
        
      
        
        
<<<<<<< HEAD
          
      1295. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      1296. 
=======
          
      1297. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
          
      1298. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
=======
=======
          
      1299. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      1300. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
          
      1301. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      1302. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
          
      1303. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      1304. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      1305. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      1306. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
          
      1307. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
          
      1308. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
          
      1309. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      1310. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
          
      1311. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
          
      1312. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
          
      1313. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
          
      1314. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
          
      1315. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
          
      1316. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            5
            

            

                    visit books_path
          
        1317. 
        
        
      
        
        
<<<<<<< HEAD
          
      1317. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      1318. 
=======
          
      1319. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
          
      1320. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
=======
=======
          
      1321. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      1322. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
          
      1323. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      1324. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
          
      1325. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      1326. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      1327. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      1328. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
          
      1329. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
          
      1330. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
          
      1331. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      1332. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
          
      1333. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
          
      1334. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
          
      1335. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
          
      1336. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
          
      1337. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
          
      1338. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            
            

            

            
          
        1339. 
        
        
      
        
        
<<<<<<< HEAD
          
      1339. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      1340. 
=======
          
      1341. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
          
      1342. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
=======
=======
          
      1343. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      1344. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
          
      1345. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      1346. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
          
      1347. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      1348. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      1349. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      1350. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
          
      1351. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
          
      1352. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
          
      1353. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      1354. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
          
      1355. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
          
      1356. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
          
      1357. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
          
      1358. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
          
      1359. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
          
      1360. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            5
            

            

<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
                    find('a', class: 'dropdown-toggle lead small', text: I18n.t('catalog_page.sorting.newer_first'),
          
        1361. 
        
        
      
        
        
          
      1361. 
            
            

            

                              id: 'menu').click
<<<<<<< HEAD
=======
=======
                    find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
                    find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
=======
=======
                    find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                    find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
                    find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                    find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
                    find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click
>>>>>>> 4e81ea2 (Featire specs)
=======
                    find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
                    find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                    find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
                    find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
                    find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
                    find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                    find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
                    find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
                    find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
                    find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
                    find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
                    find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
                    find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
        1362. 
        
        
      
        
        
          
      1362. 
            
            

            

            
          
        1363. 
        
        
      
        
        
          
      1363. 
            5
            

            

                    within 'ul', class: 'dropdown-menu', id: 'sort' do
          
        1364. 
        
        
      
        
        
          
      1364. 
            5
            

            

                      click_link button
          
        1365. 
        
        
      
        
        
          
      1365. 
            
            

            

                    end
          
        1366. 
        
        
      
        
        
          
      1366. 
            5
            

            

                    expect(find('.col-xs-6.col-sm-3', match: :first)).to have_content(book_title)
          
        1367. 
        
        
      
        
        
          
      1367. 
            
            

            

                  end
          
        1368. 
        
        
      
        
        
          
      1368. 
            
            

            

                end
          
        1369. 
        
        
      
        
        
          
      1369. 
            
            

            

            
          
        1370. 
        
        
      
        
        
          
      1370. 
            1
            

            

                context 'when sort by title A to Z' do
          
        1371. 
        
        
      
        
        
          
      1371. 
            2
            

            

<<<<<<< HEAD
                  let(:button) { I18n.t('catalog_page.sorting.title.asc') }
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
                  let(:button) { I18n.t('catalog_page.sorting.title.asc') }
=======
                  let(:button) { 'Title: A to Z' }
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
                  let(:button) { 'Title: A to Z' }
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
=======
=======
                  let(:button) { 'Title: A to Z' }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                  let(:button) { 'Title: A to Z' }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
                  let(:button) { 'Title: A to Z' }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                  let(:button) { 'Title: A to Z' }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
                  let(:button) { 'Title: A to Z' }
>>>>>>> 4e81ea2 (Featire specs)
=======
                  let(:button) { 'Title: A to Z' }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
                  let(:button) { 'Title: A to Z' }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  let(:button) { 'Title: A to Z' }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
                  let(:button) { 'Title: A to Z' }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
                  let(:button) { 'Title: A to Z' }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
                  let(:button) { 'Title: A to Z' }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  let(:button) { 'Title: A to Z' }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
                  let(:button) { 'Title: A to Z' }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
                  let(:button) { 'Title: A to Z' }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
                  let(:button) { 'Title: A to Z' }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
                  let(:button) { 'Title: A to Z' }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
                  let(:button) { 'Title: A to Z' }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
                  let(:button) { 'Title: A to Z' }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
        1372. 
        
        
      
        
        
          
      1372. 
            2
            

            

                  let(:book_title) { 'Anna' }
          
        1373. 
        
        
      
        
        
          
      1373. 
            
            

            

            
          
        1374. 
        
        
      
        
        
          
      1374. 
            1
            

            

                  include_examples 'sort test'
          
        1375. 
        
        
      
        
        
          
      1375. 
            
            

            

                end
          
        1376. 
        
        
      
        
        
          
      1376. 
            
            

            

            
          
        1377. 
        
        
      
        
        
          
      1377. 
            1
            

            

                context 'when sort by title Z to A' do
          
        1378. 
        
        
      
        
        
          
      1378. 
            2
            

            

<<<<<<< HEAD
                  let(:button) { I18n.t('catalog_page.sorting.title.desc') }
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
                  let(:button) { I18n.t('catalog_page.sorting.title.desc') }
=======
                  let(:button) { 'Title: Z to A' }
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
                  let(:button) { 'Title: Z to A' }
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
=======
=======
                  let(:button) { 'Title: Z to A' }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                  let(:button) { 'Title: Z to A' }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
                  let(:button) { 'Title: Z to A' }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                  let(:button) { 'Title: Z to A' }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
                  let(:button) { 'Title: Z to A' }
>>>>>>> 4e81ea2 (Featire specs)
=======
                  let(:button) { 'Title: Z to A' }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
                  let(:button) { 'Title: Z to A' }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  let(:button) { 'Title: Z to A' }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
                  let(:button) { 'Title: Z to A' }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
                  let(:button) { 'Title: Z to A' }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
                  let(:button) { 'Title: Z to A' }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  let(:button) { 'Title: Z to A' }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
                  let(:button) { 'Title: Z to A' }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
                  let(:button) { 'Title: Z to A' }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
                  let(:button) { 'Title: Z to A' }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
                  let(:button) { 'Title: Z to A' }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
                  let(:button) { 'Title: Z to A' }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
                  let(:button) { 'Title: Z to A' }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
        1379. 
        
        
      
        
        
          
      1379. 
            2
            

            

                  let(:book_title) { 'Zimbabwe' }
          
        1380. 
        
        
      
        
        
          
      1380. 
            
            

            

            
          
        1381. 
        
        
      
        
        
          
      1381. 
            1
            

            

                  include_examples 'sort test'
          
        1382. 
        
        
      
        
        
          
      1382. 
            
            

            

                end
          
        1383. 
        
        
      
        
        
          
      1383. 
            
            

            

            
          
        1384. 
        
        
      
        
        
          
      1384. 
            1
            

            

                context 'when sort by price High to Low' do
          
        1385. 
        
        
      
        
        
          
      1385. 
            2
            

            

<<<<<<< HEAD
                  let(:button) { I18n.t('catalog_page.sorting.price.desc') }
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
                  let(:button) { I18n.t('catalog_page.sorting.price.desc') }
=======
                  let(:button) { 'Price: High to Low' }
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
                  let(:button) { 'Price: High to Low' }
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
=======
=======
                  let(:button) { 'Price: High to Low' }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                  let(:button) { 'Price: High to Low' }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
                  let(:button) { 'Price: High to Low' }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                  let(:button) { 'Price: High to Low' }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
                  let(:button) { 'Price: High to Low' }
>>>>>>> 4e81ea2 (Featire specs)
=======
                  let(:button) { 'Price: High to Low' }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
                  let(:button) { 'Price: High to Low' }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  let(:button) { 'Price: High to Low' }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
                  let(:button) { 'Price: High to Low' }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
                  let(:button) { 'Price: High to Low' }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
                  let(:button) { 'Price: High to Low' }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  let(:button) { 'Price: High to Low' }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
                  let(:button) { 'Price: High to Low' }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
                  let(:button) { 'Price: High to Low' }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
                  let(:button) { 'Price: High to Low' }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
                  let(:button) { 'Price: High to Low' }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
                  let(:button) { 'Price: High to Low' }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
                  let(:button) { 'Price: High to Low' }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
        1386. 
        
        
      
        
        
          
      1386. 
            2
            

            

                  let(:book_title) { 'Zimbabwe' }
          
        1387. 
        
        
      
        
        
          
      1387. 
            
            

            

            
          
        1388. 
        
        
      
        
        
          
      1388. 
            1
            

            

                  include_examples 'sort test'
          
        1389. 
        
        
      
        
        
          
      1389. 
            
            

            

                end
          
        1390. 
        
        
      
        
        
          
      1390. 
            
            

            

            
          
        1391. 
        
        
      
        
        
          
      1391. 
            1
            

            

                context 'when sort by price Low to High' do
          
        1392. 
        
        
      
        
        
          
      1392. 
            2
            

            

<<<<<<< HEAD
                  let(:button) { I18n.t('catalog_page.sorting.price.asc') }
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
                  let(:button) { I18n.t('catalog_page.sorting.price.asc') }
=======
                  let(:button) { 'Price: Low to High' }
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
                  let(:button) { 'Price: Low to High' }
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
=======
=======
                  let(:button) { 'Price: Low to High' }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                  let(:button) { 'Price: Low to High' }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
                  let(:button) { 'Price: Low to High' }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                  let(:button) { 'Price: Low to High' }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
                  let(:button) { 'Price: Low to High' }
>>>>>>> 4e81ea2 (Featire specs)
=======
                  let(:button) { 'Price: Low to High' }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
                  let(:button) { 'Price: Low to High' }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  let(:button) { 'Price: Low to High' }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
                  let(:button) { 'Price: Low to High' }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
                  let(:button) { 'Price: Low to High' }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
                  let(:button) { 'Price: Low to High' }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  let(:button) { 'Price: Low to High' }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
                  let(:button) { 'Price: Low to High' }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
                  let(:button) { 'Price: Low to High' }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
                  let(:button) { 'Price: Low to High' }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
                  let(:button) { 'Price: Low to High' }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
                  let(:button) { 'Price: Low to High' }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
                  let(:button) { 'Price: Low to High' }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
        1393. 
        
        
      
        
        
          
      1393. 
            2
            

            

                  let(:book_title) { 'Anna' }
          
        1394. 
        
        
      
        
        
          
      1394. 
            
            

            

            
          
        1395. 
        
        
      
        
        
          
      1395. 
            1
            

            

                  include_examples 'sort test'
          
        1396. 
        
        
      
        
        
          
      1396. 
            
            

            

                end
          
        1397. 
        
        
      
        
        
          
      1397. 
            
            

            

            
          
        1398. 
        
        
      
        
        
          
      1398. 
            1
            

            

                context 'when sort by newest' do
          
        1399. 
        
        
      
        
        
          
      1399. 
            2
            

            

<<<<<<< HEAD
                  let(:button) { I18n.t('catalog_page.sorting.newer_first') }
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
                  let(:button) { I18n.t('catalog_page.sorting.newer_first') }
=======
                  let(:button) { 'Newest first' }
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
                  let(:button) { 'Newest first' }
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
=======
=======
                  let(:button) { 'Newest first' }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                  let(:button) { 'Newest first' }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
                  let(:button) { 'Newest first' }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
                  let(:button) { 'Newest first' }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
                  let(:button) { 'Newest first' }
>>>>>>> 4e81ea2 (Featire specs)
=======
                  let(:button) { 'Newest first' }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
                  let(:button) { 'Newest first' }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  let(:button) { 'Newest first' }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
                  let(:button) { 'Newest first' }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
                  let(:button) { 'Newest first' }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
                  let(:button) { 'Newest first' }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  let(:button) { 'Newest first' }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
                  let(:button) { 'Newest first' }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
                  let(:button) { 'Newest first' }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
                  let(:button) { 'Newest first' }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
                  let(:button) { 'Newest first' }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
                  let(:button) { 'Newest first' }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
                  let(:button) { 'Newest first' }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
        1400. 
        
        
      
        
        
          
      1400. 
            2
            

            

                  let(:book_title) { 'Zimbabwe' }
          
        1401. 
        
        
      
        
        
          
      1401. 
            
            

            

            
          
        1402. 
        
        
      
        
        
          
      1402. 
            1
            

            

                  include_examples 'sort test'
          
        1403. 
        
        
      
        
        
          
      1403. 
            
            

            

                end
          
        1404. 
        
        
      
        
        
          
      1404. 
            
            

            

              end
          
        1405. 
        
        
      
        
        
          
      1405. 
            
            

            

            end
          
        1406. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/feature/home_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
      49 relevant lines.
      49 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            RSpec.describe 'Home', type: :feature do
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

              include_context 'with api request authentication helper methods'
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

              include_context 'with api request global before and after hooks'
          
        4. 
        
        
      
        
        
          
      4. 
            
            

            

            
          
        5. 
        
        
      
        
        
          
      5. 
            1
            

            

              describe 'Get Started' do
          
        6. 
        
        
      
        
        
          
      6. 
            1
            

            

                it 'on click move to catalog page' do
          
        7. 
        
        
      
        
        
          
      7. 
            1
            

            

                  visit root_path
          
        8. 
        
        
      
        
        
          
      8. 
            
            

            

            
          
        9. 
        
        
      
        
        
          
      9. 
            1
            

            

                  click_on 'Get Started'
          
        10. 
        
        
      
        
        
          
      10. 
            
            

            

            
          
        11. 
        
        
      
        
        
          
      11. 
            1
            

            

                  expect(page).to have_content('Catalog')
          
        12. 
        
        
      
        
        
          
      12. 
            
            

            

                end
          
        13. 
        
        
      
        
        
          
      13. 
            
            

            

              end
          
        14. 
        
        
      
        
        
          
      14. 
            
            

            

            
          
        15. 
        
        
      
        
        
          
      15. 
            1
            

            

              describe 'navbar' do
          
        16. 
        
        
      
        
        
          
      16. 
            2
            

            

                let(:books_category) { create(:books_category) }
          
        17. 
        
        
      
        
        
          
      17. 
            
            

            

            
          
        18. 
        
        
      
        
        
          
      18. 
            1
            

            

                it 'on click home move to root-path' do
          
        19. 
        
        
      
        
        
          
      19. 
            1
            

            

                  visit books_path
          
        20. 
        
        
      
        
        
          
      20. 
            
            

            

            
          
        21. 
        
        
      
        
        
          
      21. 
            1
            

            

                  find('a', id: 'root').click
          
        22. 
        
        
      
        
        
          
      22. 
            
            

            

            
          
        23. 
        
        
      
        
        
          
      23. 
            1
            

            

                  expect(page).to have_content('Get Started')
          
        24. 
        
        
      
        
        
          
      24. 
            
            

            

                end
          
        25. 
        
        
      
        
        
          
      25. 
            
            

            

            
          
        26. 
        
        
      
        
        
          
      26. 
            1
            

            

                it 'on click category name move to root-path with books that belong to this category' do
          
        27. 
        
        
      
        
        
          
      27. 
            1
            

            

                  books_category
          
        28. 
        
        
      
        
        
          
      28. 
            
            

            

            
          
        29. 
        
        
      
        
        
          
      29. 
            1
            

            

                  visit root_path
          
        30. 
        
        
      
        
        
          
      30. 
            
            

            

            
          
        31. 
        
        
      
        
        
          
      31. 
            1
            

            

                  find('a', class: 'dropdown-toggle', text: 'Shop').click
          
        32. 
        
        
      
        
        
          
      32. 
            
            

            

            
          
        33. 
        
        
      
        
        
          
      33. 
            1
            

            

                  within('ul', id: 'nav') do
          
        34. 
        
        
      
        
        
          
      34. 
            1
            

            

                    find('a', class: 'collapse-link', text: books_category.category.name).click
          
        35. 
        
        
      
        
        
          
      35. 
            
            

            

                  end
          
        36. 
        
        
      
        
        
          
      36. 
            
            

            

            
          
        37. 
        
        
      
        
        
          
      37. 
            1
            

            

                  expect(page).to have_content(books_category.category.books.first.title)
          
        38. 
        
        
      
        
        
          
      38. 
            
            

            

                end
          
        39. 
        
        
      
        
        
          
      39. 
            
            

            

            
          
        40. 
        
        
      
        
        
          
      40. 
            1
            

            

                context 'when guest' do
          
        41. 
        
        
      
        
        
          
      41. 
            1
            

            

                  it 'on click login go to login page' do
          
        42. 
        
        
      
        
        
          
      42. 
            1
            

            

                    visit root_path
          
        43. 
        
        
      
        
        
          
      43. 
            
            

            

            
          
        44. 
        
        
      
        
        
          
      44. 
            1
            

            

                    within 'div', class: 'visible-xs' do
          
        45. 
        
        
      
        
        
          
      45. 
            1
            

            

                      click_link I18n.t('header.log_in')
          
        46. 
        
        
      
        
        
          
      46. 
            
            

            

                    end
          
        47. 
        
        
      
        
        
          
      47. 
            
            

            

            
          
        48. 
        
        
      
        
        
          
      48. 
            1
            

            

                    expect(page).to have_content(I18n.t('header.log_in'))
          
        49. 
        
        
      
        
        
          
      49. 
            
            

            

                  end
          
        50. 
        
        
      
        
        
          
      50. 
            
            

            

            
          
        51. 
        
        
      
        
        
          
      51. 
            1
            

            

                  it 'on click sing up go to sing up page' do
          
        52. 
        
        
      
        
        
          
      52. 
            1
            

            

                    visit root_path
          
        53. 
        
        
      
        
        
          
      53. 
            
            

            

            
          
        54. 
        
        
      
        
        
          
      54. 
            1
            

            

                    within 'div', class: 'visible-xs' do
          
        55. 
        
        
      
        
        
          
      55. 
            1
            

            

                      click_link I18n.t('header.sing_up')
          
        56. 
        
        
      
        
        
          
      56. 
            
            

            

                    end
          
        57. 
        
        
      
        
        
          
      57. 
            
            

            

            
          
        58. 
        
        
      
        
        
          
      58. 
            1
            

            

                    expect(page).to have_content(I18n.t('header.sing_up'))
          
        59. 
        
        
      
        
        
          
      59. 
            
            

            

                  end
          
        60. 
        
        
      
        
        
          
      60. 
            
            

            

                end
          
        61. 
        
        
      
        
        
          
      61. 
            
            

            

            
          
        62. 
        
        
      
        
        
          
      62. 
            1
            

            

                context 'when user', js: true do
          
        63. 
        
        
      
        
        
          
      63. 
            4
            

            

                  let(:user) { create(:user) }
          
        64. 
        
        
      
        
        
          
      64. 
            
            

            

            
          
        65. 
        
        
      
        
        
          
      65. 
            1
            

            

                  before do
          
        66. 
        
        
      
        
        
          
      66. 
            3
            

            

                    sign_in(user)
          
        67. 
        
        
      
        
        
          
      67. 
            
            

            

                  end
          
        68. 
        
        
      
        
        
          
      68. 
            
            

            

            
          
        69. 
        
        
      
        
        
          
      69. 
            1
            

            

                  it 'on click account show settings' do
          
        70. 
        
        
      
        
        
          
      70. 
            1
            

            

                    visit root_path
          
        71. 
        
        
      
        
        
          
      71. 
            
            

            

            
          
        72. 
        
        
      
        
        
          
      72. 
            1
            

            

                    click_on I18n.t('header.account')
          
        73. 
        
        
      
        
        
          
      73. 
            
            

            

            
          
        74. 
        
        
      
        
        
          
      74. 
            1
            

            

                    expect(page).to have_content(I18n.t('header.settings'))
          
        75. 
        
        
      
        
        
          
      75. 
            
            

            

                  end
          
        76. 
        
        
      
        
        
          
      76. 
            
            

            

            
          
        77. 
        
        
      
        
        
          
      77. 
            1
            

            

                  it 'on click account show log_out' do
          
        78. 
        
        
      
        
        
          
      78. 
            1
            

            

                    visit root_path
          
        79. 
        
        
      
        
        
          
      79. 
            
            

            

            
          
        80. 
        
        
      
        
        
          
      80. 
            1
            

            

                    click_on I18n.t('header.account')
          
        81. 
        
        
      
        
        
          
      81. 
            
            

            

            
          
        82. 
        
        
      
        
        
          
      82. 
            1
            

            

                    expect(page).to have_content(I18n.t('header.log_out'))
          
        83. 
        
        
      
        
        
          
      83. 
            
            

            

                  end
          
        84. 
        
        
      
        
        
          
      84. 
            
            

            

            
          
        85. 
        
        
      
        
        
          
      85. 
            1
            

            

                  it 'log_out' do
          
        86. 
        
        
      
        
        
          
      86. 
            1
            

            

                    visit root_path
          
        87. 
        
        
      
        
        
          
      87. 
            
            

            

            
          
        88. 
        
        
      
        
        
          
      88. 
            1
            

            

                    click_on I18n.t('header.account')
          
        89. 
        
        
      
        
        
          
      89. 
            
            

            

            
          
        90. 
        
        
      
        
        
          
      90. 
            1
            

            

                    click_on(I18n.t('header.log_out'), match: :first)
          
        91. 
        
        
      
        
        
          
      91. 
            
            

            

            
          
        92. 
        
        
      
        
        
          
      92. 
            1
            

            

                    expect(page).to have_content(I18n.t('devise.sessions.signed_out'))
          
        93. 
        
        
      
        
        
          
      93. 
            
            

            

                  end
          
        94. 
        
        
      
        
        
          
      94. 
            
            

            

                end
          
        95. 
        
        
      
        
        
          
      95. 
            
            

            

              end
          
        96. 
        
        
      
        
        
          
      96. 
            
            

            

            end
          
        97. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/feature/login_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      19 relevant lines.
      19 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            RSpec.describe 'Login', type: :feature do
          
        2. 
        
        
      
        
        
          
      2. 
            3
            

            

              let(:user_second) { create(:user, email: 'test.rspec@rspec.ua') }
          
        3. 
        
        
      
        
        
          
      3. 
            
            

            

            
          
        4. 
        
        
      
        
        
          
      4. 
            1
            

            

              describe '#login' do
          
        5. 
        
        
      
        
        
          
      5. 
            1
            

            

                before do
          
        6. 
        
        
      
        
        
          
      6. 
            2
            

            

                  visit new_user_session_path
          
        7. 
        
        
      
        
        
          
      7. 
            
            

            

                end
          
        8. 
        
        
      
        
        
          
      8. 
            
            

            

            
          
        9. 
        
        
      
        
        
          
      9. 
            1
            

            

                context 'when successfully login' do
          
        10. 
        
        
      
        
        
          
      10. 
            1
            

            

                  it 'login' do
          
        11. 
        
        
      
        
        
          
      11. 
            1
            

            

                    within 'form', class: 'new_user', id: 'new_user' do
          
        12. 
        
        
      
        
        
          
      12. 
            1
            

            

                      fill_in 'user_email', with: user_second.email
          
        13. 
        
        
      
        
        
          
      13. 
            1
            

            

                      fill_in 'user_password', with: user_second.password
          
        14. 
        
        
      
        
        
          
      14. 
            
            

            

            
          
        15. 
        
        
      
        
        
          
      15. 
            1
            

            

                      click_on I18n.t('header.log_in')
          
        16. 
        
        
      
        
        
          
      16. 
            
            

            

                    end
          
        17. 
        
        
      
        
        
          
      17. 
            
            

            

            
          
        18. 
        
        
      
        
        
          
      18. 
            1
            

            

                    expect(page).to have_text I18n.t('devise.sessions.signed_in')
          
        19. 
        
        
      
        
        
          
      19. 
            
            

            

                  end
          
        20. 
        
        
      
        
        
          
      20. 
            
            

            

                end
          
        21. 
        
        
      
        
        
          
      21. 
            
            

            

            
          
        22. 
        
        
      
        
        
          
      22. 
            1
            

            

                context 'when unsuccessfully login' do
          
        23. 
        
        
      
        
        
          
      23. 
            1
            

            

                  it 'didn`t login' do
          
        24. 
        
        
      
        
        
          
      24. 
            1
            

            

                    within 'form', class: 'new_user', id: 'new_user' do
          
        25. 
        
        
      
        
        
          
      25. 
            1
            

            

                      fill_in 'user_email', with: user_second.email
          
        26. 
        
        
      
        
        
          
      26. 
            1
            

            

                      fill_in 'user_password', with: 'wrong_password'
          
        27. 
        
        
      
        
        
          
      27. 
            
            

            

            
          
        28. 
        
        
      
        
        
          
      28. 
            1
            

            

                      click_on I18n.t('header.log_in')
          
        29. 
        
        
      
        
        
          
      29. 
            
            

            

                    end
          
        30. 
        
        
      
        
        
          
      30. 
            
            

            

            
          
        31. 
        
        
      
        
        
          
      31. 
            1
            

            

                    expect(page).to have_text 'Invalid Email or password.'
          
        32. 
        
        
      
        
        
          
      32. 
            
            

            

                  end
          
        33. 
        
        
      
        
        
          
      33. 
            
            

            

                end
          
        34. 
        
        
      
        
        
          
      34. 
            
            

            

              end
          
        35. 
        
        
      
        
        
          
      35. 
            
            

            

            end
          
        36. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/feature/new_password_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      13 relevant lines.
      13 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            require_relative '../rails_helper'
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

            require_relative '../support/shared_context'
          
        3. 
        
        
      
        
        
          
      3. 
            
            

            

            
          
        4. 
        
        
      
        
        
          
      4. 
            1
            

            

            RSpec.describe 'New Password', type: :feature do
          
        5. 
        
        
      
        
        
          
      5. 
            3
            

            

              let(:user) { FactoryBot.create(:user) }
          
        6. 
        
        
      
        
        
          
      6. 
            
            

            

            
          
        7. 
        
        
      
        
        
          
      7. 
            1
            

            

              describe '#new_password' do
          
        8. 
        
        
      
        
        
          
      8. 
            1
            

            

                it 'change password' do
          
        9. 
        
        
      
        
        
          
      9. 
            1
            

            

                  user.reset_password('newPassword', 'newPassword')
          
        10. 
        
        
      
        
        
          
      10. 
            
            

            

            
          
        11. 
        
        
      
        
        
          
      11. 
            1
            

            

                  expect(user.password).to eq('newPassword')
          
        12. 
        
        
      
        
        
          
      12. 
            
            

            

                end
          
        13. 
        
        
      
        
        
          
      13. 
            
            

            

            
          
        14. 
        
        
      
        
        
          
      14. 
            1
            

            

                it 'not validate password' do
          
        15. 
        
        
      
        
        
          
      15. 
            1
            

            

                  visit new_user_password_path
          
        16. 
        
        
      
        
        
          
      16. 
            
            

            

            
          
        17. 
        
        
      
        
        
          
      17. 
            1
            

            

                  fill_in 'email', with: user.email
          
        18. 
        
        
      
        
        
          
      18. 
            
            

            

            
          
        19. 
        
        
      
        
        
          
      19. 
            1
            

            

                  click_on I18n.t('login.send_instructions')
          
        20. 
        
        
      
        
        
          
      20. 
            
            

            

            
          
        21. 
        
        
      
        
        
          
      21. 
            1
            

            

                  expect(page).to have_content(I18n.t('devise.passwords.send_instructions'))
          
        22. 
        
        
      
        
        
          
      22. 
            
            

            

                end
          
        23. 
        
        
      
        
        
          
      23. 
            
            

            

              end
          
        24. 
        
        
      
        
        
          
      24. 
            
            

            

            end
          
        25. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/feature/registration_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      29 relevant lines.
      29 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            RSpec.describe 'Registration', type: :feature do
          
        2. 
        
        
      
        
        
          
      2. 
            3
            

            

              let(:user) { create(:user, email: 'test.rspec@rspec.ua') }
          
        3. 
        
        
      
        
        
          
      3. 
            
            

            

            
          
        4. 
        
        
      
        
        
          
      4. 
            1
            

            

              describe '#sing_up' do
          
        5. 
        
        
      
        
        
          
      5. 
            1
            

            

                before do
          
        6. 
        
        
      
        
        
          
      6. 
            3
            

            

                  visit new_user_registration_path
          
        7. 
        
        
      
        
        
          
      7. 
            
            

            

                end
          
        8. 
        
        
      
        
        
          
      8. 
            
            

            

            
          
        9. 
        
        
      
        
        
          
      9. 
            1
            

            

                context 'when successfully sing_up' do
          
        10. 
        
        
      
        
        
          
      10. 
            1
            

            

                  it 'sing_up users' do
          
        11. 
        
        
      
        
        
          
      11. 
            1
            

            

                    within 'form', class: 'new_user', id: 'new_user' do
          
        12. 
        
        
      
        
        
          
      12. 
            1
            

            

                      fill_in 'user_email', with: 'email-test@rspec.com'
          
        13. 
        
        
      
        
        
          
      13. 
            1
            

            

                      fill_in 'user_password', with: user.password
          
        14. 
        
        
      
        
        
          
      14. 
            1
            

            

                      fill_in 'user_password_confirmation', with: user.password
          
        15. 
        
        
      
        
        
          
      15. 
            
            

            

            
          
        16. 
        
        
      
        
        
          
      16. 
            1
            

            

                      click_on I18n.t('header.sing_up')
          
        17. 
        
        
      
        
        
          
      17. 
            
            

            

                    end
          
        18. 
        
        
      
        
        
          
      18. 
            
            

            

            
          
        19. 
        
        
      
        
        
          
      19. 
            1
            

            

                    expect(page).to have_text I18n.t('devise.registrations.signed_up_but_unconfirmed')
          
        20. 
        
        
      
        
        
          
      20. 
            
            

            

                  end
          
        21. 
        
        
      
        
        
          
      21. 
            
            

            

                end
          
        22. 
        
        
      
        
        
          
      22. 
            
            

            

            
          
        23. 
        
        
      
        
        
          
      23. 
            1
            

            

                context 'when users is already exits' do
          
        24. 
        
        
      
        
        
          
      24. 
            1
            

            

                  it 'sing_up users' do
          
        25. 
        
        
      
        
        
          
      25. 
            1
            

            

                    within 'form', class: 'new_user', id: 'new_user' do
          
        26. 
        
        
      
        
        
          
      26. 
            1
            

            

                      fill_in 'user_email', with: user.email
          
        27. 
        
        
      
        
        
          
      27. 
            1
            

            

                      fill_in 'user_password', with: user.password
          
        28. 
        
        
      
        
        
          
      28. 
            1
            

            

                      fill_in 'user_password_confirmation', with: user.password
          
        29. 
        
        
      
        
        
          
      29. 
            
            

            

            
          
        30. 
        
        
      
        
        
          
      30. 
            1
            

            

                      click_on I18n.t('header.sing_up')
          
        31. 
        
        
      
        
        
          
      31. 
            
            

            

                    end
          
        32. 
        
        
      
        
        
          
      32. 
            
            

            

            
          
        33. 
        
        
      
        
        
          
      33. 
            1
            

            

                    expect(page).to have_text('Email has already been taken')
          
        34. 
        
        
      
        
        
          
      34. 
            
            

            

                  end
          
        35. 
        
        
      
        
        
          
      35. 
            
            

            

                end
          
        36. 
        
        
      
        
        
          
      36. 
            
            

            

            
          
        37. 
        
        
      
        
        
          
      37. 
            1
            

            

                context 'when unsuccessfully sing_up' do
          
        38. 
        
        
      
        
        
          
      38. 
            1
            

            

                  it 'didn`t sing_up' do
          
        39. 
        
        
      
        
        
          
      39. 
            1
            

            

                    within 'form', class: 'new_user', id: 'new_user' do
          
        40. 
        
        
      
        
        
          
      40. 
            1
            

            

                      fill_in 'user_email', with: FFaker::Internet.email
          
        41. 
        
        
      
        
        
          
      41. 
            1
            

            

                      fill_in 'user_password', with: 'password'
          
        42. 
        
        
      
        
        
          
      42. 
            1
            

            

                      fill_in 'user_password_confirmation', with: 'wrong'
          
        43. 
        
        
      
        
        
          
      43. 
            
            

            

            
          
        44. 
        
        
      
        
        
          
      44. 
            1
            

            

                      click_on I18n.t('header.sing_up')
          
        45. 
        
        
      
        
        
          
      45. 
            
            

            

                    end
          
        46. 
        
        
      
        
        
          
      46. 
            
            

            

            
          
        47. 
        
        
      
        
        
          
      47. 
            1
            

            

                    expect(page).to have_text '1 error prohibited this user from being saved'
          
        48. 
        
        
      
        
        
          
      48. 
            
            

            

                  end
          
        49. 
        
        
      
        
        
          
      49. 
            
            

            

                end
          
        50. 
        
        
      
        
        
          
      50. 
            
            

            

              end
          
        51. 
        
        
      
        
        
          
      51. 
            
            

            

            end
          
        52. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/feature/review_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      30 relevant lines.
      30 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            require_relative '../rails_helper'
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

            require_relative '../support/shared_context'
          
        3. 
        
        
      
        
        
          
      3. 
            
            

            

            
          
        4. 
        
        
      
        
        
          
      4. 
            1
            

            

            RSpec.describe 'Review', type: :feature do
          
        5. 
        
        
      
        
        
          
      5. 
            1
            

            

              include_context 'with api request authentication helper methods'
          
        6. 
        
        
      
        
        
          
      6. 
            1
            

            

              include_context 'with api request global before and after hooks'
          
        7. 
        
        
      
        
        
          
      7. 
            
            

            

            
          
        8. 
        
        
      
        
        
          
      8. 
            3
            

            

              let(:user) { FactoryBot.create(:user).decorate }
          
        9. 
        
        
      
        
        
          
      9. 
            3
            

            

              let(:book) { FactoryBot.create(:book).decorate }
          
        10. 
        
        
      
        
        
          
      10. 
            
            

            

            
          
        11. 
        
        
      
        
        
          
      11. 
            1
            

            

              before do
          
        12. 
        
        
      
        
        
          
      12. 
            2
            

            

                sign_in(user)
          
        13. 
        
        
      
        
        
          
      13. 
            
            

            

            
          
        14. 
        
        
      
        
        
          
      14. 
            2
            

            

                visit book_path(book)
          
        15. 
        
        
      
        
        
          
      15. 
            
            

            

              end
          
        16. 
        
        
      
        
        
          
      16. 
            
            

            

            
          
        17. 
        
        
      
        
        
          
      17. 
            1
            

            

              shared_examples 'review' do
          
        18. 
        
        
      
        
        
          
      18. 
            2
            

            

                it 'review' do
          
        19. 
        
        
      
        
        
          
      19. 
            2
            

            

                  find('i', id: rating).click
          
        20. 
        
        
      
        
        
          
      20. 
            
            

            

            
          
        21. 
        
        
      
        
        
          
      21. 
            2
            

            

                  fill_in :title, with: FFaker::Lorem.sentence(title_words)
          
        22. 
        
        
      
        
        
          
      22. 
            2
            

            

                  fill_in :body, with: FFaker::Lorem.sentence(body_words)
          
        23. 
        
        
      
        
        
          
      23. 
            
            

            

            
          
        24. 
        
        
      
        
        
          
      24. 
            2
            

            

                  click_on I18n.t('review.post')
          
        25. 
        
        
      
        
        
          
      25. 
            
            

            

            
          
        26. 
        
        
      
        
        
          
      26. 
            2
            

            

                  expect(page).to have_content(result)
          
        27. 
        
        
      
        
        
          
      27. 
            
            

            

                end
          
        28. 
        
        
      
        
        
          
      28. 
            
            

            

              end
          
        29. 
        
        
      
        
        
          
      29. 
            
            

            

            
          
        30. 
        
        
      
        
        
          
      30. 
            1
            

            

              describe '#post review', js: true do
          
        31. 
        
        
      
        
        
          
      31. 
            1
            

            

                context 'when review posted' do
          
        32. 
        
        
      
        
        
          
      32. 
            2
            

            

                  let(:rating) { "star#{rand(1..5)}" }
          
        33. 
        
        
      
        
        
          
      33. 
            2
            

            

                  let(:title_words) { 5 }
          
        34. 
        
        
      
        
        
          
      34. 
            2
            

            

                  let(:body_words) { 10 }
          
        35. 
        
        
      
        
        
          
      35. 
            2
            

            

                  let(:result) { user.name_or_email }
          
        36. 
        
        
      
        
        
          
      36. 
            
            

            

            
          
        37. 
        
        
      
        
        
          
      37. 
            1
            

            

                  include_examples 'review'
          
        38. 
        
        
      
        
        
          
      38. 
            
            

            

                end
          
        39. 
        
        
      
        
        
          
      39. 
            
            

            

            
          
        40. 
        
        
      
        
        
          
      40. 
            1
            

            

                context 'when review not been posted' do
          
        41. 
        
        
      
        
        
          
      41. 
            2
            

            

                  let(:rating) { "star#{rand(1..5)}" }
          
        42. 
        
        
      
        
        
          
      42. 
            2
            

            

                  let(:title_words) { 80 }
          
        43. 
        
        
      
        
        
          
      43. 
            2
            

            

                  let(:body_words) { 30 }
          
        44. 
        
        
      
        
        
          
      44. 
            2
            

            

                  let(:result) { 'Title is too long (maximum is 80 characters)' }
          
        45. 
        
        
      
        
        
          
      45. 
            
            

            

            
          
        46. 
        
        
      
        
        
          
      46. 
            1
            

            

                  include_examples 'review'
          
        47. 
        
        
      
        
        
          
      47. 
            
            

            

                end
          
        48. 
        
        
      
        
        
          
      48. 
            
            

            

              end
          
        49. 
        
        
      
        
        
          
      49. 
            
            

            

            end
          
        50. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/feature/settings_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      34 relevant lines.
      34 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            RSpec.describe 'Settings', type: :feature do
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

              include_context 'with api request authentication helper methods'
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

              include_context 'with api request global before and after hooks'
          
        4. 
        
        
      
        
        
          
      4. 
            
            

            

            
          
        5. 
        
        
      
        
        
          
      5. 
            4
            

            

              let(:user) { create(:user) }
          
        6. 
        
        
      
        
        
          
      6. 
            
            

            

            
          
        7. 
        
        
      
        
        
          
      7. 
            1
            

            

              before do
          
        8. 
        
        
      
        
        
          
      8. 
            3
            

            

                sign_in(user)
          
        9. 
        
        
      
        
        
          
      9. 
            
            

            

            
          
        10. 
        
        
      
        
        
          
      10. 
            3
            

            

                visit edit_user_path(user.id)
          
        11. 
        
        
      
        
        
          
      11. 
            
            

            

            
          
        12. 
        
        
      
        
        
          
      12. 
            3
            

            

                click_link I18n.t('settings.privacy')
          
        13. 
        
        
      
        
        
          
      13. 
            
            

            

              end
          
        14. 
        
        
      
        
        
          
      14. 
            
            

            

            
          
        15. 
        
        
      
        
        
          
      15. 
            1
            

            

              describe '#email_change' do
          
        16. 
        
        
      
        
        
          
      16. 
            1
            

            

                it 'change email' do
          
        17. 
        
        
      
        
        
          
      17. 
            1
            

            

                  within('div', id: 'email') do
          
        18. 
        
        
      
        
        
          
      18. 
            1
            

            

                    fill_in :email, with: FFaker::Internet.email
          
        19. 
        
        
      
        
        
          
      19. 
            
            

            

            
          
        20. 
        
        
      
        
        
          
      20. 
            1
            

            

                    click_on I18n.t('settings.save')
          
        21. 
        
        
      
        
        
          
      21. 
            
            

            

                  end
          
        22. 
        
        
      
        
        
          
      22. 
            
            

            

            
          
        23. 
        
        
      
        
        
          
      23. 
            1
            

            

                  user.confirm
          
        24. 
        
        
      
        
        
          
      24. 
            
            

            

            
          
        25. 
        
        
      
        
        
          
      25. 
            1
            

            

                  expect(page).to have_content(I18n.t('settings.message.update'))
          
        26. 
        
        
      
        
        
          
      26. 
            
            

            

                end
          
        27. 
        
        
      
        
        
          
      27. 
            
            

            

              end
          
        28. 
        
        
      
        
        
          
      28. 
            
            

            

            
          
        29. 
        
        
      
        
        
          
      29. 
            1
            

            

              describe '#password_change' do
          
        30. 
        
        
      
        
        
          
      30. 
            1
            

            

                context 'when error' do
          
        31. 
        
        
      
        
        
          
      31. 
            1
            

            

                  it 'didnt change password' do
          
        32. 
        
        
      
        
        
          
      32. 
            1
            

            

                    within('div', id: 'password') do
          
        33. 
        
        
      
        
        
          
      33. 
            1
            

            

                      fill_in :current_password, with: user.password
          
        34. 
        
        
      
        
        
          
      34. 
            1
            

            

                      fill_in :password, with: 'newPassword'
          
        35. 
        
        
      
        
        
          
      35. 
            1
            

            

                      fill_in :password_confirmation, with: 'incorrectPassword'
          
        36. 
        
        
      
        
        
          
      36. 
            
            

            

            
          
        37. 
        
        
      
        
        
          
      37. 
            1
            

            

                      click_on I18n.t('settings.save')
          
        38. 
        
        
      
        
        
          
      38. 
            
            

            

                    end
          
        39. 
        
        
      
        
        
          
      39. 
            
            

            

            
          
        40. 
        
        
      
        
        
          
      40. 
            1
            

            

                    user.confirm
          
        41. 
        
        
      
        
        
          
      41. 
            
            

            

            
          
        42. 
        
        
      
        
        
          
      42. 
            1
            

            

                    expect(page).to have_content(I18n.t('settings.error.error'))
          
        43. 
        
        
      
        
        
          
      43. 
            
            

            

                  end
          
        44. 
        
        
      
        
        
          
      44. 
            
            

            

                end
          
        45. 
        
        
      
        
        
          
      45. 
            
            

            

            
          
        46. 
        
        
      
        
        
          
      46. 
            1
            

            

                context 'when successful' do
          
        47. 
        
        
      
        
        
          
      47. 
            1
            

            

                  it 'didnt change password' do
          
        48. 
        
        
      
        
        
          
      48. 
            1
            

            

                    within('div', id: 'password') do
          
        49. 
        
        
      
        
        
          
      49. 
            1
            

            

                      fill_in :current_password, with: user.password
          
        50. 
        
        
      
        
        
          
      50. 
            1
            

            

                      fill_in :password, with: 'newPassword'
          
        51. 
        
        
      
        
        
          
      51. 
            1
            

            

                      fill_in :password_confirmation, with: 'newPassword'
          
        52. 
        
        
      
        
        
          
      52. 
            
            

            

            
          
        53. 
        
        
      
        
        
          
      53. 
            1
            

            

                      click_on I18n.t('settings.save')
          
        54. 
        
        
      
        
        
          
      54. 
            
            

            

                    end
          
        55. 
        
        
      
        
        
          
      55. 
            
            

            

            
          
        56. 
        
        
      
        
        
          
      56. 
            1
            

            

                    user.confirm
          
        57. 
        
        
      
        
        
          
      57. 
            
            

            

            
          
        58. 
        
        
      
        
        
          
      58. 
            1
            

            

                    expect(page).to have_content(I18n.t('devise.failure.unauthenticated'))
          
        59. 
        
        
      
        
        
          
      59. 
            
            

            

                  end
          
        60. 
        
        
      
        
        
          
      60. 
            
            

            

                end
          
        61. 
        
        
      
        
        
          
      61. 
            
            

            

              end
          
        62. 
        
        
      
        
        
          
      62. 
            
            

            

            end
          
        63. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/feature/shipping_spec.rb
      
    
      
      
  73.08%


      lines covered
    
      

    

    
      
      26 relevant lines.
      19 lines covered and
      7 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            RSpec.describe 'Shipping', type: :feature do
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

              include_context 'with api request authentication helper methods'
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

              include_context 'with api request global before and after hooks'
          
        4. 
        
        
      
        
        
          
      4. 
            
            

            

            
          
        5. 
        
        
      
        
        
          
      5. 
            2
            

            

              let(:user) { FactoryBot.create(:user) }
          
        6. 
        
        
      
        
        
          
      6. 
            1
            

            

              let(:attributes_for) { attributes_for(:shipping) }
          
        7. 
        
        
      
        
        
          
      7. 
            
            

            

            
          
        8. 
        
        
      
        
        
          
      8. 
            1
            

            

              describe '#fill_in', js: true do
          
        9. 
        
        
      
        
        
          
      9. 
            1
            

            

                it 'fill in shipping' do
          
        10. 
        
        
      
        
        
          
      10. 
            1
            

            

                  sign_in(user)
          
        11. 
        
        
      
        
        
          
      11. 
            
            

            

            
          
        12. 
        
        
      
        
        
          
      12. 
            1
            

            

                  visit edit_user_path(user.id)
          
        13. 
        
        
      
        
        
          
      13. 
            
            

            

            
          
        14. 
        
        
      
        
        
          
      14. 
            1
            

            

                  within('div#shipping.col-md-5.mb-40') do
          
        15. 
        
        
      
        
        
          
      15. 
            1
            

            

                    find_all('div', class: 'form-group')[0] do
          
        16. 
        
        
      
        
        
          
      16. 
            
            

            

                      fill_in :first_name, with: attributes_for[:first_name]
          
        17. 
        
        
      
        
        
          
      17. 
            
            

            

                    end
          
        18. 
        
        
      
        
        
          
      18. 
            1
            

            

                    find_all('div', class: 'form-group')[1] do
          
        19. 
        
        
      
        
        
          
      19. 
            
            

            

                      fill_in :last_name, with: attributes_for[:last_name]
          
        20. 
        
        
      
        
        
          
      20. 
            
            

            

                    end
          
        21. 
        
        
      
        
        
          
      21. 
            1
            

            

                    find_all('div', class: 'form-group')[2] do
          
        22. 
        
        
      
        
        
          
      22. 
            
            

            

                      fill_in :address, with: attributes_for[:address]
          
        23. 
        
        
      
        
        
          
      23. 
            
            

            

                    end
          
        24. 
        
        
      
        
        
          
      24. 
            1
            

            

                    find_all('div', class: 'form-group')[3] do
          
        25. 
        
        
      
        
        
          
      25. 
            
            

            

                      fill_in :city, with: attributes_for[:city]
          
        26. 
        
        
      
        
        
          
      26. 
            
            

            

                    end
          
        27. 
        
        
      
        
        
          
      27. 
            1
            

            

                    find_all('div', class: 'form-group')[4] do
          
        28. 
        
        
      
        
        
          
      28. 
            
            

            

                      fill_in :zip, with: attributes_for[:zip]
          
        29. 
        
        
      
        
        
          
      29. 
            
            

            

                    end
          
        30. 
        
        
      
        
        
          
      30. 
            1
            

            

                    find_all('div', class: 'form-group')[5] do
          
        31. 
        
        
      
        
        
          
      31. 
            
            

            

                      fill_in :country, with: attributes_for[:country]
          
        32. 
        
        
      
        
        
          
      32. 
            
            

            

                    end
          
        33. 
        
        
      
        
        
          
      33. 
            1
            

            

                    find_all('div', class: 'form-group')[6] do
          
        34. 
        
        
      
        
        
          
      34. 
            
            

            

                      fill_in :phone, with: attributes_for[:phone]
          
        35. 
        
        
      
        
        
          
      35. 
            
            

            

                    end
          
        36. 
        
        
      
        
        
          
      36. 
            1
            

            

                    click_on I18n.t('settings.save')
          
        37. 
        
        
      
        
        
          
      37. 
            
            

            

                  end
          
        38. 
        
        
      
        
        
          
      38. 
            
            

            

            
          
        39. 
        
        
      
        
        
          
      39. 
            1
            

            

                  expect(page).to have_content(I18n.t('settings.message.update'))
          
        40. 
        
        
      
        
        
          
      40. 
            
            

            

                end
          
        41. 
        
        
      
        
        
          
      41. 
            
            

            

              end
          
        42. 
        
        
      
        
        
          
      42. 
            
            

            

            end
          
        43. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/feature/user_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      42 relevant lines.
      42 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            RSpec.describe 'User', type: :feature do
          
        2. 
        
        
      
        
        
          
      2. 
            2
            

            

              let(:user) { build(:user, email: 'test.rspec@rspec.ua') }
          
        3. 
        
        
      
        
        
          
      3. 
            3
            

            

              let(:user_second) { create(:user, email: 'test.rspec-test@rspec.ua') }
          
        4. 
        
        
      
        
        
          
      4. 
            
            

            

            
          
        5. 
        
        
      
        
        
          
      5. 
            1
            

            

              describe '#sing_up' do
          
        6. 
        
        
      
        
        
          
      6. 
            1
            

            

                context 'when successfully sing_up' do
          
        7. 
        
        
      
        
        
          
      7. 
            1
            

            

                  before do
          
        8. 
        
        
      
        
        
          
      8. 
            1
            

            

                    visit new_user_registration_path
          
        9. 
        
        
      
        
        
          
      9. 
            
            

            

            
          
        10. 
        
        
      
        
        
          
      10. 
            1
            

            

                    within 'form', class: 'new_user', id: 'new_user' do
          
        11. 
        
        
      
        
        
          
      11. 
            1
            

            

                      fill_in 'user_email', with: user.email
          
        12. 
        
        
      
        
        
          
      12. 
            1
            

            

                      fill_in 'user_password', with: user.password
          
        13. 
        
        
      
        
        
          
      13. 
            1
            

            

                      fill_in 'user_password_confirmation', with: user.password
          
        14. 
        
        
      
        
        
          
      14. 
            
            

            

            
          
        15. 
        
        
      
        
        
          
      15. 
            1
            

            

                      click_on I18n.t('header.sing_up')
          
        16. 
        
        
      
        
        
          
      16. 
            
            

            

                    end
          
        17. 
        
        
      
        
        
          
      17. 
            
            

            

                  end
          
        18. 
        
        
      
        
        
          
      18. 
            
            

            

            
          
        19. 
        
        
      
        
        
          
      19. 
            1
            

            

                  it 'sing_up user' do
          
        20. 
        
        
      
        
        
          
      20. 
            1
            

            

                    expect(page).to have_text I18n.t('devise.registrations.signed_up_but_unconfirmed')
          
        21. 
        
        
      
        
        
          
      21. 
            
            

            

                  end
          
        22. 
        
        
      
        
        
          
      22. 
            
            

            

                end
          
        23. 
        
        
      
        
        
          
      23. 
            
            

            

            
          
        24. 
        
        
      
        
        
          
      24. 
            1
            

            

                context 'when unsuccessfully sing_up' do
          
        25. 
        
        
      
        
        
          
      25. 
            1
            

            

                  it 'didn`t sing_up' do
          
        26. 
        
        
      
        
        
          
      26. 
            1
            

            

                    visit new_user_registration_path
          
        27. 
        
        
      
        
        
          
      27. 
            
            

            

            
          
        28. 
        
        
      
        
        
          
      28. 
            1
            

            

                    within 'form', class: 'new_user', id: 'new_user' do
          
        29. 
        
        
      
        
        
          
      29. 
            1
            

            

                      fill_in 'user_email', with: FFaker::Internet.email
          
        30. 
        
        
      
        
        
          
      30. 
            1
            

            

                      fill_in 'user_password', with: 'wrong'
          
        31. 
        
        
      
        
        
          
      31. 
            1
            

            

                      fill_in 'user_password_confirmation', with: 'wrong'
          
        32. 
        
        
      
        
        
          
      32. 
            
            

            

            
          
        33. 
        
        
      
        
        
          
      33. 
            1
            

            

                      click_on I18n.t('header.sing_up')
          
        34. 
        
        
      
        
        
          
      34. 
            
            

            

                    end
          
        35. 
        
        
      
        
        
          
      35. 
            
            

            

            
          
        36. 
        
        
      
        
        
          
      36. 
            1
            

            

                    expect(page).to have_text '1 error prohibited this user from being saved'
          
        37. 
        
        
      
        
        
          
      37. 
            
            

            

                  end
          
        38. 
        
        
      
        
        
          
      38. 
            
            

            

                end
          
        39. 
        
        
      
        
        
          
      39. 
            
            

            

              end
          
        40. 
        
        
      
        
        
          
      40. 
            
            

            

            
          
        41. 
        
        
      
        
        
          
      41. 
            1
            

            

              describe '#login' do
          
        42. 
        
        
      
        
        
          
      42. 
            1
            

            

                before do
          
        43. 
        
        
      
        
        
          
      43. 
            2
            

            

                  user_second.confirm
          
        44. 
        
        
      
        
        
          
      44. 
            
            

            

                end
          
        45. 
        
        
      
        
        
          
      45. 
            
            

            

            
          
        46. 
        
        
      
        
        
          
      46. 
            1
            

            

                context 'when successfully login' do
          
        47. 
        
        
      
        
        
          
      47. 
            1
            

            

                  it 'login' do
          
        48. 
        
        
      
        
        
          
      48. 
            1
            

            

                    visit new_user_session_path
          
        49. 
        
        
      
        
        
          
      49. 
            
            

            

            
          
        50. 
        
        
      
        
        
          
      50. 
            1
            

            

                    within 'form', class: 'new_user', id: 'new_user' do
          
        51. 
        
        
      
        
        
          
      51. 
            1
            

            

                      fill_in 'user_email', with: user_second.email
          
        52. 
        
        
      
        
        
          
      52. 
            1
            

            

                      fill_in 'user_password', with: user_second.password
          
        53. 
        
        
      
        
        
          
      53. 
            
            

            

            
          
        54. 
        
        
      
        
        
          
      54. 
            1
            

            

                      click_on I18n.t('header.log_in')
          
        55. 
        
        
      
        
        
          
      55. 
            
            

            

                    end
          
        56. 
        
        
      
        
        
          
      56. 
            
            

            

            
          
        57. 
        
        
      
        
        
          
      57. 
            1
            

            

                    expect(page).to have_text I18n.t('devise.sessions.signed_in')
          
        58. 
        
        
      
        
        
          
      58. 
            
            

            

                  end
          
        59. 
        
        
      
        
        
          
      59. 
            
            

            

                end
          
        60. 
        
        
      
        
        
          
      60. 
            
            

            

            
          
        61. 
        
        
      
        
        
          
      61. 
            1
            

            

                context 'when unsuccessfully login' do
          
        62. 
        
        
      
        
        
          
      62. 
            1
            

            

                  it 'didn`t login' do
          
        63. 
        
        
      
        
        
          
      63. 
            1
            

            

                    visit new_user_session_path
          
        64. 
        
        
      
        
        
          
      64. 
            
            

            

            
          
        65. 
        
        
      
        
        
          
      65. 
            1
            

            

                    within 'form', class: 'new_user', id: 'new_user' do
          
        66. 
        
        
      
        
        
          
      66. 
            1
            

            

                      fill_in 'user_email', with: user_second.email
          
        67. 
        
        
      
        
        
          
      67. 
            1
            

            

                      fill_in 'user_password', with: 'wrong_password'
          
        68. 
        
        
      
        
        
          
      68. 
            
            

            

            
          
        69. 
        
        
      
        
        
          
      69. 
            1
            

            

                      click_on I18n.t('header.log_in')
          
        70. 
        
        
      
        
        
          
      70. 
            
            

            

                    end
          
        71. 
        
        
      
        
        
          
      71. 
            
            

            

            
          
        72. 
        
        
      
        
        
          
      72. 
            1
            

            

                    expect(page).to have_text 'Invalid Email or password.'
          
        73. 
        
        
      
        
        
          
      73. 
            
            

            

                  end
          
        74. 
        
        
      
        
        
          
      74. 
            
            

            

                end
          
        75. 
        
        
      
        
        
          
      75. 
            
            

            

              end
          
        76. 
        
        
      
        
        
          
      76. 
            
            

            

            end
          
        77. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/models/admin_user_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      5 relevant lines.
      5 lines covered and
<<<<<<< HEAD
=======
=======
      20 relevant lines.
      20 lines covered and
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 6cdb2e1 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
      20 relevant lines.
      20 lines covered and
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> fd3f47ab (Featire specs)
      20 relevant lines.
      20 lines covered and
>>>>>>> 4e81ea2 (Featire specs)
=======
      20 relevant lines.
      20 lines covered and
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
      20 relevant lines.
      20 lines covered and
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 37e48018 (Featire specs)
=======
      20 relevant lines.
      20 lines covered and
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
      20 relevant lines.
      20 lines covered and
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
      20 relevant lines.
      20 lines covered and
>>>>>>> 4e81ea2 (Featire specs)
=======
      20 relevant lines.
      20 lines covered and
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
      20 relevant lines.
      20 lines covered and
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
      20 relevant lines.
      20 lines covered and
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
      20 relevant lines.
      20 lines covered and
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
      20 relevant lines.
      20 lines covered and
>>>>>>> 4e81ea2 (Featire specs)
=======
      20 relevant lines.
      20 lines covered and
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
      20 relevant lines.
      20 lines covered and
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
      20 relevant lines.
      20 lines covered and
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
      20 relevant lines.
      20 lines covered and
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
      20 relevant lines.
      20 lines covered and
>>>>>>> 4e81ea2 (Featire specs)
=======
      20 relevant lines.
      20 lines covered and
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
=======
      20 relevant lines.
      20 lines covered and
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
      20 relevant lines.
      20 lines covered and
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
=======
      20 relevant lines.
      20 lines covered and
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            require 'rails_helper'
          
        2. 
        
        
      
        
        
          
      2. 
            
            

            

            
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

<<<<<<< HEAD
            RSpec.describe AdminUser, type: :model do
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 416166f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            RSpec.describe AdminUser, type: :model do
=======
            RSpec.describe 'Homes', type: :feature do
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
            RSpec.describe 'Homes', type: :feature do
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
            RSpec.describe 'Homes', type: :feature do
>>>>>>> 4e81ea2 (Featire specs)
=======
            RSpec.describe 'Homes', type: :feature do
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
            RSpec.describe 'Homes', type: :feature do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
            RSpec.describe 'Homes', type: :feature do
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
            RSpec.describe 'Homes', type: :feature do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
            RSpec.describe 'Homes', type: :feature do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
=======
            RSpec.describe 'Homes', type: :feature do
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
            RSpec.describe 'Homes', type: :feature do
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
            RSpec.describe 'Homes', type: :feature do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
            RSpec.describe 'Homes', type: :feature do
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
=======
            RSpec.describe 'Homes', type: :feature do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
            RSpec.describe 'Homes', type: :feature do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
            RSpec.describe 'Homes', type: :feature do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
=======
            RSpec.describe 'Homes', type: :feature do
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
            RSpec.describe 'Homes', type: :feature do
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
            RSpec.describe 'Homes', type: :feature do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
            RSpec.describe 'Homes', type: :feature do
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
            RSpec.describe 'Homes', type: :feature do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
            RSpec.describe 'Homes', type: :feature do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
=======
            RSpec.describe 'Homes', type: :feature do
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
            RSpec.describe 'Homes', type: :feature do
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
=======
            RSpec.describe 'Homes', type: :feature do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
            RSpec.describe 'Homes', type: :feature do
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
=======
            RSpec.describe 'Homes', type: :feature do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
            RSpec.describe 'Homes', type: :feature do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
        4. 
        
        
      
        
        
          
      4. 
            1
            

            

<<<<<<< HEAD
              context 'when validations' do
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 416166f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
              context 'when validations' do
=======
              describe 'Get Started' do
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
              describe 'Get Started' do
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
              describe 'Get Started' do
>>>>>>> 4e81ea2 (Featire specs)
=======
              describe 'Get Started' do
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
              describe 'Get Started' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
              describe 'Get Started' do
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
              describe 'Get Started' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
              describe 'Get Started' do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
=======
              describe 'Get Started' do
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
              describe 'Get Started' do
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
              describe 'Get Started' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
              describe 'Get Started' do
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
=======
              describe 'Get Started' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
              describe 'Get Started' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
              describe 'Get Started' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
=======
              describe 'Get Started' do
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
              describe 'Get Started' do
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
              describe 'Get Started' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
              describe 'Get Started' do
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
              describe 'Get Started' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
              describe 'Get Started' do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
=======
              describe 'Get Started' do
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
              describe 'Get Started' do
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
=======
              describe 'Get Started' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
              describe 'Get Started' do
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
=======
              describe 'Get Started' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
              describe 'Get Started' do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
        5. 
        
        
      
        
        
<<<<<<< HEAD
          
      5. 
            2
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 416166f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      6. 
            2
=======
          
      7. 
            1
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 6cdb2e1 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
          
      8. 
            1
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> fd3f47ab (Featire specs)
          
      9. 
            1
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      10. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
          
      11. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 37e48018 (Featire specs)
=======
          
      12. 
            1
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
          
      13. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
          
      14. 
            1
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      15. 
            1
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
            

            

<<<<<<< HEAD
                it { is_expected.to validate_presence_of(:email) }
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
          
      16. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      17. 
            1
>>>>>>> 7a02bbe (Featire specs)
=======
          
      18. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
          
      19. 
            1
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      20. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
=======
=======
          
      21. 
            1
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      22. 
            1
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
          
      23. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      24. 
            1
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
=======
          
      25. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5506bd0 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 416166f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
          
      26. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      27. 
            1
>>>>>>> 7a02bbe (Featire specs)
=======
          
      28. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
                it { is_expected.to validate_presence_of(:email) }
=======
                it 'on click move to catalog page' do
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
                it 'on click move to catalog page' do
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
                it 'on click move to catalog page' do
>>>>>>> 4e81ea2 (Featire specs)
=======
                it 'on click move to catalog page' do
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
                it 'on click move to catalog page' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                it 'on click move to catalog page' do
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
                it 'on click move to catalog page' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
                it 'on click move to catalog page' do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
=======
                it 'on click move to catalog page' do
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
                it 'on click move to catalog page' do
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
                it 'on click move to catalog page' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                it 'on click move to catalog page' do
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
=======
                it 'on click move to catalog page' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
                it 'on click move to catalog page' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
                it 'on click move to catalog page' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
=======
                it 'on click move to catalog page' do
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
                it 'on click move to catalog page' do
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
                it 'on click move to catalog page' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                it 'on click move to catalog page' do
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
                it 'on click move to catalog page' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
                it 'on click move to catalog page' do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
=======
                it 'on click move to catalog page' do
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
                it 'on click move to catalog page' do
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
=======
                it 'on click move to catalog page' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                it 'on click move to catalog page' do
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
=======
                it 'on click move to catalog page' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
                it 'on click move to catalog page' do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
        29. 
        
        
      
        
        
<<<<<<< HEAD
          
      29. 
            2
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 416166f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      30. 
            2
=======
          
      31. 
            1
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 6cdb2e1 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
          
      32. 
            1
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> fd3f47ab (Featire specs)
          
      33. 
            1
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      34. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
          
      35. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 37e48018 (Featire specs)
=======
          
      36. 
            1
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
          
      37. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
          
      38. 
            1
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      39. 
            1
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
            

            

<<<<<<< HEAD
                it { is_expected.to validate_presence_of(:password) }
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
          
      40. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      41. 
            1
>>>>>>> 7a02bbe (Featire specs)
=======
          
      42. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
          
      43. 
            1
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      44. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
=======
=======
          
      45. 
            1
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      46. 
            1
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
          
      47. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      48. 
            1
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
=======
          
      49. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5506bd0 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 416166f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
          
      50. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      51. 
            1
>>>>>>> 7a02bbe (Featire specs)
=======
          
      52. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
                it { is_expected.to validate_presence_of(:password) }
=======
                  visit root_path
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
                  visit root_path
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
                  visit root_path
>>>>>>> 4e81ea2 (Featire specs)
=======
                  visit root_path
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
                  visit root_path
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  visit root_path
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
                  visit root_path
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
                  visit root_path
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
=======
                  visit root_path
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
                  visit root_path
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
                  visit root_path
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  visit root_path
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
=======
                  visit root_path
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
                  visit root_path
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
                  visit root_path
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
=======
                  visit root_path
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
                  visit root_path
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
                  visit root_path
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  visit root_path
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
                  visit root_path
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
                  visit root_path
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
=======
                  visit root_path
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
                  visit root_path
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
=======
                  visit root_path
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  visit root_path
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
=======
                  visit root_path
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
                  visit root_path
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
        53. 
        
        
      
        
        
          
      53. 
            
            

            

<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
>>>>>>> 0676508 (Featire specs)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            
          
        54. 
        
        
      
        
        
          
      54. 
            1
            

            

                  click_on 'Get Started'
          
        55. 
        
        
      
        
        
          
      55. 
            
            

            

            
          
        56. 
        
        
      
        
        
          
      56. 
            1
            

            

                  expect(page).to have_content('Catalog')
          
        57. 
        
        
      
        
        
          
      57. 
            
            

            

                end
          
        58. 
        
        
      
        
        
          
      58. 
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 84809242 (Featire specs)
=======
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> 365d41ed (Featire specs)
=======
=======
>>>>>>> d8abfed3 (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
              end
          
        59. 
        
        
      
        
        
<<<<<<< HEAD
          
      59. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      60. 
=======
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
          
      61. 
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
<<<<<<< HEAD
          
      62. 
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
<<<<<<< HEAD
          
      63. 
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
          
      64. 
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 0676508 (Featire specs)
=======
<<<<<<< HEAD
          
      65. 
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
          
      66. 
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      67. 
            
            

            

            
          
        68. 
        
        
      
        
        
          
      68. 
            1
            

            

              describe 'navbar' do
          
        69. 
        
        
      
        
        
          
      69. 
            2
            

            

                let(:books_category) { FactoryBot.create(:books_category) }
          
        70. 
        
        
      
        
        
          
      70. 
            
            

            

            
          
        71. 
        
        
      
        
        
          
      71. 
            1
            

            

                it 'on click home move to root-path' do
          
        72. 
        
        
      
        
        
          
      72. 
            1
            

            

                  visit books_path
          
        73. 
        
        
      
        
        
          
      73. 
            
            

            

            
          
        74. 
        
        
      
        
        
          
      74. 
            1
            

            

                  find('a', id: 'root').click
          
        75. 
        
        
      
        
        
          
      75. 
            
            

            

            
          
        76. 
        
        
      
        
        
          
      76. 
            1
            

            

                  expect(page).to have_content('Get Started')
          
        77. 
        
        
      
        
        
          
      77. 
            
            

            

                end
          
        78. 
        
        
      
        
        
          
      78. 
            
            

            

            
          
        79. 
        
        
      
        
        
          
      79. 
            1
            

            

                it 'on click category name move to root-path with books that belong to this category' do
          
        80. 
        
        
      
        
        
          
      80. 
            1
            

            

                  books_category
          
        81. 
        
        
      
        
        
          
      81. 
            
            

            

            
          
        82. 
        
        
      
        
        
          
      82. 
            1
            

            

                  visit root_path
          
        83. 
        
        
      
        
        
          
      83. 
            
            

            

            
          
        84. 
        
        
      
        
        
          
      84. 
            1
            

            

                  find('a', class: 'dropdown-toggle', text: 'Shop').click
          
        85. 
        
        
      
        
        
          
      85. 
            
            

            

            
          
        86. 
        
        
      
        
        
          
      86. 
            1
            

            

                  within('ul', id: 'nav') do
          
        87. 
        
        
      
        
        
          
      87. 
            1
            

            

                    find('a', class: 'collapse-link', text: books_category.category.name).click
          
        88. 
        
        
      
        
        
          
      88. 
            
            

            

                  end
          
        89. 
        
        
      
        
        
          
      89. 
            
            

            

            
          
        90. 
        
        
      
        
        
          
      90. 
            1
            

            

                  expect(page).to have_content(books_category.category.books.first.title)
          
        91. 
        
        
      
        
        
          
      91. 
            
            

            

                end
          
        92. 
        
        
      
        
        
          
      92. 
            
            

            

              end
          
        93. 
        
        
      
        
        
          
      93. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 84809242 (Featire specs)
=======
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> 365d41ed (Featire specs)
=======
=======
>>>>>>> d8abfed3 (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            
            

            

            end
          
        94. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/models/author_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
<<<<<<< HEAD
      8 relevant lines.
      8 lines covered and
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 416166f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
      8 relevant lines.
      8 lines covered and
=======
      9 relevant lines.
      9 lines covered and
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 6cdb2e1 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
      9 relevant lines.
      9 lines covered and
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> fd3f47ab (Featire specs)
      9 relevant lines.
      9 lines covered and
>>>>>>> 4e81ea2 (Featire specs)
=======
      9 relevant lines.
      9 lines covered and
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
      9 relevant lines.
      9 lines covered and
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 37e48018 (Featire specs)
=======
      9 relevant lines.
      9 lines covered and
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
      9 relevant lines.
      9 lines covered and
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
      9 relevant lines.
      9 lines covered and
>>>>>>> 4e81ea2 (Featire specs)
=======
      9 relevant lines.
      9 lines covered and
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
      9 relevant lines.
      9 lines covered and
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
      9 relevant lines.
      9 lines covered and
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
      9 relevant lines.
      9 lines covered and
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
      9 relevant lines.
      9 lines covered and
>>>>>>> 4e81ea2 (Featire specs)
=======
      9 relevant lines.
      9 lines covered and
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
      9 relevant lines.
      9 lines covered and
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
      9 relevant lines.
      9 lines covered and
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
      9 relevant lines.
      9 lines covered and
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
      9 relevant lines.
      9 lines covered and
>>>>>>> 4e81ea2 (Featire specs)
=======
      9 relevant lines.
      9 lines covered and
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
=======
      9 relevant lines.
      9 lines covered and
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
      9 relevant lines.
      9 lines covered and
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
=======
      9 relevant lines.
      9 lines covered and
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

<<<<<<< HEAD
            RSpec.describe Author, type: :model do
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 416166f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            RSpec.describe Author, type: :model do
=======
            require 'rails_helper'
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
            require 'rails_helper'
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
            require 'rails_helper'
>>>>>>> 4e81ea2 (Featire specs)
=======
            require 'rails_helper'
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
            require 'rails_helper'
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
            require 'rails_helper'
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
            require 'rails_helper'
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
            require 'rails_helper'
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
=======
            require 'rails_helper'
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
            require 'rails_helper'
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
            require 'rails_helper'
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
            require 'rails_helper'
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
=======
            require 'rails_helper'
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
            require 'rails_helper'
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
            require 'rails_helper'
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
=======
            require 'rails_helper'
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
            require 'rails_helper'
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
            require 'rails_helper'
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
            require 'rails_helper'
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
            require 'rails_helper'
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
            require 'rails_helper'
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
=======
            require 'rails_helper'
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
            require 'rails_helper'
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
=======
            require 'rails_helper'
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
            require 'rails_helper'
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
=======
            require 'rails_helper'
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
            require 'rails_helper'
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
        2. 
        
        
      
        
        
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 365d41ed (Featire specs)
=======
>>>>>>> c05ee511 (Featire specs)
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      2. 
            1
            

            

              describe 'author' do
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

                context 'when validations' do
          
        4. 
        
        
      
        
        
          
      4. 
            2
            

            

                  it { is_expected.to validate_presence_of(:first_name) }
          
        5. 
        
        
      
        
        
          
      5. 
            2
            

            

                  it { is_expected.to validate_presence_of(:last_name) }
          
        6. 
        
        
      
        
        
          
      6. 
            
            

            

                end
          
        7. 
        
        
      
        
        
          
      7. 
<<<<<<< HEAD
=======
=======
          
      8. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
          
      9. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
          
      10. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      11. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
          
      12. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      13. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
          
      14. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
          
      15. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
=======
          
      16. 
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      17. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
          
      18. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      19. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
=======
          
      20. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
          
      21. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
          
      22. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
=======
          
      23. 
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      24. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
          
      25. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      26. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
          
      27. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
          
      28. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
=======
          
      29. 
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      30. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
=======
          
      31. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      32. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
=======
          
      33. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
          
      34. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            
            

            

            
          
        35. 
        
        
      
        
        
<<<<<<< HEAD
          
      35. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 416166f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      36. 
=======
          
      37. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
          
      38. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
          
      39. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      40. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
          
      41. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      42. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
          
      43. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
          
      44. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
=======
          
      45. 
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      46. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
          
      47. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      48. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
=======
          
      49. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
          
      50. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
          
      51. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
=======
          
      52. 
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      53. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
          
      54. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      55. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
          
      56. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
          
      57. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
=======
          
      58. 
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      59. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
=======
          
      60. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      61. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
=======
          
      62. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
          
      63. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            1
            

            

<<<<<<< HEAD
                context 'when associations' do
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 416166f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
                context 'when associations' do
=======
            RSpec.describe Author, type: :model do
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
            RSpec.describe Author, type: :model do
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
            RSpec.describe Author, type: :model do
>>>>>>> 4e81ea2 (Featire specs)
=======
            RSpec.describe Author, type: :model do
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
            RSpec.describe Author, type: :model do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
            RSpec.describe Author, type: :model do
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
            RSpec.describe Author, type: :model do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
            RSpec.describe Author, type: :model do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
=======
            RSpec.describe Author, type: :model do
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
            RSpec.describe Author, type: :model do
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
            RSpec.describe Author, type: :model do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
            RSpec.describe Author, type: :model do
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
=======
            RSpec.describe Author, type: :model do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
            RSpec.describe Author, type: :model do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
            RSpec.describe Author, type: :model do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
=======
            RSpec.describe Author, type: :model do
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
            RSpec.describe Author, type: :model do
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
            RSpec.describe Author, type: :model do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
            RSpec.describe Author, type: :model do
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
            RSpec.describe Author, type: :model do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
            RSpec.describe Author, type: :model do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
=======
            RSpec.describe Author, type: :model do
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
            RSpec.describe Author, type: :model do
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
=======
            RSpec.describe Author, type: :model do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
            RSpec.describe Author, type: :model do
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
=======
            RSpec.describe Author, type: :model do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
            RSpec.describe Author, type: :model do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
        64. 
        
        
      
        
        
<<<<<<< HEAD
          
      64. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      65. 
=======
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
          
      66. 
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
<<<<<<< HEAD
          
      67. 
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
<<<<<<< HEAD
          
      68. 
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
          
      69. 
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 0676508 (Featire specs)
=======
<<<<<<< HEAD
          
      70. 
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
          
      71. 
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      72. 
            1
            

            

              describe 'author' do
          
        73. 
        
        
      
        
        
          
      73. 
            1
            

            

                context 'when validations' do
          
        74. 
        
        
      
        
        
          
      74. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 84809242 (Featire specs)
=======
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> 365d41ed (Featire specs)
=======
=======
>>>>>>> d8abfed3 (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            2
            

            

<<<<<<< HEAD
                  it { is_expected.to have_many(:authors_books).dependent(:destroy) }
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 416166f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
                  it { is_expected.to have_many(:authors_books).dependent(:destroy) }
=======
                  it { is_expected.to validate_presence_of(:first_name) }
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
                  it { is_expected.to validate_presence_of(:first_name) }
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
                  it { is_expected.to validate_presence_of(:first_name) }
>>>>>>> 4e81ea2 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:first_name) }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
                  it { is_expected.to validate_presence_of(:first_name) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to validate_presence_of(:first_name) }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
                  it { is_expected.to validate_presence_of(:first_name) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
                  it { is_expected.to validate_presence_of(:first_name) }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to validate_presence_of(:first_name) }
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:first_name) }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to validate_presence_of(:first_name) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to validate_presence_of(:first_name) }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to validate_presence_of(:first_name) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
                  it { is_expected.to validate_presence_of(:first_name) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
                  it { is_expected.to validate_presence_of(:first_name) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to validate_presence_of(:first_name) }
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:first_name) }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to validate_presence_of(:first_name) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to validate_presence_of(:first_name) }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to validate_presence_of(:first_name) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
                  it { is_expected.to validate_presence_of(:first_name) }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to validate_presence_of(:first_name) }
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:first_name) }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to validate_presence_of(:first_name) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to validate_presence_of(:first_name) }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to validate_presence_of(:first_name) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to validate_presence_of(:first_name) }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
        75. 
        
        
      
        
        
<<<<<<< HEAD
          
      75. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 416166f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      76. 
=======
          
      77. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
          
      78. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
          
      79. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      80. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
          
      81. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      82. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
          
      83. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
          
      84. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
=======
          
      85. 
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      86. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
          
      87. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      88. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
=======
          
      89. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
          
      90. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
          
      91. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
=======
          
      92. 
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      93. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
          
      94. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      95. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
          
      96. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
          
      97. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
=======
          
      98. 
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      99. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
=======
          
      100. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      101. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
=======
          
      102. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
          
      103. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            2
            

            

<<<<<<< HEAD
                  it { is_expected.to have_many(:books).through(:authors_books) }
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 416166f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
                  it { is_expected.to have_many(:books).through(:authors_books) }
=======
                  it { is_expected.to validate_presence_of(:last_name) }
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
                  it { is_expected.to validate_presence_of(:last_name) }
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
                  it { is_expected.to validate_presence_of(:last_name) }
>>>>>>> 4e81ea2 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:last_name) }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
                  it { is_expected.to validate_presence_of(:last_name) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to validate_presence_of(:last_name) }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
                  it { is_expected.to validate_presence_of(:last_name) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
                  it { is_expected.to validate_presence_of(:last_name) }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to validate_presence_of(:last_name) }
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:last_name) }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to validate_presence_of(:last_name) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to validate_presence_of(:last_name) }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to validate_presence_of(:last_name) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
                  it { is_expected.to validate_presence_of(:last_name) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
                  it { is_expected.to validate_presence_of(:last_name) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to validate_presence_of(:last_name) }
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:last_name) }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to validate_presence_of(:last_name) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to validate_presence_of(:last_name) }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to validate_presence_of(:last_name) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
                  it { is_expected.to validate_presence_of(:last_name) }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to validate_presence_of(:last_name) }
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:last_name) }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to validate_presence_of(:last_name) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to validate_presence_of(:last_name) }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to validate_presence_of(:last_name) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to validate_presence_of(:last_name) }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
        104. 
        
        
      
        
        
<<<<<<< HEAD
          
      104. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 416166f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      105. 
=======
          
      106. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
          
      107. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
          
      108. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      109. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
          
      110. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      111. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
          
      112. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
          
      113. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
=======
          
      114. 
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      115. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
          
      116. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      117. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
=======
          
      118. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
          
      119. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
          
      120. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
=======
          
      121. 
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      122. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
          
      123. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      124. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
          
      125. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
          
      126. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
=======
          
      127. 
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      128. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
=======
          
      129. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      130. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
=======
          
      131. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
          
      132. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            
            

            

                end
          
        133. 
        
        
      
        
        
<<<<<<< HEAD
          
      133. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      134. 
=======
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
          
      135. 
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
<<<<<<< HEAD
          
      136. 
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
<<<<<<< HEAD
          
      137. 
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
          
      138. 
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 0676508 (Featire specs)
=======
<<<<<<< HEAD
          
      139. 
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
          
      140. 
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      141. 
            
            

            

            
          
        142. 
        
        
      
        
        
          
      142. 
            1
            

            

                context 'when associations' do
          
        143. 
        
        
      
        
        
          
      143. 
            2
            

            

                  it { is_expected.to have_many(:authors_books).dependent(:destroy) }
          
        144. 
        
        
      
        
        
          
      144. 
            2
            

            

                  it { is_expected.to have_many(:books).through(:authors_books) }
          
        145. 
        
        
      
        
        
          
      145. 
            
            

            

                end
          
        146. 
        
        
      
        
        
          
      146. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 84809242 (Featire specs)
=======
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> 365d41ed (Featire specs)
=======
=======
>>>>>>> d8abfed3 (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            
            

            

              end
          
        147. 
        
        
      
        
        
<<<<<<< HEAD
          
      147. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 416166f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      148. 
=======
          
      149. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
          
      150. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
          
      151. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      152. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
          
      153. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      154. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
          
      155. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
          
      156. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
=======
          
      157. 
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      158. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
          
      159. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      160. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
=======
          
      161. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
          
      162. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
          
      163. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
=======
          
      164. 
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      165. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
          
      166. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      167. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
          
      168. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
          
      169. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
=======
          
      170. 
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      171. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
=======
          
      172. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      173. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
=======
          
      174. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
          
      175. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            
            

            

            end
          
        176. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/models/authors_book_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
<<<<<<< HEAD
      8 relevant lines.
      8 lines covered and
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 416166f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
      8 relevant lines.
      8 lines covered and
=======
      9 relevant lines.
      9 lines covered and
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 6cdb2e1 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
      9 relevant lines.
      9 lines covered and
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> fd3f47ab (Featire specs)
      9 relevant lines.
      9 lines covered and
>>>>>>> 4e81ea2 (Featire specs)
=======
      9 relevant lines.
      9 lines covered and
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
      9 relevant lines.
      9 lines covered and
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 37e48018 (Featire specs)
=======
      9 relevant lines.
      9 lines covered and
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
      9 relevant lines.
      9 lines covered and
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
      9 relevant lines.
      9 lines covered and
>>>>>>> 4e81ea2 (Featire specs)
=======
      9 relevant lines.
      9 lines covered and
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
      9 relevant lines.
      9 lines covered and
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
      9 relevant lines.
      9 lines covered and
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
      9 relevant lines.
      9 lines covered and
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
      9 relevant lines.
      9 lines covered and
>>>>>>> 4e81ea2 (Featire specs)
=======
      9 relevant lines.
      9 lines covered and
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
      9 relevant lines.
      9 lines covered and
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
      9 relevant lines.
      9 lines covered and
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
      9 relevant lines.
      9 lines covered and
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
      9 relevant lines.
      9 lines covered and
>>>>>>> 4e81ea2 (Featire specs)
=======
      9 relevant lines.
      9 lines covered and
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
=======
      9 relevant lines.
      9 lines covered and
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
      9 relevant lines.
      9 lines covered and
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
=======
      9 relevant lines.
      9 lines covered and
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
>>>>>>> 0676508 (Featire specs)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            require 'rails_helper'
          
        2. 
        
        
      
        
        
          
      2. 
            
            

            

            
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 84809242 (Featire specs)
=======
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> 365d41ed (Featire specs)
=======
=======
>>>>>>> d8abfed3 (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            RSpec.describe AuthorsBook, type: :model do
          
        4. 
        
        
      
        
        
<<<<<<< HEAD
          
      4. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 416166f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      5. 
=======
          
      6. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
          
      7. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
          
      8. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      9. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
          
      10. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      11. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
          
      12. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
          
      13. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
=======
          
      14. 
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      15. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
          
      16. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      17. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
=======
          
      18. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
          
      19. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
          
      20. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
=======
          
      21. 
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      22. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
          
      23. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      24. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
          
      25. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
          
      26. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
=======
          
      27. 
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      28. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
=======
          
      29. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      30. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
=======
          
      31. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
          
      32. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            1
            

            

              describe 'authors_book' do
          
        33. 
        
        
      
        
        
<<<<<<< HEAD
          
      33. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 416166f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      34. 
=======
          
      35. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
          
      36. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
          
      37. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      38. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
          
      39. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      40. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
          
      41. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
          
      42. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
=======
          
      43. 
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      44. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
          
      45. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      46. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
=======
          
      47. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
          
      48. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
          
      49. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
=======
          
      50. 
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      51. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
          
      52. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      53. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
          
      54. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
          
      55. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
=======
          
      56. 
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      57. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
=======
          
      58. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      59. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
=======
          
      60. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
          
      61. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            1
            

            

                context 'when validations' do
          
        62. 
        
        
      
        
        
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 365d41ed (Featire specs)
=======
>>>>>>> c05ee511 (Featire specs)
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      62. 
            2
            

            

                  it { is_expected.to validate_presence_of(:book) }
          
        63. 
        
        
      
        
        
          
      63. 
            2
            

            

                  it { is_expected.to validate_presence_of(:author) }
          
        64. 
        
        
      
        
        
          
      64. 
            
            

            

                end
          
        65. 
        
        
      
        
        
          
      65. 
            
            

            

            
          
        66. 
        
        
      
        
        
          
      66. 
            1
            

            

                context 'when associations' do
          
        67. 
        
        
      
        
        
          
      67. 
            2
            

            

                  it { is_expected.to belong_to(:author) }
          
        68. 
        
        
      
        
        
          
      68. 
            2
            

            

                  it { is_expected.to belong_to(:book) }
          
        69. 
        
        
      
        
        
          
      69. 
            
            

            

                end
          
        70. 
        
        
      
        
        
          
      70. 
            
            

            

              end
          
        71. 
        
        
      
        
        
          
      71. 
            
            

            

            end
          
        72. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/models/billing_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      20 relevant lines.
      20 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            RSpec.describe Billing, type: :model do
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

              describe 'billing' do
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

                context 'when validations' do
          
        4. 
        
        
      
        
        
          
      4. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::Name.first_name).for(:first_name) }
          
        5. 
        
        
      
        
        
          
      5. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::Name.first_name).for(:last_name) }
          
        6. 
        
        
      
        
        
<<<<<<< HEAD
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
=======
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      6. 
            2
            

            

<<<<<<< HEAD
                  it { is_expected.to allow_values('+919367788755', '8989829304', '+16308520397', '786-307-3615').for(:phone) }
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 416166f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
                  it { is_expected.to allow_values('+919367788755', '8989829304', '+16308520397', '786-307-3615').for(:phone) }
=======
                  it { is_expected.to validate_presence_of(:book) }
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
                  it { is_expected.to validate_presence_of(:book) }
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
                  it { is_expected.to validate_presence_of(:book) }
>>>>>>> 4e81ea2 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:book) }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
                  it { is_expected.to validate_presence_of(:book) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to validate_presence_of(:book) }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
                  it { is_expected.to validate_presence_of(:book) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
                  it { is_expected.to validate_presence_of(:book) }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to validate_presence_of(:book) }
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:book) }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to validate_presence_of(:book) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to validate_presence_of(:book) }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to validate_presence_of(:book) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
                  it { is_expected.to validate_presence_of(:book) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
                  it { is_expected.to validate_presence_of(:book) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to validate_presence_of(:book) }
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:book) }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to validate_presence_of(:book) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to validate_presence_of(:book) }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to validate_presence_of(:book) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
                  it { is_expected.to validate_presence_of(:book) }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to validate_presence_of(:book) }
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:book) }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to validate_presence_of(:book) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to validate_presence_of(:book) }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to validate_presence_of(:book) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to validate_presence_of(:book) }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
        7. 
        
        
      
        
        
          
      7. 
            2
            

            

<<<<<<< HEAD
                  it { is_expected.to allow_values(FFaker::AddressUK.country).for(:country) }
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 416166f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
                  it { is_expected.to allow_values(FFaker::AddressUK.country).for(:country) }
=======
                  it { is_expected.to validate_presence_of(:author) }
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
                  it { is_expected.to validate_presence_of(:author) }
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
                  it { is_expected.to validate_presence_of(:author) }
>>>>>>> 4e81ea2 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:author) }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
                  it { is_expected.to validate_presence_of(:author) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to validate_presence_of(:author) }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
                  it { is_expected.to validate_presence_of(:author) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
                  it { is_expected.to validate_presence_of(:author) }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to validate_presence_of(:author) }
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:author) }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to validate_presence_of(:author) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to validate_presence_of(:author) }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to validate_presence_of(:author) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
                  it { is_expected.to validate_presence_of(:author) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
                  it { is_expected.to validate_presence_of(:author) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to validate_presence_of(:author) }
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:author) }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to validate_presence_of(:author) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to validate_presence_of(:author) }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to validate_presence_of(:author) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
                  it { is_expected.to validate_presence_of(:author) }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to validate_presence_of(:author) }
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:author) }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to validate_presence_of(:author) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to validate_presence_of(:author) }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to validate_presence_of(:author) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to validate_presence_of(:author) }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
        8. 
        
        
      
        
        
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 365d41ed (Featire specs)
=======
>>>>>>> c05ee511 (Featire specs)
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      8. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::AddressUK.city).for(:city) }
          
        9. 
        
        
      
        
        
          
      9. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::AddressUA.zip_code).for(:zip) }
          
        10. 
        
        
      
        
        
          
      10. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::Address.street_address).for(:address) }
          
        11. 
        
        
      
        
        
          
      11. 
<<<<<<< HEAD
=======
=======
          
      12. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
          
      13. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
          
      14. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      15. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
          
      16. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      17. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
          
      18. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
          
      19. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
=======
          
      20. 
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      21. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
          
      22. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      23. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
=======
          
      24. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
          
      25. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
          
      26. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
=======
          
      27. 
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      28. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
          
      29. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      30. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
          
      31. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
          
      32. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
=======
          
      33. 
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      34. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
=======
          
      35. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      36. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
=======
          
      37. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
          
      38. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            
            

            

                end
          
        39. 
        
        
      
        
        
<<<<<<< HEAD
          
      39. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 416166f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      40. 
=======
          
      41. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
          
      42. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
          
      43. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      44. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
          
      45. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      46. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
          
      47. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
          
      48. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
=======
          
      49. 
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      50. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
          
      51. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      52. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
=======
          
      53. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
          
      54. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
          
      55. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
=======
          
      56. 
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      57. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
          
      58. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      59. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
          
      60. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
          
      61. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
=======
          
      62. 
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      63. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
=======
          
      64. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      65. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
=======
          
      66. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
          
      67. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            
            

            

            
          
        68. 
        
        
      
        
        
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 365d41ed (Featire specs)
=======
>>>>>>> c05ee511 (Featire specs)
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      68. 
            1
            

            

                context 'when not validations' do
          
        69. 
        
        
      
        
        
          
      69. 
            2
            

            

                  it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:first_name) }
          
        70. 
        
        
      
        
        
          
      70. 
            2
            

            

                  it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:last_name) }
          
        71. 
        
        
      
        
        
          
      71. 
            2
            

            

                  it { is_expected.not_to allow_values('789', '123765', '1-1-1', '+982').for(:phone) }
          
        72. 
        
        
      
        
        
          
      72. 
            2
            

            

                  it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:country) }
          
        73. 
        
        
      
        
        
          
      73. 
            2
            

            

                  it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:city) }
          
        74. 
        
        
      
        
        
          
      74. 
            2
            

            

                  it { is_expected.not_to allow_values('1' * Constants::VALIDATES_ZIP_LENGTH_MAX.next).for(:zip) }
          
        75. 
        
        
      
        
        
          
      75. 
            2
            

            

                  it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:address) }
          
        76. 
        
        
      
        
        
          
      76. 
            
            

            

                end
          
        77. 
        
        
      
        
        
          
      77. 
            
            

            

            
          
        78. 
        
        
      
        
        
          
      78. 
<<<<<<< HEAD
=======
=======
          
      79. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
          
      80. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
          
      81. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      82. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
          
      83. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      84. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
          
      85. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
          
      86. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
=======
          
      87. 
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      88. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
          
      89. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      90. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
=======
          
      91. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
          
      92. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
          
      93. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
=======
          
      94. 
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      95. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
          
      96. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      97. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
          
      98. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
          
      99. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
=======
          
      100. 
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      101. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
=======
          
      102. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      103. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
=======
          
      104. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
          
      105. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            1
            

            

                context 'when associations' do
          
        106. 
        
        
      
        
        
<<<<<<< HEAD
          
      106. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 416166f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      107. 
=======
          
      108. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
          
      109. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
          
      110. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      111. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
          
      112. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      113. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
          
      114. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
          
      115. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
=======
          
      116. 
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      117. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
          
      118. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      119. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
=======
          
      120. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
          
      121. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
          
      122. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
=======
          
      123. 
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      124. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
          
      125. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      126. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
          
      127. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
          
      128. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
=======
          
      129. 
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      130. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
=======
          
      131. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      132. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
=======
          
      133. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
          
      134. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            2
            

            

<<<<<<< HEAD
                  it { is_expected.to belong_to(:user) }
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 416166f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
                  it { is_expected.to belong_to(:user) }
=======
                  it { is_expected.to belong_to(:author) }
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
                  it { is_expected.to belong_to(:author) }
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
                  it { is_expected.to belong_to(:author) }
>>>>>>> 4e81ea2 (Featire specs)
=======
                  it { is_expected.to belong_to(:author) }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
                  it { is_expected.to belong_to(:author) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to belong_to(:author) }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
                  it { is_expected.to belong_to(:author) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
                  it { is_expected.to belong_to(:author) }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to belong_to(:author) }
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
                  it { is_expected.to belong_to(:author) }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to belong_to(:author) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to belong_to(:author) }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to belong_to(:author) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
                  it { is_expected.to belong_to(:author) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
                  it { is_expected.to belong_to(:author) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to belong_to(:author) }
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
                  it { is_expected.to belong_to(:author) }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to belong_to(:author) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to belong_to(:author) }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to belong_to(:author) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
                  it { is_expected.to belong_to(:author) }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to belong_to(:author) }
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
                  it { is_expected.to belong_to(:author) }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to belong_to(:author) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to belong_to(:author) }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to belong_to(:author) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to belong_to(:author) }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
        135. 
        
        
      
        
        
<<<<<<< HEAD
          
      135. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      136. 
=======
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
          
      137. 
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
<<<<<<< HEAD
          
      138. 
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
<<<<<<< HEAD
          
      139. 
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
          
      140. 
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 0676508 (Featire specs)
=======
<<<<<<< HEAD
          
      141. 
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
          
      142. 
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      143. 
            2
            

            

                  it { is_expected.to belong_to(:book) }
          
        144. 
        
        
      
        
        
          
      144. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 84809242 (Featire specs)
=======
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> 365d41ed (Featire specs)
=======
=======
>>>>>>> d8abfed3 (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            
            

            

                end
          
        145. 
        
        
      
        
        
<<<<<<< HEAD
          
      145. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 416166f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      146. 
=======
          
      147. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
          
      148. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
          
      149. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      150. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
          
      151. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      152. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
          
      153. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
          
      154. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
=======
          
      155. 
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      156. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
          
      157. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      158. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
=======
          
      159. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
          
      160. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
          
      161. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
=======
          
      162. 
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      163. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
          
      164. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      165. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
          
      166. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
          
      167. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
=======
          
      168. 
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      169. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
=======
          
      170. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      171. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
=======
          
      172. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
          
      173. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            
            

            

              end
          
        174. 
        
        
      
        
        
<<<<<<< HEAD
          
      174. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 416166f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      175. 
=======
          
      176. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
          
      177. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
          
      178. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      179. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
          
      180. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      181. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
          
      182. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
          
      183. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
=======
          
      184. 
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      185. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
          
      186. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      187. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
=======
          
      188. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
          
      189. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
          
      190. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
=======
          
      191. 
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      192. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
          
      193. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      194. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
          
      195. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
          
      196. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
=======
          
      197. 
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      198. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
=======
          
      199. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      200. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
=======
          
      201. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
          
      202. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            
            

            

            end
          
        203. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/models/book_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      16 relevant lines.
      16 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

<<<<<<< HEAD
            RSpec.describe Book, type: :model do
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 416166f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            RSpec.describe Book, type: :model do
=======
            require 'rails_helper'
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
            require 'rails_helper'
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
            require 'rails_helper'
>>>>>>> 4e81ea2 (Featire specs)
=======
            require 'rails_helper'
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
            require 'rails_helper'
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
            require 'rails_helper'
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
            require 'rails_helper'
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
            require 'rails_helper'
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
=======
            require 'rails_helper'
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
            require 'rails_helper'
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
            require 'rails_helper'
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
            require 'rails_helper'
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
=======
            require 'rails_helper'
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
            require 'rails_helper'
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
            require 'rails_helper'
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
=======
            require 'rails_helper'
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
            require 'rails_helper'
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
            require 'rails_helper'
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
            require 'rails_helper'
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
            require 'rails_helper'
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
            require 'rails_helper'
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
=======
            require 'rails_helper'
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
            require 'rails_helper'
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
=======
            require 'rails_helper'
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
            require 'rails_helper'
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
=======
            require 'rails_helper'
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
            require 'rails_helper'
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
        2. 
        
        
      
        
        
<<<<<<< HEAD
          
      2. 
            1
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 416166f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      3. 
            1
=======
          
      4. 
            
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 6cdb2e1 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
          
      5. 
            
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> fd3f47ab (Featire specs)
          
      6. 
            
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      7. 
            
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
          
      8. 
            
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 37e48018 (Featire specs)
=======
          
      9. 
            
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
          
      10. 
            
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
          
      11. 
            
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      12. 
            
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
            

            

<<<<<<< HEAD
              describe 'books' do
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
          
      13. 
            
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      14. 
            
>>>>>>> 7a02bbe (Featire specs)
=======
          
      15. 
            
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
          
      16. 
            
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      17. 
            
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
=======
=======
          
      18. 
            
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      19. 
            
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
          
      20. 
            
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      21. 
            
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
=======
          
      22. 
            
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5506bd0 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 416166f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
          
      23. 
            
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      24. 
            
>>>>>>> 7a02bbe (Featire specs)
=======
          
      25. 
            
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
              describe 'books' do
=======
            
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
            
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
            
>>>>>>> 4e81ea2 (Featire specs)
=======
            
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
            
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
            
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
            
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
            
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
=======
            
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
            
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
            
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
            
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
=======
            
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
            
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
            
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
=======
            
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
            
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
            
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
            
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
            
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
            
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
=======
            
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
            
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
=======
            
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
            
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
=======
            
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
            
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
        26. 
        
        
      
        
        
          
      26. 
            1
            

            

<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
>>>>>>> 0676508 (Featire specs)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            RSpec.describe Book, type: :model do
          
        27. 
        
        
      
        
        
          
      27. 
            1
            

            

              describe 'books' do
          
        28. 
        
        
      
        
        
          
      28. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 84809242 (Featire specs)
=======
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> 365d41ed (Featire specs)
=======
=======
>>>>>>> d8abfed3 (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
                context 'when validations' do
          
        29. 
        
        
      
        
        
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 365d41ed (Featire specs)
=======
>>>>>>> c05ee511 (Featire specs)
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      29. 
            2
            

            

                  it { is_expected.to validate_presence_of(:title) }
          
        30. 
        
        
      
        
        
          
      30. 
            2
            

            

                  it { is_expected.to validate_presence_of(:description) }
          
        31. 
        
        
      
        
        
<<<<<<< HEAD
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
=======
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      31. 
            2
            

            

<<<<<<< HEAD
                  it { is_expected.to allow_values(Constants::MIN_PRICE_IN_CENTS, Constants::MAX_PRICE_IN_CENTS).for(:price_cents) }
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 416166f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
                  it { is_expected.to allow_values(Constants::MIN_PRICE_IN_CENTS, Constants::MAX_PRICE_IN_CENTS).for(:price_cents) }
=======
                  it { is_expected.to validate_presence_of(:title) }
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
                  it { is_expected.to validate_presence_of(:title) }
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
                  it { is_expected.to validate_presence_of(:title) }
>>>>>>> 4e81ea2 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:title) }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
                  it { is_expected.to validate_presence_of(:title) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to validate_presence_of(:title) }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
                  it { is_expected.to validate_presence_of(:title) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
                  it { is_expected.to validate_presence_of(:title) }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to validate_presence_of(:title) }
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:title) }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to validate_presence_of(:title) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to validate_presence_of(:title) }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to validate_presence_of(:title) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
                  it { is_expected.to validate_presence_of(:title) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
                  it { is_expected.to validate_presence_of(:title) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to validate_presence_of(:title) }
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:title) }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to validate_presence_of(:title) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to validate_presence_of(:title) }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to validate_presence_of(:title) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
                  it { is_expected.to validate_presence_of(:title) }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to validate_presence_of(:title) }
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:title) }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to validate_presence_of(:title) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to validate_presence_of(:title) }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to validate_presence_of(:title) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to validate_presence_of(:title) }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
        32. 
        
        
      
        
        
          
      32. 
            2
            

            

<<<<<<< HEAD
                  it { is_expected.to validate_presence_of(:year_of_publication) }
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 416166f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
                  it { is_expected.to validate_presence_of(:year_of_publication) }
=======
                  it { is_expected.to validate_presence_of(:description) }
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
                  it { is_expected.to validate_presence_of(:description) }
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
                  it { is_expected.to validate_presence_of(:description) }
>>>>>>> 4e81ea2 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:description) }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
                  it { is_expected.to validate_presence_of(:description) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to validate_presence_of(:description) }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
                  it { is_expected.to validate_presence_of(:description) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
                  it { is_expected.to validate_presence_of(:description) }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to validate_presence_of(:description) }
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:description) }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to validate_presence_of(:description) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to validate_presence_of(:description) }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to validate_presence_of(:description) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
                  it { is_expected.to validate_presence_of(:description) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
                  it { is_expected.to validate_presence_of(:description) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to validate_presence_of(:description) }
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:description) }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to validate_presence_of(:description) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to validate_presence_of(:description) }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to validate_presence_of(:description) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
                  it { is_expected.to validate_presence_of(:description) }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to validate_presence_of(:description) }
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:description) }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to validate_presence_of(:description) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to validate_presence_of(:description) }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to validate_presence_of(:description) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to validate_presence_of(:description) }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
        33. 
        
        
      
        
        
          
      33. 
            2
            

            

<<<<<<< HEAD
                  it { is_expected.to validate_presence_of(:quantity) }
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 416166f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
                  it { is_expected.to validate_presence_of(:quantity) }
=======
                  it { is_expected.to validate_presence_of(:price) }
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
                  it { is_expected.to validate_presence_of(:price) }
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
                  it { is_expected.to validate_presence_of(:price) }
>>>>>>> 4e81ea2 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:price) }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
                  it { is_expected.to validate_presence_of(:price) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to validate_presence_of(:price) }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
                  it { is_expected.to validate_presence_of(:price) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
                  it { is_expected.to validate_presence_of(:price) }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to validate_presence_of(:price) }
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:price) }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to validate_presence_of(:price) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to validate_presence_of(:price) }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to validate_presence_of(:price) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
                  it { is_expected.to validate_presence_of(:price) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
                  it { is_expected.to validate_presence_of(:price) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to validate_presence_of(:price) }
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:price) }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to validate_presence_of(:price) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to validate_presence_of(:price) }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to validate_presence_of(:price) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
                  it { is_expected.to validate_presence_of(:price) }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to validate_presence_of(:price) }
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:price) }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to validate_presence_of(:price) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to validate_presence_of(:price) }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to validate_presence_of(:price) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to validate_presence_of(:price) }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
        34. 
        
        
      
        
        
          
      34. 
            2
            

            

<<<<<<< HEAD
                  it { is_expected.to validate_presence_of(:materials) }
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 416166f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
                  it { is_expected.to validate_presence_of(:materials) }
=======
                  it { is_expected.to validate_presence_of(:year_of_publication) }
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
                  it { is_expected.to validate_presence_of(:year_of_publication) }
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
                  it { is_expected.to validate_presence_of(:year_of_publication) }
>>>>>>> 4e81ea2 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:year_of_publication) }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
                  it { is_expected.to validate_presence_of(:year_of_publication) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to validate_presence_of(:year_of_publication) }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
                  it { is_expected.to validate_presence_of(:year_of_publication) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
                  it { is_expected.to validate_presence_of(:year_of_publication) }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to validate_presence_of(:year_of_publication) }
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:year_of_publication) }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to validate_presence_of(:year_of_publication) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to validate_presence_of(:year_of_publication) }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to validate_presence_of(:year_of_publication) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
                  it { is_expected.to validate_presence_of(:year_of_publication) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
                  it { is_expected.to validate_presence_of(:year_of_publication) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to validate_presence_of(:year_of_publication) }
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:year_of_publication) }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to validate_presence_of(:year_of_publication) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to validate_presence_of(:year_of_publication) }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to validate_presence_of(:year_of_publication) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
                  it { is_expected.to validate_presence_of(:year_of_publication) }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to validate_presence_of(:year_of_publication) }
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:year_of_publication) }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to validate_presence_of(:year_of_publication) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to validate_presence_of(:year_of_publication) }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to validate_presence_of(:year_of_publication) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to validate_presence_of(:year_of_publication) }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
        35. 
        
        
      
        
        
          
      35. 
            2
            

            

<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
>>>>>>> 0676508 (Featire specs)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
                  it { is_expected.to validate_presence_of(:quantity) }
          
        36. 
        
        
      
        
        
          
      36. 
            2
            

            

                  it { is_expected.to validate_presence_of(:materials) }
          
        37. 
        
        
      
        
        
          
      37. 
            2
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 84809242 (Featire specs)
=======
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> 365d41ed (Featire specs)
=======
=======
>>>>>>> d8abfed3 (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
                  it { is_expected.to validate_presence_of(:dimensions) }
          
        38. 
        
        
      
        
        
<<<<<<< HEAD
          
      38. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 416166f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      39. 
=======
          
      40. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
          
      41. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
          
      42. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      43. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
          
      44. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      45. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
          
      46. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
          
      47. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
=======
          
      48. 
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      49. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
          
      50. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      51. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
=======
          
      52. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
          
      53. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
          
      54. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
=======
          
      55. 
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      56. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
          
      57. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      58. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
          
      59. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
          
      60. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
=======
          
      61. 
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      62. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
=======
          
      63. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      64. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
=======
          
      65. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
          
      66. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            
            

            

                end
          
        67. 
        
        
      
        
        
<<<<<<< HEAD
          
      67. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 416166f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      68. 
=======
          
      69. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
          
      70. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
          
      71. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      72. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
          
      73. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      74. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
          
      75. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
          
      76. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
=======
          
      77. 
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      78. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
          
      79. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      80. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
=======
          
      81. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
          
      82. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
          
      83. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
=======
          
      84. 
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      85. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
          
      86. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      87. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
          
      88. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
          
      89. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
=======
          
      90. 
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      91. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
=======
          
      92. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      93. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
=======
          
      94. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
          
      95. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            
            

            

            
          
        96. 
        
        
      
        
        
<<<<<<< HEAD
          
      96. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 416166f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      97. 
=======
          
      98. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
          
      99. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
          
      100. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      101. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
          
      102. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      103. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
          
      104. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
          
      105. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
=======
          
      106. 
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      107. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
          
      108. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      109. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
=======
          
      110. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
          
      111. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
          
      112. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
=======
          
      113. 
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      114. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
          
      115. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      116. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
          
      117. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
          
      118. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
=======
          
      119. 
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      120. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
=======
          
      121. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      122. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
=======
          
      123. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
          
      124. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            1
            

            

                context 'when associations' do
          
        125. 
        
        
      
        
        
<<<<<<< HEAD
          
      125. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 416166f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      126. 
=======
          
      127. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
          
      128. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
          
      129. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      130. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
          
      131. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      132. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
          
      133. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
          
      134. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
=======
          
      135. 
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      136. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
          
      137. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      138. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
=======
          
      139. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
          
      140. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
          
      141. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
=======
          
      142. 
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      143. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
          
      144. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      145. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
          
      146. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
          
      147. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
=======
          
      148. 
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      149. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
=======
          
      150. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      151. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
=======
          
      152. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
          
      153. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            2
            

            

                  it { is_expected.to have_many(:authors_books).dependent(:destroy) }
          
        154. 
        
        
      
        
        
<<<<<<< HEAD
          
      154. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 416166f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      155. 
=======
          
      156. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
          
      157. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
          
      158. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      159. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
          
      160. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      161. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
          
      162. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
          
      163. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
=======
          
      164. 
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      165. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
          
      166. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      167. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
=======
          
      168. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
          
      169. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
          
      170. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
=======
          
      171. 
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      172. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
          
      173. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      174. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
          
      175. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
          
      176. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
=======
          
      177. 
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      178. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
=======
          
      179. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      180. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
=======
          
      181. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
          
      182. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            2
            

            

                  it { is_expected.to have_many(:authors).through(:authors_books) }
          
        183. 
        
        
      
        
        
<<<<<<< HEAD
          
      183. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 416166f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      184. 
=======
          
      185. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
          
      186. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
          
      187. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      188. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
          
      189. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      190. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
          
      191. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
          
      192. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
=======
          
      193. 
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      194. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
          
      195. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      196. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
=======
          
      197. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
          
      198. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
          
      199. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
=======
          
      200. 
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      201. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
          
      202. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      203. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
          
      204. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
          
      205. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
=======
          
      206. 
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      207. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
=======
          
      208. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      209. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
=======
          
      210. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
          
      211. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            
            

            

            
          
        212. 
        
        
      
        
        
<<<<<<< HEAD
          
      212. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 416166f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      213. 
=======
          
      214. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
          
      215. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
          
      216. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      217. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
          
      218. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      219. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
          
      220. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
          
      221. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
=======
          
      222. 
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      223. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
          
      224. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      225. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
=======
          
      226. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
          
      227. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
          
      228. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
=======
          
      229. 
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      230. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
          
      231. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      232. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
          
      233. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
          
      234. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
=======
          
      235. 
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      236. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
=======
          
      237. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      238. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
=======
          
      239. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
          
      240. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            2
            

            

                  it { is_expected.to have_many(:books_categories).dependent(:destroy) }
          
        241. 
        
        
      
        
        
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 365d41ed (Featire specs)
=======
>>>>>>> c05ee511 (Featire specs)
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      241. 
            2
            

            

                  it { is_expected.to have_many(:categories).through(:books_categories) }
          
        242. 
        
        
      
        
        
          
      242. 
            
            

            

            
          
        243. 
        
        
      
        
        
<<<<<<< HEAD
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
=======
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      243. 
            2
            

            

<<<<<<< HEAD
                  it { is_expected.to have_many(:reviews).dependent(:destroy) }
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 416166f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
                  it { is_expected.to have_many(:reviews).dependent(:destroy) }
=======
                  it { is_expected.to have_many(:categories).through(:books_categories) }
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
                  it { is_expected.to have_many(:categories).through(:books_categories) }
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
                  it { is_expected.to have_many(:categories).through(:books_categories) }
>>>>>>> 4e81ea2 (Featire specs)
=======
                  it { is_expected.to have_many(:categories).through(:books_categories) }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
                  it { is_expected.to have_many(:categories).through(:books_categories) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to have_many(:categories).through(:books_categories) }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
                  it { is_expected.to have_many(:categories).through(:books_categories) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
                  it { is_expected.to have_many(:categories).through(:books_categories) }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to have_many(:categories).through(:books_categories) }
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
                  it { is_expected.to have_many(:categories).through(:books_categories) }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to have_many(:categories).through(:books_categories) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to have_many(:categories).through(:books_categories) }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to have_many(:categories).through(:books_categories) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
                  it { is_expected.to have_many(:categories).through(:books_categories) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
                  it { is_expected.to have_many(:categories).through(:books_categories) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to have_many(:categories).through(:books_categories) }
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
                  it { is_expected.to have_many(:categories).through(:books_categories) }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to have_many(:categories).through(:books_categories) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to have_many(:categories).through(:books_categories) }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to have_many(:categories).through(:books_categories) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
                  it { is_expected.to have_many(:categories).through(:books_categories) }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to have_many(:categories).through(:books_categories) }
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
                  it { is_expected.to have_many(:categories).through(:books_categories) }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to have_many(:categories).through(:books_categories) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to have_many(:categories).through(:books_categories) }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to have_many(:categories).through(:books_categories) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to have_many(:categories).through(:books_categories) }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
        244. 
        
        
      
        
        
          
      244. 
            
            

            

                end
          
        245. 
        
        
      
        
        
          
      245. 
            
            

            

              end
          
        246. 
        
        
      
        
        
          
      246. 
            
            

            

            end
          
        247. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/models/books_category_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 365d41ed (Featire specs)
=======
>>>>>>> c05ee511 (Featire specs)
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
      8 relevant lines.
      8 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            RSpec.describe BooksCategory, type: :model do
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

              describe 'books_categories' do
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

                context 'when validations' do
          
        4. 
        
        
      
        
        
          
      4. 
            2
            

            

                  it { is_expected.to validate_presence_of(:book) }
          
        5. 
        
        
      
        
        
          
      5. 
            2
            

            

                  it { is_expected.to validate_presence_of(:category) }
          
        6. 
        
        
      
        
        
          
      6. 
            
            

            

                end
          
        7. 
        
        
      
        
        
          
      7. 
            
            

            

            
          
        8. 
        
        
      
        
        
          
      8. 
            1
            

            

                context 'when associations' do
          
        9. 
        
        
      
        
        
          
      9. 
            2
            

            

                  it { is_expected.to belong_to(:category) }
          
        10. 
        
        
      
        
        
          
      10. 
            2
            

            

                  it { is_expected.to belong_to(:book) }
          
        11. 
        
        
      
        
        
          
      11. 
            
            

            

                end
          
        12. 
        
        
      
        
        
          
      12. 
            
            

            

              end
          
        13. 
        
        
      
        
        
          
      13. 
            
            

            

            end
          
        14. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/models/category_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      7 relevant lines.
      7 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            RSpec.describe Category, type: :model do
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

              describe 'category' do
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

                context 'when validations' do
          
        4. 
        
        
      
        
        
          
      4. 
            2
            

            

                  it { is_expected.to validate_presence_of(:name) }
          
        5. 
        
        
      
        
        
          
      5. 
            
            

            

                end
          
        6. 
        
        
      
        
        
          
      6. 
            
            

            

            
          
        7. 
        
        
      
        
        
          
      7. 
            1
            

            

                context 'when associations' do
          
        8. 
        
        
      
        
        
          
      8. 
            2
            

            

                  it { is_expected.to have_many(:books_categories).dependent(:destroy) }
          
        9. 
        
        
      
        
        
          
      9. 
            2
            

            

                  it { is_expected.to have_many(:books).through(:books_categories) }
          
        10. 
        
        
      
        
        
          
      10. 
            
            

            

                end
          
        11. 
        
        
      
        
        
          
      11. 
            
            

            

              end
          
        12. 
        
        
      
        
        
          
      12. 
            
            

            

            end
          
        13. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/models/review_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      14 relevant lines.
      14 lines covered and
<<<<<<< HEAD
=======
=======
      9 relevant lines.
      9 lines covered and
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 6cdb2e1 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
      9 relevant lines.
      9 lines covered and
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> fd3f47ab (Featire specs)
      9 relevant lines.
      9 lines covered and
>>>>>>> 4e81ea2 (Featire specs)
=======
      9 relevant lines.
      9 lines covered and
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
      9 relevant lines.
      9 lines covered and
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 37e48018 (Featire specs)
=======
      9 relevant lines.
      9 lines covered and
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
      9 relevant lines.
      9 lines covered and
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
      9 relevant lines.
      9 lines covered and
>>>>>>> 4e81ea2 (Featire specs)
=======
      9 relevant lines.
      9 lines covered and
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
      9 relevant lines.
      9 lines covered and
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
      9 relevant lines.
      9 lines covered and
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
      9 relevant lines.
      9 lines covered and
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
      9 relevant lines.
      9 lines covered and
>>>>>>> 4e81ea2 (Featire specs)
=======
      9 relevant lines.
      9 lines covered and
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
      9 relevant lines.
      9 lines covered and
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
      9 relevant lines.
      9 lines covered and
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
      9 relevant lines.
      9 lines covered and
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
      9 relevant lines.
      9 lines covered and
>>>>>>> 4e81ea2 (Featire specs)
=======
      9 relevant lines.
      9 lines covered and
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
=======
      9 relevant lines.
      9 lines covered and
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
      9 relevant lines.
      9 lines covered and
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
=======
      9 relevant lines.
      9 lines covered and
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            require 'rails_helper'
          
        2. 
        
        
      
        
        
          
      2. 
            
            

            

            
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

<<<<<<< HEAD
            RSpec.describe Review, type: :model do
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 416166f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            RSpec.describe Review, type: :model do
=======
            RSpec.describe BooksCategory, type: :model do
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
            RSpec.describe BooksCategory, type: :model do
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
            RSpec.describe BooksCategory, type: :model do
>>>>>>> 4e81ea2 (Featire specs)
=======
            RSpec.describe BooksCategory, type: :model do
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
            RSpec.describe BooksCategory, type: :model do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
            RSpec.describe BooksCategory, type: :model do
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
            RSpec.describe BooksCategory, type: :model do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
            RSpec.describe BooksCategory, type: :model do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
=======
            RSpec.describe BooksCategory, type: :model do
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
            RSpec.describe BooksCategory, type: :model do
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
            RSpec.describe BooksCategory, type: :model do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
            RSpec.describe BooksCategory, type: :model do
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
=======
            RSpec.describe BooksCategory, type: :model do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
            RSpec.describe BooksCategory, type: :model do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
            RSpec.describe BooksCategory, type: :model do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
=======
            RSpec.describe BooksCategory, type: :model do
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
            RSpec.describe BooksCategory, type: :model do
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
            RSpec.describe BooksCategory, type: :model do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
            RSpec.describe BooksCategory, type: :model do
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
            RSpec.describe BooksCategory, type: :model do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
            RSpec.describe BooksCategory, type: :model do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
=======
            RSpec.describe BooksCategory, type: :model do
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
            RSpec.describe BooksCategory, type: :model do
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
=======
            RSpec.describe BooksCategory, type: :model do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
            RSpec.describe BooksCategory, type: :model do
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
=======
            RSpec.describe BooksCategory, type: :model do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
            RSpec.describe BooksCategory, type: :model do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
        4. 
        
        
      
        
        
          
      4. 
            1
            

            

<<<<<<< HEAD
              describe 'review' do
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 416166f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
              describe 'review' do
=======
              describe 'books_categories' do
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
              describe 'books_categories' do
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
              describe 'books_categories' do
>>>>>>> 4e81ea2 (Featire specs)
=======
              describe 'books_categories' do
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
              describe 'books_categories' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
              describe 'books_categories' do
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
              describe 'books_categories' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
              describe 'books_categories' do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
=======
              describe 'books_categories' do
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
              describe 'books_categories' do
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
              describe 'books_categories' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
              describe 'books_categories' do
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
=======
              describe 'books_categories' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
              describe 'books_categories' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
              describe 'books_categories' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
=======
              describe 'books_categories' do
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
              describe 'books_categories' do
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
              describe 'books_categories' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
              describe 'books_categories' do
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
              describe 'books_categories' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
              describe 'books_categories' do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
=======
              describe 'books_categories' do
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
              describe 'books_categories' do
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
=======
              describe 'books_categories' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
              describe 'books_categories' do
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
=======
              describe 'books_categories' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
              describe 'books_categories' do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
        5. 
        
        
      
        
        
          
      5. 
            1
            

            

                context 'when validations' do
          
        6. 
        
        
      
        
        
          
      6. 
            2
            

            

<<<<<<< HEAD
                  it { is_expected.to validate_presence_of(:title) }
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 416166f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
                  it { is_expected.to validate_presence_of(:title) }
=======
                  it { is_expected.to validate_presence_of(:book) }
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
                  it { is_expected.to validate_presence_of(:book) }
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
                  it { is_expected.to validate_presence_of(:book) }
>>>>>>> 4e81ea2 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:book) }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
                  it { is_expected.to validate_presence_of(:book) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to validate_presence_of(:book) }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
                  it { is_expected.to validate_presence_of(:book) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
                  it { is_expected.to validate_presence_of(:book) }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to validate_presence_of(:book) }
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:book) }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to validate_presence_of(:book) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to validate_presence_of(:book) }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to validate_presence_of(:book) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
                  it { is_expected.to validate_presence_of(:book) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
                  it { is_expected.to validate_presence_of(:book) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to validate_presence_of(:book) }
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:book) }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to validate_presence_of(:book) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to validate_presence_of(:book) }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to validate_presence_of(:book) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
                  it { is_expected.to validate_presence_of(:book) }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to validate_presence_of(:book) }
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:book) }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to validate_presence_of(:book) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to validate_presence_of(:book) }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to validate_presence_of(:book) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to validate_presence_of(:book) }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
        7. 
        
        
      
        
        
          
      7. 
            2
            

            

<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 365d41ed (Featire specs)
=======
>>>>>>> c05ee511 (Featire specs)
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
                  it { is_expected.to validate_presence_of(:body) }
          
        8. 
        
        
      
        
        
          
      8. 
            2
            

            

                  it { is_expected.to validate_presence_of(:rating) }
          
        9. 
        
        
      
        
        
          
      9. 
            2
            

            

                  it { is_expected.to validate_presence_of(:verified) }
          
        10. 
        
        
      
        
        
          
      10. 
            2
            

            

                  it { is_expected.to allow_values('a' * Constants::VALIDATES_TITLE_LENGTH_MAX).for(:title) }
          
        11. 
        
        
      
        
        
          
      11. 
            2
            

            

                  it { is_expected.to allow_values('a' * Constants::VALIDATES_TEXT_LENGTH_MAX).for(:body) }
          
        12. 
        
        
      
        
        
          
      12. 
            2
            

            

                  it { is_expected.to allow_values(1, 2, 3, 4, 5).for(:rating) }
          
        13. 
        
        
      
        
        
          
      13. 
            
            

            

                end
          
        14. 
        
        
      
        
        
          
      14. 
            
            

            

            
          
        15. 
        
        
      
        
        
          
      15. 
            1
            

            

                context 'when associations' do
          
        16. 
        
        
      
        
        
          
      16. 
            2
            

            

                  it { is_expected.to belong_to(:book) }
          
        17. 
        
        
      
        
        
          
      17. 
            2
            

            

                  it { is_expected.to belong_to(:user) }
          
        18. 
        
        
      
        
        
          
      18. 
            
            

            

                end
          
        19. 
        
        
      
        
        
          
      19. 
            
            

            

              end
          
        20. 
        
        
      
        
        
          
      20. 
            
            

            

            end
          
        21. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/models/shipping_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      20 relevant lines.
      20 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            RSpec.describe Shipping, type: :model do
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

              describe 'shipping' do
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

                context 'when validations' do
          
        4. 
        
        
      
        
        
          
      4. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::Name.first_name).for(:first_name) }
          
        5. 
        
        
      
        
        
          
      5. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::Name.first_name).for(:last_name) }
          
        6. 
        
        
      
        
        
          
      6. 
            2
            

            

                  it { is_expected.to allow_values('+919367788755', '8989829304', '+16308520397', '786-307-3615').for(:phone) }
          
        7. 
        
        
      
        
        
          
      7. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::AddressUK.country).for(:country) }
          
        8. 
        
        
      
        
        
          
      8. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::AddressUK.city).for(:city) }
          
        9. 
        
        
      
        
        
          
      9. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::AddressUA.zip_code).for(:zip) }
          
        10. 
        
        
      
        
        
          
      10. 
            2
            

            

                  it { is_expected.to allow_values(FFaker::Address.street_address).for(:address) }
          
        11. 
        
        
      
        
        
          
      11. 
            
            

            

                end
          
        12. 
        
        
      
        
        
          
      12. 
            
            

            

            
          
        13. 
        
        
      
        
        
          
      13. 
            1
            

            

                context 'when not validations' do
          
        14. 
        
        
      
        
        
          
      14. 
            2
            

            

                  it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:first_name) }
          
        15. 
        
        
      
        
        
          
      15. 
            2
            

            

                  it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:last_name) }
          
        16. 
        
        
      
        
        
          
      16. 
            2
            

            

                  it { is_expected.not_to allow_values('789', '123765', '1-1-1', '+982').for(:phone) }
          
        17. 
        
        
      
        
        
          
      17. 
            2
            

            

                  it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:country) }
          
        18. 
        
        
      
        
        
          
      18. 
            2
            

            

                  it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:city) }
          
        19. 
        
        
      
        
        
          
      19. 
            2
            

            

                  it { is_expected.not_to allow_values('1' * Constants::VALIDATES_ZIP_LENGTH_MAX.next).for(:zip) }
          
        20. 
        
        
      
        
        
          
      20. 
            2
            

            

                  it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:address) }
          
        21. 
        
        
      
        
        
          
      21. 
            
            

            

                end
          
        22. 
        
        
      
        
        
          
      22. 
            
            

            

            
          
        23. 
        
        
      
        
        
          
      23. 
            1
            

            

                context 'when associations' do
          
        24. 
        
        
      
        
        
          
      24. 
            2
            

            

                  it { is_expected.to belong_to(:user) }
          
        25. 
        
        
      
        
        
          
      25. 
            
            

            

                end
          
        26. 
        
        
      
        
        
          
      26. 
            
            

            

              end
          
        27. 
        
        
      
        
        
          
      27. 
            
            

            

            end
          
        28. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/models/user_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      9 relevant lines.
      9 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            RSpec.describe User, type: :model do
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

              let(:user) { FactoryBot.create(:user) }
          
        3. 
        
        
      
        
        
          
      3. 
            
            

            

            
          
        4. 
        
        
      
        
        
          
      4. 
            1
            

            

              describe 'author' do
          
        5. 
        
        
      
        
        
          
      5. 
            1
            

            

                context 'when validations' do
          
        6. 
        
        
      
        
        
          
      6. 
            2
            

            

                  it { is_expected.to validate_presence_of(:email) }
          
        7. 
        
        
      
        
        
          
      7. 
            2
            

            

                  it { is_expected.to validate_presence_of(:password) }
<<<<<<< HEAD
=======
=======
                  it { is_expected.to validate_presence_of(:category) }
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
                  it { is_expected.to validate_presence_of(:category) }
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
                  it { is_expected.to validate_presence_of(:category) }
>>>>>>> 4e81ea2 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:category) }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
                  it { is_expected.to validate_presence_of(:category) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to validate_presence_of(:category) }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
                  it { is_expected.to validate_presence_of(:category) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
                  it { is_expected.to validate_presence_of(:category) }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to validate_presence_of(:category) }
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:category) }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to validate_presence_of(:category) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to validate_presence_of(:category) }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to validate_presence_of(:category) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
                  it { is_expected.to validate_presence_of(:category) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
                  it { is_expected.to validate_presence_of(:category) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to validate_presence_of(:category) }
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:category) }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to validate_presence_of(:category) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to validate_presence_of(:category) }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to validate_presence_of(:category) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
                  it { is_expected.to validate_presence_of(:category) }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to validate_presence_of(:category) }
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:category) }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to validate_presence_of(:category) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to validate_presence_of(:category) }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to validate_presence_of(:category) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to validate_presence_of(:category) }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
        8. 
        
        
      
        
        
          
      8. 
            
            

            

                end
          
        9. 
        
        
      
        
        
          
      9. 
            
            

            

            
          
        10. 
        
        
      
        
        
          
      10. 
            1
            

            

<<<<<<< HEAD
                context 'with associations' do
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 416166f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
                context 'with associations' do
=======
                context 'when associations' do
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
                context 'when associations' do
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
                context 'when associations' do
>>>>>>> 4e81ea2 (Featire specs)
=======
                context 'when associations' do
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
                context 'when associations' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                context 'when associations' do
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
                context 'when associations' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
                context 'when associations' do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
=======
                context 'when associations' do
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
                context 'when associations' do
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
                context 'when associations' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                context 'when associations' do
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
=======
                context 'when associations' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
                context 'when associations' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
                context 'when associations' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
=======
                context 'when associations' do
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
                context 'when associations' do
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
                context 'when associations' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                context 'when associations' do
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
                context 'when associations' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
                context 'when associations' do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
=======
                context 'when associations' do
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
                context 'when associations' do
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
=======
                context 'when associations' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                context 'when associations' do
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
=======
                context 'when associations' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
                context 'when associations' do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
        11. 
        
        
      
        
        
          
      11. 
            2
            

            

<<<<<<< HEAD
                  it { is_expected.to have_one(:billing) }
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 416166f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
                  it { is_expected.to have_one(:billing) }
=======
                  it { is_expected.to belong_to(:category) }
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
                  it { is_expected.to belong_to(:category) }
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
                  it { is_expected.to belong_to(:category) }
>>>>>>> 4e81ea2 (Featire specs)
=======
                  it { is_expected.to belong_to(:category) }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
                  it { is_expected.to belong_to(:category) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to belong_to(:category) }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
                  it { is_expected.to belong_to(:category) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
                  it { is_expected.to belong_to(:category) }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to belong_to(:category) }
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
                  it { is_expected.to belong_to(:category) }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to belong_to(:category) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to belong_to(:category) }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to belong_to(:category) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
                  it { is_expected.to belong_to(:category) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
                  it { is_expected.to belong_to(:category) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to belong_to(:category) }
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
                  it { is_expected.to belong_to(:category) }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to belong_to(:category) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to belong_to(:category) }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to belong_to(:category) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
                  it { is_expected.to belong_to(:category) }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to belong_to(:category) }
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
                  it { is_expected.to belong_to(:category) }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to belong_to(:category) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to belong_to(:category) }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to belong_to(:category) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to belong_to(:category) }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
        12. 
        
        
      
        
        
          
      12. 
            2
            

            

<<<<<<< HEAD
                  it { is_expected.to have_one(:shipping) }
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 416166f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
                  it { is_expected.to have_one(:shipping) }
=======
                  it { is_expected.to belong_to(:book) }
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
                  it { is_expected.to belong_to(:book) }
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
                  it { is_expected.to belong_to(:book) }
>>>>>>> 4e81ea2 (Featire specs)
=======
                  it { is_expected.to belong_to(:book) }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
                  it { is_expected.to belong_to(:book) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to belong_to(:book) }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
                  it { is_expected.to belong_to(:book) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
                  it { is_expected.to belong_to(:book) }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to belong_to(:book) }
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
                  it { is_expected.to belong_to(:book) }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to belong_to(:book) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to belong_to(:book) }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to belong_to(:book) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
                  it { is_expected.to belong_to(:book) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
                  it { is_expected.to belong_to(:book) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to belong_to(:book) }
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
                  it { is_expected.to belong_to(:book) }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to belong_to(:book) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to belong_to(:book) }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to belong_to(:book) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
                  it { is_expected.to belong_to(:book) }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to belong_to(:book) }
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
                  it { is_expected.to belong_to(:book) }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to belong_to(:book) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to belong_to(:book) }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to belong_to(:book) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to belong_to(:book) }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
        13. 
        
        
      
        
        
          
      13. 
            
            

            

                end
          
        14. 
        
        
      
        
        
          
      14. 
            
            

            

              end
          
        15. 
        
        
      
        
        
          
      15. 
            
            

            

            end
          
        16. 
        
        
      
    
      
  
      

      

      
<<<<<<< HEAD
        
      
  
      
    
      spec/queryes/book_query_spec.rb
      
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 416166f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
        
      
  
      
    
      spec/queryes/book_query_spec.rb
      
=======
        
      
  
      
    
      spec/models/category_spec.rb
      
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 6cdb2e1 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
        
      
  
      
    
      spec/models/category_spec.rb
      
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> fd3f47ab (Featire specs)
        
      
  
      
    
      spec/models/category_spec.rb
      
>>>>>>> 4e81ea2 (Featire specs)
=======
        
      
  
      
    
      spec/models/category_spec.rb
      
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
        
      
  
      
    
      spec/models/category_spec.rb
      
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 37e48018 (Featire specs)
=======
        
      
  
      
    
      spec/models/category_spec.rb
      
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
        
      
  
      
    
      spec/models/category_spec.rb
      
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
        
      
  
      
    
      spec/models/category_spec.rb
      
>>>>>>> 4e81ea2 (Featire specs)
=======
        
      
  
      
    
      spec/models/category_spec.rb
      
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
        
      
  
      
    
      spec/models/category_spec.rb
      
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
        
      
  
      
    
      spec/models/category_spec.rb
      
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
        
      
  
      
    
      spec/models/category_spec.rb
      
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
        
      
  
      
    
      spec/models/category_spec.rb
      
>>>>>>> 4e81ea2 (Featire specs)
=======
        
      
  
      
    
      spec/models/category_spec.rb
      
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
        
      
  
      
    
      spec/models/category_spec.rb
      
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
        
      
  
      
    
      spec/models/category_spec.rb
      
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
        
      
  
      
    
      spec/models/category_spec.rb
      
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
        
      
  
      
    
      spec/models/category_spec.rb
      
>>>>>>> 4e81ea2 (Featire specs)
=======
        
      
  
      
    
      spec/models/category_spec.rb
      
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
=======
        
      
  
      
    
      spec/models/category_spec.rb
      
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
        
      
  
      
    
      spec/models/category_spec.rb
      
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
=======
        
      
  
      
    
      spec/models/category_spec.rb
      
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
    
      
      
  100.0%


      lines covered
    
      

    

    
      
<<<<<<< HEAD
      45 relevant lines.
      45 lines covered and
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 416166f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
      45 relevant lines.
      45 lines covered and
=======
      8 relevant lines.
      8 lines covered and
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 6cdb2e1 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
      8 relevant lines.
      8 lines covered and
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> fd3f47ab (Featire specs)
      8 relevant lines.
      8 lines covered and
>>>>>>> 4e81ea2 (Featire specs)
=======
      8 relevant lines.
      8 lines covered and
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
      8 relevant lines.
      8 lines covered and
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 37e48018 (Featire specs)
=======
      8 relevant lines.
      8 lines covered and
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
      8 relevant lines.
      8 lines covered and
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
      8 relevant lines.
      8 lines covered and
>>>>>>> 4e81ea2 (Featire specs)
=======
      8 relevant lines.
      8 lines covered and
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
      8 relevant lines.
      8 lines covered and
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
      8 relevant lines.
      8 lines covered and
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
      8 relevant lines.
      8 lines covered and
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
      8 relevant lines.
      8 lines covered and
>>>>>>> 4e81ea2 (Featire specs)
=======
      8 relevant lines.
      8 lines covered and
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
      8 relevant lines.
      8 lines covered and
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
      8 relevant lines.
      8 lines covered and
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
      8 relevant lines.
      8 lines covered and
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
      8 relevant lines.
      8 lines covered and
>>>>>>> 4e81ea2 (Featire specs)
=======
      8 relevant lines.
      8 lines covered and
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
=======
      8 relevant lines.
      8 lines covered and
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
      8 relevant lines.
      8 lines covered and
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
=======
      8 relevant lines.
      8 lines covered and
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            require 'rails_helper'
          
        2. 
        
        
      
        
        
          
      2. 
            
            

            

            
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

<<<<<<< HEAD
            RSpec.describe BookQuery do
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 416166f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            RSpec.describe BookQuery do
=======
            RSpec.describe Category, type: :model do
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
            RSpec.describe Category, type: :model do
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
            RSpec.describe Category, type: :model do
>>>>>>> 4e81ea2 (Featire specs)
=======
            RSpec.describe Category, type: :model do
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
            RSpec.describe Category, type: :model do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
            RSpec.describe Category, type: :model do
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
            RSpec.describe Category, type: :model do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
            RSpec.describe Category, type: :model do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
=======
            RSpec.describe Category, type: :model do
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
            RSpec.describe Category, type: :model do
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
            RSpec.describe Category, type: :model do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
            RSpec.describe Category, type: :model do
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
=======
            RSpec.describe Category, type: :model do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
            RSpec.describe Category, type: :model do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
            RSpec.describe Category, type: :model do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
=======
            RSpec.describe Category, type: :model do
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
            RSpec.describe Category, type: :model do
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
            RSpec.describe Category, type: :model do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
            RSpec.describe Category, type: :model do
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
            RSpec.describe Category, type: :model do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
            RSpec.describe Category, type: :model do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
=======
            RSpec.describe Category, type: :model do
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
            RSpec.describe Category, type: :model do
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
=======
            RSpec.describe Category, type: :model do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
            RSpec.describe Category, type: :model do
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
=======
            RSpec.describe Category, type: :model do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
            RSpec.describe Category, type: :model do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
        4. 
        
        
      
        
        
          
      4. 
            1
            

            

<<<<<<< HEAD
              shared_examples 'sort test' do
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 416166f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
              shared_examples 'sort test' do
=======
              describe 'category' do
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
              describe 'category' do
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
              describe 'category' do
>>>>>>> 4e81ea2 (Featire specs)
=======
              describe 'category' do
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
              describe 'category' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
              describe 'category' do
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
              describe 'category' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
              describe 'category' do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
=======
              describe 'category' do
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
              describe 'category' do
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
              describe 'category' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
              describe 'category' do
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
=======
              describe 'category' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
              describe 'category' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
              describe 'category' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
=======
              describe 'category' do
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
              describe 'category' do
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
              describe 'category' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
              describe 'category' do
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
              describe 'category' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
              describe 'category' do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
=======
              describe 'category' do
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
              describe 'category' do
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
=======
              describe 'category' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
              describe 'category' do
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
=======
              describe 'category' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
              describe 'category' do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
        5. 
        
        
      
        
        
<<<<<<< HEAD
          
      5. 
            5
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 416166f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      6. 
            5
=======
          
      7. 
            1
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 6cdb2e1 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
          
      8. 
            1
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> fd3f47ab (Featire specs)
          
      9. 
            1
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      10. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
          
      11. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 37e48018 (Featire specs)
=======
          
      12. 
            1
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
          
      13. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
          
      14. 
            1
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      15. 
            1
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
            

            

<<<<<<< HEAD
                it 'sort' do
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
          
      16. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      17. 
            1
>>>>>>> 7a02bbe (Featire specs)
=======
          
      18. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
          
      19. 
            1
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      20. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
=======
=======
          
      21. 
            1
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      22. 
            1
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
          
      23. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      24. 
            1
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
=======
          
      25. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5506bd0 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 416166f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
          
      26. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      27. 
            1
>>>>>>> 7a02bbe (Featire specs)
=======
          
      28. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
                it 'sort' do
=======
                context 'when validations' do
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
                context 'when validations' do
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
                context 'when validations' do
>>>>>>> 4e81ea2 (Featire specs)
=======
                context 'when validations' do
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
                context 'when validations' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                context 'when validations' do
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
                context 'when validations' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
                context 'when validations' do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
=======
                context 'when validations' do
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
                context 'when validations' do
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
                context 'when validations' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                context 'when validations' do
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
=======
                context 'when validations' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
                context 'when validations' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
                context 'when validations' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
=======
                context 'when validations' do
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
                context 'when validations' do
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
                context 'when validations' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                context 'when validations' do
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
                context 'when validations' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
                context 'when validations' do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
=======
                context 'when validations' do
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
                context 'when validations' do
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
=======
                context 'when validations' do
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                context 'when validations' do
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
=======
                context 'when validations' do
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
                context 'when validations' do
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
        29. 
        
        
      
        
        
<<<<<<< HEAD
          
      29. 
            5
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 416166f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      30. 
            5
=======
          
      31. 
            2
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 6cdb2e1 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
          
      32. 
            2
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> fd3f47ab (Featire specs)
          
      33. 
            2
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      34. 
            2
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
          
      35. 
            2
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 37e48018 (Featire specs)
=======
          
      36. 
            2
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
          
      37. 
            2
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
          
      38. 
            2
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      39. 
            2
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
            

            

<<<<<<< HEAD
                  books
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
          
      40. 
            2
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      41. 
            2
>>>>>>> 7a02bbe (Featire specs)
=======
          
      42. 
            2
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
          
      43. 
            2
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      44. 
            2
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
=======
=======
          
      45. 
            2
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      46. 
            2
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
          
      47. 
            2
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      48. 
            2
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
=======
          
      49. 
            2
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5506bd0 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 416166f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
          
      50. 
            2
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      51. 
            2
>>>>>>> 7a02bbe (Featire specs)
=======
          
      52. 
            2
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
                  books
=======
                  it { is_expected.to validate_presence_of(:name) }
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
                  it { is_expected.to validate_presence_of(:name) }
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
                  it { is_expected.to validate_presence_of(:name) }
>>>>>>> 4e81ea2 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:name) }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
                  it { is_expected.to validate_presence_of(:name) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to validate_presence_of(:name) }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
                  it { is_expected.to validate_presence_of(:name) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
                  it { is_expected.to validate_presence_of(:name) }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to validate_presence_of(:name) }
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:name) }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to validate_presence_of(:name) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to validate_presence_of(:name) }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to validate_presence_of(:name) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
                  it { is_expected.to validate_presence_of(:name) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
                  it { is_expected.to validate_presence_of(:name) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to validate_presence_of(:name) }
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:name) }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to validate_presence_of(:name) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to validate_presence_of(:name) }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to validate_presence_of(:name) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
                  it { is_expected.to validate_presence_of(:name) }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to validate_presence_of(:name) }
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
                  it { is_expected.to validate_presence_of(:name) }
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to validate_presence_of(:name) }
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
                  it { is_expected.to validate_presence_of(:name) }
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to validate_presence_of(:name) }
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
                  it { is_expected.to validate_presence_of(:name) }
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
        53. 
        
        
      
        
        
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 365d41ed (Featire specs)
=======
>>>>>>> c05ee511 (Featire specs)
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      53. 
            5
            

            

                  expect(test).to eq(result)
          
        54. 
        
        
      
        
        
          
      54. 
<<<<<<< HEAD
=======
=======
          
      55. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
          
      56. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
          
      57. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      58. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
          
      59. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      60. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
          
      61. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
          
      62. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
=======
          
      63. 
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      64. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
          
      65. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      66. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
=======
          
      67. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
          
      68. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
          
      69. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
=======
          
      70. 
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      71. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
          
      72. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      73. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
          
      74. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
          
      75. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
=======
          
      76. 
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      77. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
=======
          
      78. 
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      79. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
=======
          
      80. 
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
          
      81. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            
            

            

                end
          
        82. 
        
        
      
        
        
<<<<<<< HEAD
          
      82. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      83. 
=======
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
          
      84. 
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
<<<<<<< HEAD
          
      85. 
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
<<<<<<< HEAD
          
      86. 
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
          
      87. 
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 0676508 (Featire specs)
=======
<<<<<<< HEAD
          
      88. 
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
          
      89. 
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      90. 
            
            

            

            
          
        91. 
        
        
      
        
        
          
      91. 
            1
            

            

                context 'when associations' do
          
        92. 
        
        
      
        
        
          
      92. 
            2
            

            

                  it { is_expected.to have_many(:books_categories).dependent(:destroy) }
          
        93. 
        
        
      
        
        
          
      93. 
            2
            

            

                  it { is_expected.to have_many(:books).through(:books_categories) }
          
        94. 
        
        
      
        
        
          
      94. 
            
            

            

                end
          
        95. 
        
        
      
        
        
          
      95. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 84809242 (Featire specs)
=======
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> 365d41ed (Featire specs)
=======
=======
>>>>>>> d8abfed3 (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            
            

            

              end
          
        96. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 563720e (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
>>>>>>> 448bef30 (Featire specs)
>>>>>>> a636fda (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
=======
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
=======
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      96. 
            
            

            

            end
          
        97. 
        
        
      
    
      
  
      

      

      
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> bae2b7de (Add login registration pages)
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 56fd9d41 (Add login registration pages)
=======
>>>>>>> 84003439 (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6066f925 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9bfbd88 (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> 70fcacc (Featire specs)
=======
>>>>>>> 78717cc (Manifest_cache true)
=======
>>>>>>> 824bb2b (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
>>>>>>> df37394 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 7a08014b (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> c05ee511 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> df37394 (Featire specs)
>>>>>>> 4f4ea3f9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 9bfbd88 (Featire specs)
>>>>>>> ebcdce06 (Featire specs)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
<<<<<<< HEAD
>>>>>>> 9bfbd88 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9bfbd88 (Featire specs)
<<<<<<< HEAD
>>>>>>> ebcdce06 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> bd8bda4 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> 824bb2b (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> e5890c2 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 9ec6862 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 6066f925 (Add login registration pages)
=======
=======
>>>>>>> 57a2e05 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 8249ff3c (Add login registration pages)
=======
=======
=======
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> cacbab9 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e989024d (Add login registration pages)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> c59d1a99 (Manifest_cache true)
=======
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> e5890c2 (Manifest_cache true)
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
<<<<<<< HEAD
=======
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
=======
>>>>>>> df37394 (Featire specs)
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
=======
>>>>>>> df37394 (Featire specs)
=======
=======
=======
=======
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a8b17c32 (Add login registration pages)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> 9ec6862 (Add login registration pages)
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
=======
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> cacbab9 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 7d58507 (Add login registration pages)
>>>>>>> 31507b8 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 29e1af94 (Add login registration pages)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
=======
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
=======
=======
>>>>>>> 9ec6862 (Add login registration pages)
>>>>>>> bae2b7de (Add login registration pages)
=======
>>>>>>> 56fd9d41 (Add login registration pages)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
=======
>>>>>>> df37394 (Featire specs)
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
=======
=======
>>>>>>> df37394 (Featire specs)
=======
=======
=======
=======
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 9ec6862 (Add login registration pages)
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
=======
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> cacbab9 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 7d58507 (Add login registration pages)
>>>>>>> 31507b8 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> a8b17c32 (Add login registration pages)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> 03c0867 (Add login registration pages)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> bd8bda4 (Manifest_cache true)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
>>>>>>> df37394 (Featire specs)
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
=======
>>>>>>> df37394 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 9ec6862 (Add login registration pages)
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
=======
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> cacbab9 (Add login registration pages)
>>>>>>> 7d58507 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> c871248 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e011b0df (Add login registration pages)
=======
=======
=======
=======
>>>>>>> 715fac2 (Featire specs)
<<<<<<< HEAD
>>>>>>> fb61c5a (Featire specs)
<<<<<<< HEAD
>>>>>>> 73f364d8 (Featire specs)
=======
=======
=======
>>>>>>> 0b43b18 (Manifest_cache true)
=======
=======
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 03c0867 (Add login registration pages)
>>>>>>> 8d4ec55 (Add login registration pages)
>>>>>>> 73dcd461 (Add login registration pages)
        
      
  
      
    
      spec/models/user_spec.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      3 relevant lines.
      3 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            require 'rails_helper'
          
        2. 
        
        
      
        
        
          
      2. 
            
            

            

            
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

            RSpec.describe User, type: :model do
          
        4. 
        
        
      
        
        
          
      4. 
            1
            

            

              pending "add some examples to (or delete) #{__FILE__}"
          
        5. 
        
        
      
        
        
          
      5. 
            
            

            

            end
          
        6. 
        
        
      
    
      
  
      

      

      
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 31507b8 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 31507b8 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6066f925 (Add login registration pages)
=======
=======
>>>>>>> 57a2e05 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 8249ff3c (Add login registration pages)
=======
=======
>>>>>>> 84809242 (Featire specs)
=======
>>>>>>> 4f4ea3f9 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 7a08014b (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> cacbab9 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e989024d (Add login registration pages)
=======
=======
>>>>>>> 29e1af94 (Add login registration pages)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> a8b17c32 (Add login registration pages)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
>>>>>>> 7d58507 (Add login registration pages)
>>>>>>> 31507b8 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 29e1af94 (Add login registration pages)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> bae2b7de (Add login registration pages)
=======
=======
>>>>>>> cacbab9 (Add login registration pages)
>>>>>>> 56fd9d41 (Add login registration pages)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> c51bf93 (Featire specs)
>>>>>>> 7a08014b (Featire specs)
=======
=======
>>>>>>> 7d58507 (Add login registration pages)
>>>>>>> 31507b8 (Add login registration pages)
>>>>>>> a8b17c32 (Add login registration pages)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
=======
>>>>>>> fb61c5a (Featire specs)
=======
>>>>>>> 8d4ec55 (Add login registration pages)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 57a2e05 (Add login registration pages)
=======
>>>>>>> cacbab9 (Add login registration pages)
>>>>>>> 7d58507 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> c871248 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e011b0df (Add login registration pages)
=======
=======
=======
>>>>>>> 03c0867 (Add login registration pages)
>>>>>>> 8d4ec55 (Add login registration pages)
>>>>>>> 73dcd461 (Add login registration pages)
>>>>>>> 1214e1f (Add login registration pages)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> ebcdce06 (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> 183b6c5 (Manifest_cache true)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 9bfbd88 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
<<<<<<< HEAD
=======
>>>>>>> adc21e0 (Featire specs)
<<<<<<< HEAD
=======
=======
>>>>>>> 84d0df6 (Manifest_cache true)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> adc21e0 (Featire specs)
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 416166f (Featire specs)
>>>>>>> a2206025 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
=======
>>>>>>> 183b6c5 (Manifest_cache true)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8249ff3c (Add login registration pages)
=======
>>>>>>> 84809242 (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bb5c652 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 22ee41c (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 88d49ad (Add login registration pages)
=======
=======
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 70fcacc (Featire specs)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
<<<<<<< HEAD
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b9cc4e9 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 78717cc (Manifest_cache true)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 6fa625b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 98beee2 (Manifest_cache true)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> ae409ca (Featire specs)
=======
=======
>>>>>>> c8cdb08 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 385b8df (Manifest_cache true)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 379a979 (Featire specs)
=======
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 7bc7f9f (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 490b01d6 (Manifest_cache true)
=======
=======
>>>>>>> 7bc7f9f (Manifest_cache true)
>>>>>>> bae2b7de (Add login registration pages)
=======
=======
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> 9ec6862 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 156ffe6 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 6066f925 (Add login registration pages)
=======
=======
>>>>>>> 156ffe6 (Add login registration pages)
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> adc21e0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
=======
=======
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 24b58e6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 84d0df6 (Manifest_cache true)
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 57a2e05 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 793a6ed (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8249ff3c (Add login registration pages)
=======
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 4d90e3d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
=======
=======
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 00f8b58 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 450f4e3 (Manifest_cache true)
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> cacbab9 (Add login registration pages)
>>>>>>> c5efe8e (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e989024d (Add login registration pages)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
>>>>>>> 0f8241bb (Featire specs)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> da3a9a3 (Featire specs)
>>>>>>> b5ac3004 (Featire specs)
>>>>>>> 22ee41c (Add login registration pages)
=======
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 659083f (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
=======
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 6fa625b (Manifest_cache true)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
>>>>>>> b3f2049 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> f92a45b (Featire specs)
=======
=======
>>>>>>> 715fac2 (Featire specs)
>>>>>>> 1214e1f (Add login registration pages)
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
<<<<<<< HEAD
=======
=======
>>>>>>> 0e864a5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> c8cdb08 (Manifest_cache true)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> c8cdb08 (Manifest_cache true)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 0e864a5 (Manifest_cache true)
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e5890c2 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 251144b4 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
=======
>>>>>>> 1cce66c (Manifest_cache true)
>>>>>>> 86d584a (Manifest_cache true)
=======
=======
>>>>>>> 416166f (Featire specs)
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> 9ec6862 (Add login registration pages)
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
=======
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
=======
=======
>>>>>>> da3a9a3 (Featire specs)
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 57a2e05 (Add login registration pages)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 00f8b58 (Manifest_cache true)
<<<<<<< HEAD
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> cacbab9 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 7d58507 (Add login registration pages)
>>>>>>> 31507b8 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 29e1af94 (Add login registration pages)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> ebcdce06 (Featire specs)
=======
>>>>>>> 7bc7f9f (Manifest_cache true)
>>>>>>> c59d1a99 (Manifest_cache true)
=======
>>>>>>> 156ffe6 (Add login registration pages)
>>>>>>> bae2b7de (Add login registration pages)
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 450f4e3 (Manifest_cache true)
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
>>>>>>> 56fd9d41 (Add login registration pages)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> cacbab9 (Add login registration pages)
>>>>>>> c5efe8e (Add login registration pages)
>>>>>>> 56fd9d41 (Add login registration pages)
=======
=======
>>>>>>> 4d4cf6b4 (Featire specs)
>>>>>>> 22ee41c (Add login registration pages)
=======
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
=======
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
=======
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 6fa625b (Manifest_cache true)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> 1214e1f (Add login registration pages)
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> c8cdb08 (Manifest_cache true)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> c8cdb08 (Manifest_cache true)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e5890c2 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 1214e1f (Add login registration pages)
>>>>>>> 9ec6862 (Add login registration pages)
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 730a8ca (Add login registration pages)
>>>>>>> 57a2e05 (Add login registration pages)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 00f8b58 (Manifest_cache true)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> cacbab9 (Add login registration pages)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 7d58507 (Add login registration pages)
>>>>>>> 31507b8 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> a8b17c32 (Add login registration pages)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 22ee41c (Add login registration pages)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> b3f2049 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
>>>>>>> 0e864a5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> cc390719 (Manifest_cache true)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
=======
=======
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 00f8b58 (Manifest_cache true)
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
=======
>>>>>>> e1f4d17 (Add login registration pages)
>>>>>>> cacbab9 (Add login registration pages)
>>>>>>> 7d58507 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> c871248 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> e011b0df (Add login registration pages)
=======
=======
=======
>>>>>>> 715fac2 (Featire specs)
<<<<<<< HEAD
>>>>>>> fb61c5a (Featire specs)
<<<<<<< HEAD
>>>>>>> 73f364d8 (Featire specs)
=======
=======
=======
>>>>>>> 22ee41c (Add login registration pages)
>>>>>>> 03c0867 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 8d4ec55 (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 73dcd461 (Add login registration pages)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 0b43b18 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1cce66c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d365be68 (Manifest_cache true)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
        
      
  
      
    
      spec/rails_helper.rb
      
    
      
      
  87.5%


      lines covered
    
      

    

    
      
      16 relevant lines.
      14 lines covered and
      2 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            require 'spec_helper'
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

            ENV['RAILS_ENV'] ||= 'test'
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

            require_relative '../config/environment'
          
        4. 
        
        
      
        
        
          
      4. 
            1
            

            

            abort('The Rails environment is running in production mode!') if Rails.env.production?
          
        5. 
        
        
      
        
        
          
      5. 
            1
            

            

            require 'rspec/rails'
          
        6. 
        
        
      
        
        
          
      6. 
            1
            

            

            require 'shoulda-matchers'
          
        7. 
        
        
      
        
        
          
      7. 
            
            

            

            
          
        8. 
        
        
      
        
        
          
      8. 
            1
            

            

            require_relative 'support/configs/shoulda_matcher'
          
        9. 
        
        
      
        
        
          
      9. 
            1
            

            

            require_relative 'support/configs/capybara'
          
        10. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
>>>>>>> aca90e3 (Rebased)
<<<<<<< HEAD
=======
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
=======
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
>>>>>>> 9a49b7b (Rebased)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 70fcacc (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ae409ca (Featire specs)
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 37e48018 (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 379a979 (Featire specs)
=======
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> adc21e0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 4d90e3d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
>>>>>>> c033601 (Rebased)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 824bb2b (Featire specs)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 6cdb2e1 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
=======
=======
>>>>>>> aca90e3 (Rebased)
>>>>>>> c7a726c5 (Rebased)
=======
=======
>>>>>>> 37e48018 (Featire specs)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> adc21e0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 610b6138 (Featire specs)
=======
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 4d90e3d (Featire specs)
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      10. 
            
            

            

            
          
        11. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
          
      11. 
            3
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      12. 
            3
=======
          
      13. 
            
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 6cdb2e1 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
          
      14. 
            
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
          
      15. 
            
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      16. 
<<<<<<< HEAD
=======
            
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 610b6138 (Featire specs)
            
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
          
      17. 
            
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> fd3f47ab (Featire specs)
          
      18. 
            
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      19. 
            
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
=======
=======
          
      20. 
            
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
          
      21. 
            
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      22. 
            
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
=======
          
      23. 
            
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
=======
=======
          
      24. 
            
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      25. 
            
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
=======
=======
=======
          
      26. 
            
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
            

            

>>>>>>> 37e48018 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
          
      27. 
            
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
=======
          
      28. 
            3
>>>>>>> c7a726c5 (Rebased)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
              let(:titles) { %w[Adam Zimbabwe] }
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
              let(:titles) { %w[Adam Zimbabwe] }
=======
            begin
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
            begin
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
            begin
>>>>>>> 4e81ea2 (Featire specs)
=======
            begin
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
            begin
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
            begin
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
=======
            begin
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
            begin
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
            begin
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
              let(:titles) { %w[Adam Zimbabwe] }
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
            begin
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 37e48018 (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
=======
            begin
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
            begin
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
            begin
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
            begin
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
=======
            begin
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
            begin
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
=======
            begin
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
            begin
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
=======
            begin
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
        29. 
        
        
      
        
        
          
      29. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
              let(:books_dates) do
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
              let(:books_dates) do
=======
              ActiveRecord::Migration.maintain_test_schema!
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
              ActiveRecord::Migration.maintain_test_schema!
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
              ActiveRecord::Migration.maintain_test_schema!
>>>>>>> 4e81ea2 (Featire specs)
=======
              ActiveRecord::Migration.maintain_test_schema!
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
              ActiveRecord::Migration.maintain_test_schema!
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
              ActiveRecord::Migration.maintain_test_schema!
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
=======
              ActiveRecord::Migration.maintain_test_schema!
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
              ActiveRecord::Migration.maintain_test_schema!
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
              ActiveRecord::Migration.maintain_test_schema!
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
              let(:books_dates) do
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
              ActiveRecord::Migration.maintain_test_schema!
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 37e48018 (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
=======
              ActiveRecord::Migration.maintain_test_schema!
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
              ActiveRecord::Migration.maintain_test_schema!
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
              ActiveRecord::Migration.maintain_test_schema!
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
              ActiveRecord::Migration.maintain_test_schema!
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
=======
              ActiveRecord::Migration.maintain_test_schema!
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
              ActiveRecord::Migration.maintain_test_schema!
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
=======
              ActiveRecord::Migration.maintain_test_schema!
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
              ActiveRecord::Migration.maintain_test_schema!
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
=======
              ActiveRecord::Migration.maintain_test_schema!
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
        30. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
          
      30. 
            1
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      31. 
            1
=======
          
      32. 
            
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 6cdb2e1 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
          
      33. 
            
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
          
      34. 
            
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      35. 
<<<<<<< HEAD
=======
            
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 610b6138 (Featire specs)
            
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
          
      36. 
            
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> fd3f47ab (Featire specs)
          
      37. 
            
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      38. 
            
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
=======
=======
          
      39. 
            
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
          
      40. 
            
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      41. 
            
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
=======
          
      42. 
            
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
=======
=======
          
      43. 
            
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      44. 
            
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
=======
=======
=======
          
      45. 
            
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
            

            

>>>>>>> 37e48018 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
          
      46. 
            
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
=======
          
      47. 
            1
>>>>>>> c7a726c5 (Rebased)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
                ['Thu, 25 Aug 2022 15:25:38.761014000 UTC +00:00', 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00']
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
                ['Thu, 25 Aug 2022 15:25:38.761014000 UTC +00:00', 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00']
=======
            rescue ActiveRecord::PendingMigrationError => e
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
            rescue ActiveRecord::PendingMigrationError => e
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
            rescue ActiveRecord::PendingMigrationError => e
>>>>>>> 4e81ea2 (Featire specs)
=======
            rescue ActiveRecord::PendingMigrationError => e
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
            rescue ActiveRecord::PendingMigrationError => e
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
            rescue ActiveRecord::PendingMigrationError => e
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
=======
            rescue ActiveRecord::PendingMigrationError => e
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
            rescue ActiveRecord::PendingMigrationError => e
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
            rescue ActiveRecord::PendingMigrationError => e
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
                ['Thu, 25 Aug 2022 15:25:38.761014000 UTC +00:00', 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00']
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
            rescue ActiveRecord::PendingMigrationError => e
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 37e48018 (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
=======
            rescue ActiveRecord::PendingMigrationError => e
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
            rescue ActiveRecord::PendingMigrationError => e
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
            rescue ActiveRecord::PendingMigrationError => e
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
            rescue ActiveRecord::PendingMigrationError => e
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
=======
            rescue ActiveRecord::PendingMigrationError => e
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
            rescue ActiveRecord::PendingMigrationError => e
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
=======
            rescue ActiveRecord::PendingMigrationError => e
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
            rescue ActiveRecord::PendingMigrationError => e
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
=======
            rescue ActiveRecord::PendingMigrationError => e
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
        48. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      48. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 009401d (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 610b6138 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      49. 
=======
          
      50. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
          
      51. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
=======
=======
          
      52. 
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      53. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
=======
          
      54. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
=======
          
      55. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
=======
          
      56. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
            
            

            

>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
          
      57. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      58. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
=======
=======
          
      59. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
=======
          
      60. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
=======
=======
=======
          
      61. 
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      62. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
=======
          
      63. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
=======
=======
          
      64. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
            
            

            

>>>>>>> 37e48018 (Featire specs)
<<<<<<< HEAD
=======
            
            

            

>>>>>>> 610b6138 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
          
      65. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
=======
          
      66. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
=======
          
      67. 
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      68. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
          
      69. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
=======
          
      70. 
>>>>>>> c7a726c5 (Rebased)
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
              end
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
              end
=======
              puts e.to_s.strip
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
              puts e.to_s.strip
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
              puts e.to_s.strip
>>>>>>> 4e81ea2 (Featire specs)
=======
              puts e.to_s.strip
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
              puts e.to_s.strip
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
              puts e.to_s.strip
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
=======
              puts e.to_s.strip
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
              puts e.to_s.strip
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
              puts e.to_s.strip
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
              end
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
              puts e.to_s.strip
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 37e48018 (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
=======
              puts e.to_s.strip
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
              puts e.to_s.strip
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
              puts e.to_s.strip
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
              puts e.to_s.strip
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
=======
              puts e.to_s.strip
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
              puts e.to_s.strip
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
=======
              puts e.to_s.strip
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
              puts e.to_s.strip
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
=======
              puts e.to_s.strip
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
        71. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
          
      71. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      72. 
=======
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
          
      73. 
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 009401d (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
<<<<<<< HEAD
          
      74. 
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
          
      75. 
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 6cdb2e1 (Featire specs)
>>>>>>> efd6af09 (Featire specs)
=======
=======
>>>>>>> 4d4cf6b4 (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
          
      76. 
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 0676508 (Featire specs)
=======
<<<<<<< HEAD
          
      77. 
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
          
      78. 
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      79. 
            
            

            

              exit 1
          
        80. 
        
        
      
        
        
          
      80. 
            
            

            

            end
          
        81. 
        
        
      
        
        
          
      81. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
          
      82. 
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 37e48018 (Featire specs)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            
            

            

            
          
        83. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 365d41ed (Featire specs)
=======
>>>>>>> c05ee511 (Featire specs)
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      83. 
            1
            

            

              describe 'all books sort' do
          
        84. 
        
        
      
        
        
          
      84. 
            1
            

            

                context 'when sort by title A to Z' do
          
        85. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
=======
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 37e48018 (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      85. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
                  let(:books) do
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
                  let(:books) do
=======
            RSpec.configure do |config|
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
            RSpec.configure do |config|
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
            RSpec.configure do |config|
>>>>>>> 4e81ea2 (Featire specs)
=======
            RSpec.configure do |config|
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
            RSpec.configure do |config|
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
            RSpec.configure do |config|
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
=======
            RSpec.configure do |config|
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
            RSpec.configure do |config|
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
            RSpec.configure do |config|
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
                  let(:books) do
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
            RSpec.configure do |config|
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 37e48018 (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
=======
            RSpec.configure do |config|
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
            RSpec.configure do |config|
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
            RSpec.configure do |config|
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
            RSpec.configure do |config|
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
=======
            RSpec.configure do |config|
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
            RSpec.configure do |config|
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
=======
            RSpec.configure do |config|
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
            RSpec.configure do |config|
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
=======
            RSpec.configure do |config|
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
        86. 
        
        
      
        
        
          
      86. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
                    create(:book, title: titles.first)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
                    create(:book, title: titles.first)
=======
              config.fixture_path = "#{::Rails.root}/spec/fixtures"
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
              config.fixture_path = "#{::Rails.root}/spec/fixtures"
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
              config.fixture_path = "#{::Rails.root}/spec/fixtures"
>>>>>>> 4e81ea2 (Featire specs)
=======
              config.fixture_path = "#{::Rails.root}/spec/fixtures"
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
              config.fixture_path = "#{::Rails.root}/spec/fixtures"
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
              config.fixture_path = "#{::Rails.root}/spec/fixtures"
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
=======
              config.fixture_path = "#{::Rails.root}/spec/fixtures"
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
              config.fixture_path = "#{::Rails.root}/spec/fixtures"
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
              config.fixture_path = "#{::Rails.root}/spec/fixtures"
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
                    create(:book, title: titles.first)
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
              config.fixture_path = "#{::Rails.root}/spec/fixtures"
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 37e48018 (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
=======
              config.fixture_path = "#{::Rails.root}/spec/fixtures"
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
              config.fixture_path = "#{::Rails.root}/spec/fixtures"
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
              config.fixture_path = "#{::Rails.root}/spec/fixtures"
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
              config.fixture_path = "#{::Rails.root}/spec/fixtures"
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
=======
              config.fixture_path = "#{::Rails.root}/spec/fixtures"
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
              config.fixture_path = "#{::Rails.root}/spec/fixtures"
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
=======
              config.fixture_path = "#{::Rails.root}/spec/fixtures"
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
              config.fixture_path = "#{::Rails.root}/spec/fixtures"
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
=======
              config.fixture_path = "#{::Rails.root}/spec/fixtures"
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
        87. 
        
        
      
        
        
          
      87. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
                    create(:book, title: titles.second)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
                    create(:book, title: titles.second)
=======
              config.use_transactional_fixtures = true
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
              config.use_transactional_fixtures = true
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
              config.use_transactional_fixtures = true
>>>>>>> 4e81ea2 (Featire specs)
=======
              config.use_transactional_fixtures = true
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
              config.use_transactional_fixtures = true
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
              config.use_transactional_fixtures = true
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
=======
              config.use_transactional_fixtures = true
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
              config.use_transactional_fixtures = true
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
              config.use_transactional_fixtures = true
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
                    create(:book, title: titles.second)
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
              config.use_transactional_fixtures = true
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 37e48018 (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
=======
              config.use_transactional_fixtures = true
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
              config.use_transactional_fixtures = true
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
              config.use_transactional_fixtures = true
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
              config.use_transactional_fixtures = true
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
=======
              config.use_transactional_fixtures = true
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
              config.use_transactional_fixtures = true
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
=======
              config.use_transactional_fixtures = true
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
              config.use_transactional_fixtures = true
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
=======
              config.use_transactional_fixtures = true
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
        88. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 365d41ed (Featire specs)
=======
>>>>>>> c05ee511 (Featire specs)
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      88. 
            
            

            

                  end
          
        89. 
        
        
      
        
        
          
      89. 
            
            

            

            
          
        90. 
        
        
      
        
        
          
      90. 
            2
            

            

                  let(:result) { titles.second }
          
        91. 
        
        
      
        
        
          
      91. 
            2
            

            

                  let(:test) { described_class.query({ sort: 'title DESC' }).first.title }
          
        92. 
        
        
      
        
        
          
      92. 
            
            

            

            
          
        93. 
        
        
      
        
        
          
      93. 
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
          
      94. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
          
      95. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
          
      96. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      97. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
          
      98. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
          
      99. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
=======
          
      100. 
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      101. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
          
      102. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
          
      103. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 37e48018 (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
=======
          
      104. 
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      105. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
          
      106. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
          
      107. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
=======
          
      108. 
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      109. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
=======
          
      110. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
          
      111. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
=======
          
      112. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
                  include_examples 'sort test'
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
                  include_examples 'sort test'
=======
              config.infer_spec_type_from_file_location!
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
              config.infer_spec_type_from_file_location!
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
              config.infer_spec_type_from_file_location!
>>>>>>> 4e81ea2 (Featire specs)
=======
              config.infer_spec_type_from_file_location!
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
              config.infer_spec_type_from_file_location!
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
              config.infer_spec_type_from_file_location!
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
=======
              config.infer_spec_type_from_file_location!
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
              config.infer_spec_type_from_file_location!
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
              config.infer_spec_type_from_file_location!
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
                  include_examples 'sort test'
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
              config.infer_spec_type_from_file_location!
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 37e48018 (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
=======
              config.infer_spec_type_from_file_location!
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
              config.infer_spec_type_from_file_location!
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
              config.infer_spec_type_from_file_location!
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
              config.infer_spec_type_from_file_location!
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
=======
              config.infer_spec_type_from_file_location!
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
              config.infer_spec_type_from_file_location!
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
=======
              config.infer_spec_type_from_file_location!
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
              config.infer_spec_type_from_file_location!
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
=======
              config.infer_spec_type_from_file_location!
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
        113. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 365d41ed (Featire specs)
=======
>>>>>>> c05ee511 (Featire specs)
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      113. 
            
            

            

                end
          
        114. 
        
        
      
        
        
          
      114. 
            
            

            

            
          
        115. 
        
        
      
        
        
          
      115. 
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
          
      116. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
          
      117. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
          
      118. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      119. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
          
      120. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
          
      121. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
=======
          
      122. 
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      123. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
          
      124. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
          
      125. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 37e48018 (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
=======
          
      126. 
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      127. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
          
      128. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
          
      129. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
=======
          
      130. 
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      131. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
=======
          
      132. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
          
      133. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
=======
          
      134. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
                context 'when sort title Z to A' do
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
                context 'when sort title Z to A' do
=======
              config.filter_rails_from_backtrace!
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
              config.filter_rails_from_backtrace!
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
              config.filter_rails_from_backtrace!
>>>>>>> 4e81ea2 (Featire specs)
=======
              config.filter_rails_from_backtrace!
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
              config.filter_rails_from_backtrace!
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
              config.filter_rails_from_backtrace!
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
=======
              config.filter_rails_from_backtrace!
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
              config.filter_rails_from_backtrace!
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
              config.filter_rails_from_backtrace!
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
                context 'when sort title Z to A' do
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
              config.filter_rails_from_backtrace!
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 37e48018 (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
=======
              config.filter_rails_from_backtrace!
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
              config.filter_rails_from_backtrace!
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
              config.filter_rails_from_backtrace!
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
              config.filter_rails_from_backtrace!
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
=======
              config.filter_rails_from_backtrace!
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
              config.filter_rails_from_backtrace!
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
=======
              config.filter_rails_from_backtrace!
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
              config.filter_rails_from_backtrace!
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
=======
              config.filter_rails_from_backtrace!
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
        135. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 365d41ed (Featire specs)
=======
>>>>>>> c05ee511 (Featire specs)
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      135. 
            1
            

            

                  let(:books) do
          
        136. 
        
        
      
        
        
          
      136. 
            1
            

            

                    create(:book, title: titles.first)
          
        137. 
        
        
      
        
        
          
      137. 
            1
            

            

                    create(:book, title: titles.second)
          
        138. 
        
        
      
        
        
          
      138. 
            
            

            

                  end
          
        139. 
        
        
      
        
        
          
      139. 
            
            

            

            
          
        140. 
        
        
      
        
        
          
      140. 
            2
            

            

                  let(:result) { titles.first }
          
        141. 
        
        
      
        
        
          
      141. 
            2
            

            

                  let(:test) { described_class.query({ sort: 'title' }).first.title }
          
        142. 
        
        
      
        
        
          
      142. 
            
            

            

            
          
        143. 
        
        
      
        
        
          
      143. 
            1
            

            

                  include_examples 'sort test'
          
        144. 
        
        
      
        
        
          
      144. 
            
            

            

                end
          
        145. 
        
        
      
        
        
          
      145. 
            
            

            

            
          
        146. 
        
        
      
        
        
          
      146. 
            1
            

            

                context 'when sort by price High to Low' do
          
        147. 
        
        
      
        
        
          
      147. 
            1
            

            

                  let(:books) do
          
        148. 
        
        
      
        
        
          
      148. 
            1
            

            

                    create(:book, price_cents: 75)
          
        149. 
        
        
      
        
        
          
      149. 
            1
            

            

                    create(:book, price_cents: 23)
          
        150. 
        
        
      
        
        
          
      150. 
            
            

            

                  end
          
        151. 
        
        
      
        
        
          
      151. 
            
            

            

            
          
        152. 
        
        
      
        
        
          
      152. 
            2
            

            

                  let(:result) { 75 }
          
        153. 
        
        
      
        
        
          
      153. 
            2
            

            

                  let(:test) { described_class.query({ sort: 'price_cents DESC' }).first.price_cents }
          
        154. 
        
        
      
        
        
          
      154. 
            
            

            

            
          
        155. 
        
        
      
        
        
          
      155. 
            1
            

            

                  include_examples 'sort test'
          
        156. 
        
        
      
        
        
          
      156. 
            
            

            

                end
          
        157. 
        
        
      
        
        
          
      157. 
            
            

            

            
          
        158. 
        
        
      
        
        
          
      158. 
            1
            

            

                context 'when sort price Low to High' do
          
        159. 
        
        
      
        
        
          
      159. 
            1
            

            

                  let(:books) do
          
        160. 
        
        
      
        
        
          
      160. 
            1
            

            

                    create(:book, price_cents: 75)
          
        161. 
        
        
      
        
        
          
      161. 
            1
            

            

                    create(:book, price_cents: 23)
          
        162. 
        
        
      
        
        
          
      162. 
            
            

            

                  end
          
        163. 
        
        
      
        
        
          
      163. 
            
            

            

            
          
        164. 
        
        
      
        
        
          
      164. 
            2
            

            

                  let(:result) { 23 }
          
        165. 
        
        
      
        
        
          
      165. 
            2
            

            

                  let(:test) { described_class.query({ sort: 'price_cents' }).first.price_cents }
          
        166. 
        
        
      
        
        
          
      166. 
            
            

            

            
          
        167. 
        
        
      
        
        
          
      167. 
            1
            

            

                  include_examples 'sort test'
          
        168. 
        
        
      
        
        
          
      168. 
            
            

            

                end
          
        169. 
        
        
      
        
        
          
      169. 
            
            

            

            
          
        170. 
        
        
      
        
        
          
      170. 
            1
            

            

                context 'when sort by Newest' do
          
        171. 
        
        
      
        
        
          
      171. 
            1
            

            

                  let(:books) do
          
        172. 
        
        
      
        
        
          
      172. 
            1
            

            

                    create(:book, created_at: books_dates.first)
          
        173. 
        
        
      
        
        
          
      173. 
            1
            

            

                    create(:book, created_at: books_dates.second)
          
        174. 
        
        
      
        
        
          
      174. 
            
            

            

                  end
          
        175. 
        
        
      
        
        
          
      175. 
            
            

            

            
          
        176. 
        
        
      
        
        
          
      176. 
            2
            

            

                  let(:result) { books_dates.first }
          
        177. 
        
        
      
        
        
          
      177. 
            2
            

            

                  let(:test) { described_class.query({ sort: 'created_at DESC' }).first.created_at }
          
        178. 
        
        
      
        
        
          
      178. 
            
            

            

            
          
        179. 
        
        
      
        
        
          
      179. 
            1
            

            

                  include_examples 'sort test'
          
        180. 
        
        
      
        
        
          
      180. 
            
            

            

                end
          
        181. 
        
        
      
        
        
          
      181. 
            
            

            

              end
          
        182. 
        
        
      
        
        
          
      182. 
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
          
      183. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
          
      184. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
          
      185. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      186. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
          
      187. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
          
      188. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
=======
          
      189. 
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      190. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
          
      191. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
          
      192. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 37e48018 (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
=======
          
      193. 
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      194. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
          
      195. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
          
      196. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
=======
          
      197. 
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      198. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
=======
          
      199. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
          
      200. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
=======
          
      201. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            
            

            

            end
          
        202. 
        
        
      
    
      
  
      

      

      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> bdc24a1a (Rebased)
=======
>>>>>>> bf554f4 (Rebased)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
=======
>>>>>>> bf554f4 (Rebased)
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> bf554f4 (Rebased)
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> bf554f4 (Rebased)
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> bf554f4 (Rebased)
>>>>>>> 11792758 (Rebased)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
>>>>>>> bf554f4 (Rebased)
>>>>>>> e055dd0 (Rebased)
>>>>>>> bdc24a1a (Rebased)
        
      
  
      
    
      spec/support/configs/capybara.rb
      
    
      
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> e6fc67c7 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 73f364d8 (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> d365be68 (Manifest_cache true)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
      
  100.0%
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> f92a45b (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> df37394 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
>>>>>>> 904663c (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 4f4ea3f9 (Featire specs)
=======
>>>>>>> c05ee511 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> fb61c5a (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> 1cce66c (Manifest_cache true)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5506bd0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
>>>>>>> d8dd3b4a (Featire specs)
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
>>>>>>> 904663c (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 49e8a6c (Rebased)
=======
<<<<<<< HEAD
=======
=======
>>>>>>> 715fac2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 49e8a6c (Rebased)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 75fa7e1b (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 490b01d6 (Manifest_cache true)
=======
=======
>>>>>>> 84003439 (Featire specs)
      
  100.0%
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ebcdce06 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 7a08014b (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
>>>>>>> 904663c (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 49e8a6c (Rebased)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 11792758 (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 37e48018 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 610b6138 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c59d1a99 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 73f364d8 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
<<<<<<< HEAD
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
<<<<<<< HEAD
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 6fa625b (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> c8cdb08 (Manifest_cache true)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 490b01d6 (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
=======
>>>>>>> 6fa625b (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
>>>>>>> b3f2049 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> f92a45b (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e5890c2 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 251144b4 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> ebcdce06 (Featire specs)
=======
>>>>>>> c59d1a99 (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
=======
>>>>>>> 6fa625b (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e5890c2 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> b3f2049 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0e864a5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> cc390719 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 715fac2 (Featire specs)
<<<<<<< HEAD
>>>>>>> fb61c5a (Featire specs)
<<<<<<< HEAD
>>>>>>> 73f364d8 (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 0b43b18 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1cce66c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d365be68 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
      
  36.84%
=======
<<<<<<< HEAD
      
  100.0%
=======
      
  36.84%
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> e6fc67c7 (Featire specs)
=======
>>>>>>> 73f364d8 (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> 84003439 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
>>>>>>> d8dd3b4a (Featire specs)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> ebcdce06 (Featire specs)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
>>>>>>> 6da9530 (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
=======
      
  100.0%
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> c8cdb08 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> c51bf93 (Featire specs)
=======
>>>>>>> f92a45b (Featire specs)
=======
>>>>>>> fb61c5a (Featire specs)
=======
=======
>>>>>>> 3e9f99d (Featire specs)
>>>>>>> 3cf8dd4 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
=======
>>>>>>> df37394 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
<<<<<<< HEAD
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
>>>>>>> 715fac2 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> fb61c5a (Featire specs)
<<<<<<< HEAD
>>>>>>> 73f364d8 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
>>>>>>> aa4361fd (Featire specs)
      
  100.0%
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> fb61c5a (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> df37394 (Featire specs)
>>>>>>> c51bf93 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> c51bf93 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> df37394 (Featire specs)
=======
=======
>>>>>>> efd6af09 (Featire specs)
      
  100.0%
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
>>>>>>> c51bf93 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
      
  36.84%
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b832d45 (Featire specs)
>>>>>>> 84809242 (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
      
  100.0%
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e5890c2 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e5890c2 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 490b01d6 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 251144b4 (Manifest_cache true)
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 86d584a (Manifest_cache true)
>>>>>>> e5890c2 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4a0e3b6 (Manifest_cache true)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> df37394 (Featire specs)
>>>>>>> f92a45b (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 715fac2 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 73f364d8 (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
      
  36.84%
>>>>>>> bd8bda4 (Manifest_cache true)
=======
      
  100.0%
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ebcdce06 (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 73f364d8 (Featire specs)
>>>>>>> 6da9530 (Featire specs)
=======
=======
>>>>>>> fb61c5a (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
>>>>>>> 86d584a (Manifest_cache true)
>>>>>>> 0e864a5 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> cc390719 (Manifest_cache true)
=======
>>>>>>> 715fac2 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 73f364d8 (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
>>>>>>> 0b43b18 (Manifest_cache true)
=======
>>>>>>> d365be68 (Manifest_cache true)
      
  36.84%
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> c59d1a99 (Manifest_cache true)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
>>>>>>> 73f364d8 (Featire specs)
=======
>>>>>>> d365be68 (Manifest_cache true)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 416166f (Featire specs)
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> 0e864a5 (Manifest_cache true)
>>>>>>> cc390719 (Manifest_cache true)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5890c2 (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 9440753 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> e5890c2 (Manifest_cache true)
=======
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
>>>>>>> 1cce66c (Manifest_cache true)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 715fac2 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> fb61c5a (Featire specs)
<<<<<<< HEAD
>>>>>>> 73f364d8 (Featire specs)
=======
=======
>>>>>>> 0b43b18 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 1cce66c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d365be68 (Manifest_cache true)
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> e1ecabbe (Featire specs)
      
  100.0%
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 610b6138 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 9bfbd88 (Featire specs)
<<<<<<< HEAD
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
      
  36.84%
>>>>>>> 183b6c5 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
=======
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
>>>>>>> fb61c5a (Featire specs)
<<<<<<< HEAD
>>>>>>> 73f364d8 (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
>>>>>>> afa56d1 (Featire specs)
>>>>>>> e1ecabbe (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
=======
      
  36.84%
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
      
  100.0%
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bb5c652 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 824bb2b (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
      
  100.0%
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
      
  100.0%
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
>>>>>>> 9a49b7b (Rebased)
=======
>>>>>>> 009401d (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
      
  36.84%
>>>>>>> b9cc4e9 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
>>>>>>> 78717cc (Manifest_cache true)
=======
=======
>>>>>>> 6fa625b (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 98beee2 (Manifest_cache true)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> ae409ca (Featire specs)
=======
=======
>>>>>>> c8cdb08 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 385b8df (Manifest_cache true)
=======
=======
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 379a979 (Featire specs)
=======
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 7bc7f9f (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 490b01d6 (Manifest_cache true)
=======
=======
>>>>>>> 7bc7f9f (Manifest_cache true)
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> adc21e0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 84d0df6 (Manifest_cache true)
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
=======
=======
=======
      
  100.0%
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 4d90e3d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
=======
=======
      
  36.84%
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 00f8b58 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 450f4e3 (Manifest_cache true)
=======
=======
=======
      
  100.0%
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
>>>>>>> 11792758 (Rebased)
=======
=======
      
  36.84%
>>>>>>> bf554f4 (Rebased)
>>>>>>> aa3618b (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 75fa7e1b (Rebased)
=======
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
>>>>>>> 6fa625b (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 0676508 (Featire specs)
>>>>>>> 448bef30 (Featire specs)
=======
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
>>>>>>> aa4361fd (Featire specs)
>>>>>>> b3f2049 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6fa625b (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> c8cdb08 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e5890c2 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 251144b4 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 24b58e6 (Manifest_cache true)
<<<<<<< HEAD
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
      
  100.0%
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
      
  36.84%
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 00f8b58 (Manifest_cache true)
=======
=======
      
  100.0%
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
      
  36.84%
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 49e8a6c (Rebased)
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> 13fca83d (Rebased)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
=======
      
  100.0%
>>>>>>> c7a726c5 (Rebased)
=======
=======
      
  100.0%
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 9bfbd88 (Featire specs)
>>>>>>> ebcdce06 (Featire specs)
=======
>>>>>>> 7bc7f9f (Manifest_cache true)
>>>>>>> c59d1a99 (Manifest_cache true)
=======
>>>>>>> 610b6138 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 84d0df6 (Manifest_cache true)
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 11792758 (Rebased)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> b3f2049 (Featire specs)
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6fa625b (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> c8cdb08 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e5890c2 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
      
  100.0%
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
      
  36.84%
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 00f8b58 (Manifest_cache true)
=======
=======
      
  100.0%
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
      
  36.84%
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 49e8a6c (Rebased)
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> bc6bc8d2 (Rebased)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> b3f2049 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0e864a5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> cc390719 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
      
  100.0%
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
=======
=======
      
  36.84%
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 00f8b58 (Manifest_cache true)
=======
=======
      
  100.0%
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
      
  36.84%
>>>>>>> bf554f4 (Rebased)
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 715fac2 (Featire specs)
<<<<<<< HEAD
>>>>>>> fb61c5a (Featire specs)
<<<<<<< HEAD
>>>>>>> 73f364d8 (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 0b43b18 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1cce66c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d365be68 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)


      lines covered
    
      

    

    
      
      19 relevant lines.
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> e6fc67c7 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> d365be68 (Manifest_cache true)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
      19 lines covered and
      0 lines missed.
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> f92a45b (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> df37394 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
>>>>>>> 904663c (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 4f4ea3f9 (Featire specs)
=======
>>>>>>> c05ee511 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 1cce66c (Manifest_cache true)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> df37394 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5506bd0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
>>>>>>> d8dd3b4a (Featire specs)
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
>>>>>>> 904663c (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 49e8a6c (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 49e8a6c (Rebased)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 75fa7e1b (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 490b01d6 (Manifest_cache true)
=======
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 73f364d8 (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
      19 lines covered and
      0 lines missed.
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ebcdce06 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 7a08014b (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> fb61c5a (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
>>>>>>> 904663c (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 49e8a6c (Rebased)
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
=======
>>>>>>> 715fac2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 73f364d8 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 11792758 (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 37e48018 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 610b6138 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c59d1a99 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 73f364d8 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
<<<<<<< HEAD
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
<<<<<<< HEAD
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 6fa625b (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> c8cdb08 (Manifest_cache true)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 490b01d6 (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
=======
>>>>>>> 6fa625b (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
>>>>>>> b3f2049 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> f92a45b (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e5890c2 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 251144b4 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> ebcdce06 (Featire specs)
=======
>>>>>>> c59d1a99 (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
=======
>>>>>>> 6fa625b (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e5890c2 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> b3f2049 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0e864a5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> cc390719 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 715fac2 (Featire specs)
<<<<<<< HEAD
>>>>>>> fb61c5a (Featire specs)
<<<<<<< HEAD
>>>>>>> 73f364d8 (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 0b43b18 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1cce66c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d365be68 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
      7 lines covered and
      12 lines missed.
=======
<<<<<<< HEAD
      19 lines covered and
      0 lines missed.
=======
      7 lines covered and
      12 lines missed.
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> e6fc67c7 (Featire specs)
=======
>>>>>>> 73f364d8 (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> 84003439 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
>>>>>>> d8dd3b4a (Featire specs)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> ebcdce06 (Featire specs)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
>>>>>>> 6da9530 (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
=======
      19 lines covered and
      0 lines missed.
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> c8cdb08 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> c51bf93 (Featire specs)
=======
>>>>>>> f92a45b (Featire specs)
=======
>>>>>>> fb61c5a (Featire specs)
=======
=======
>>>>>>> 3e9f99d (Featire specs)
>>>>>>> 3cf8dd4 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
=======
>>>>>>> df37394 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
<<<<<<< HEAD
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
>>>>>>> 715fac2 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> fb61c5a (Featire specs)
<<<<<<< HEAD
>>>>>>> 73f364d8 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
>>>>>>> aa4361fd (Featire specs)
      19 lines covered and
      0 lines missed.
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> fb61c5a (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> df37394 (Featire specs)
>>>>>>> c51bf93 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> c51bf93 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> df37394 (Featire specs)
=======
=======
>>>>>>> efd6af09 (Featire specs)
      19 lines covered and
      0 lines missed.
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
>>>>>>> c51bf93 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
      7 lines covered and
      12 lines missed.
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b832d45 (Featire specs)
>>>>>>> 84809242 (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
      19 lines covered and
      0 lines missed.
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e5890c2 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e5890c2 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 490b01d6 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 251144b4 (Manifest_cache true)
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 86d584a (Manifest_cache true)
>>>>>>> e5890c2 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4a0e3b6 (Manifest_cache true)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> df37394 (Featire specs)
>>>>>>> f92a45b (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 715fac2 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 73f364d8 (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
      7 lines covered and
      12 lines missed.
>>>>>>> bd8bda4 (Manifest_cache true)
=======
      19 lines covered and
      0 lines missed.
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ebcdce06 (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 73f364d8 (Featire specs)
>>>>>>> 6da9530 (Featire specs)
=======
=======
>>>>>>> fb61c5a (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
>>>>>>> 86d584a (Manifest_cache true)
>>>>>>> 0e864a5 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> cc390719 (Manifest_cache true)
=======
>>>>>>> 715fac2 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 73f364d8 (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
>>>>>>> 0b43b18 (Manifest_cache true)
=======
>>>>>>> d365be68 (Manifest_cache true)
      7 lines covered and
      12 lines missed.
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> c59d1a99 (Manifest_cache true)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
>>>>>>> 73f364d8 (Featire specs)
=======
>>>>>>> d365be68 (Manifest_cache true)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 416166f (Featire specs)
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> 0e864a5 (Manifest_cache true)
>>>>>>> cc390719 (Manifest_cache true)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5890c2 (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 9440753 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> e5890c2 (Manifest_cache true)
=======
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
>>>>>>> 1cce66c (Manifest_cache true)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 715fac2 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> fb61c5a (Featire specs)
<<<<<<< HEAD
>>>>>>> 73f364d8 (Featire specs)
=======
=======
>>>>>>> 0b43b18 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 1cce66c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d365be68 (Manifest_cache true)
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> e1ecabbe (Featire specs)
      19 lines covered and
      0 lines missed.
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 610b6138 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 9bfbd88 (Featire specs)
<<<<<<< HEAD
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
      7 lines covered and
      12 lines missed.
>>>>>>> 183b6c5 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
=======
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
>>>>>>> fb61c5a (Featire specs)
<<<<<<< HEAD
>>>>>>> 73f364d8 (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
>>>>>>> afa56d1 (Featire specs)
>>>>>>> e1ecabbe (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
=======
      7 lines covered and
      12 lines missed.
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
      19 lines covered and
      0 lines missed.
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bb5c652 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 824bb2b (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
      19 lines covered and
      0 lines missed.
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
      19 lines covered and
      0 lines missed.
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
>>>>>>> 9a49b7b (Rebased)
=======
>>>>>>> 009401d (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
      7 lines covered and
      12 lines missed.
>>>>>>> b9cc4e9 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
>>>>>>> 78717cc (Manifest_cache true)
=======
=======
>>>>>>> 6fa625b (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 98beee2 (Manifest_cache true)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> ae409ca (Featire specs)
=======
=======
>>>>>>> c8cdb08 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 385b8df (Manifest_cache true)
=======
=======
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 379a979 (Featire specs)
=======
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 7bc7f9f (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 490b01d6 (Manifest_cache true)
=======
=======
>>>>>>> 7bc7f9f (Manifest_cache true)
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> adc21e0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 84d0df6 (Manifest_cache true)
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
=======
=======
=======
      19 lines covered and
      0 lines missed.
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 4d90e3d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
=======
=======
      7 lines covered and
      12 lines missed.
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 00f8b58 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 450f4e3 (Manifest_cache true)
=======
=======
=======
      19 lines covered and
      0 lines missed.
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
>>>>>>> 11792758 (Rebased)
=======
=======
      7 lines covered and
      12 lines missed.
>>>>>>> bf554f4 (Rebased)
>>>>>>> aa3618b (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 75fa7e1b (Rebased)
=======
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
>>>>>>> 6fa625b (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 0676508 (Featire specs)
>>>>>>> 448bef30 (Featire specs)
=======
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
>>>>>>> aa4361fd (Featire specs)
>>>>>>> b3f2049 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6fa625b (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> c8cdb08 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e5890c2 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 251144b4 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 24b58e6 (Manifest_cache true)
<<<<<<< HEAD
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
      19 lines covered and
      0 lines missed.
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
      7 lines covered and
      12 lines missed.
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 00f8b58 (Manifest_cache true)
=======
=======
      19 lines covered and
      0 lines missed.
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
      7 lines covered and
      12 lines missed.
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 49e8a6c (Rebased)
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> 13fca83d (Rebased)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
=======
      19 lines covered and
      0 lines missed.
>>>>>>> c7a726c5 (Rebased)
=======
=======
      19 lines covered and
      0 lines missed.
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 9bfbd88 (Featire specs)
>>>>>>> ebcdce06 (Featire specs)
=======
>>>>>>> 7bc7f9f (Manifest_cache true)
>>>>>>> c59d1a99 (Manifest_cache true)
=======
>>>>>>> 610b6138 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 84d0df6 (Manifest_cache true)
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 11792758 (Rebased)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> b3f2049 (Featire specs)
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6fa625b (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> c8cdb08 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e5890c2 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
      19 lines covered and
      0 lines missed.
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
      7 lines covered and
      12 lines missed.
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 00f8b58 (Manifest_cache true)
=======
=======
      19 lines covered and
      0 lines missed.
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
      7 lines covered and
      12 lines missed.
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 49e8a6c (Rebased)
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> bc6bc8d2 (Rebased)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> b3f2049 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0e864a5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> cc390719 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
      19 lines covered and
      0 lines missed.
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
=======
=======
      7 lines covered and
      12 lines missed.
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 00f8b58 (Manifest_cache true)
=======
=======
      19 lines covered and
      0 lines missed.
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
      7 lines covered and
      12 lines missed.
>>>>>>> bf554f4 (Rebased)
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 715fac2 (Featire specs)
<<<<<<< HEAD
>>>>>>> fb61c5a (Featire specs)
<<<<<<< HEAD
>>>>>>> 73f364d8 (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 0b43b18 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1cce66c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d365be68 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
    
      

    

  
      

  
          
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 11792758 (Rebased)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> 7a08014b (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 490b01d6 (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> 00f8b58 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
=======
>>>>>>> c51bf93 (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> e5890c2 (Manifest_cache true)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
>>>>>>> f92a45b (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> 0e864a5 (Manifest_cache true)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> fb61c5a (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> 1cce66c (Manifest_cache true)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e5890c2 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 251144b4 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> ebcdce06 (Featire specs)
=======
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
>>>>>>> c59d1a99 (Manifest_cache true)
=======
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
=======
>>>>>>> c51bf93 (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> e5890c2 (Manifest_cache true)
=======
>>>>>>> 9440753 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e5890c2 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> df37394 (Featire specs)
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0e864a5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> cc390719 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
>>>>>>> 715fac2 (Featire specs)
<<<<<<< HEAD
>>>>>>> fb61c5a (Featire specs)
<<<<<<< HEAD
>>>>>>> 73f364d8 (Featire specs)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
>>>>>>> 0b43b18 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1cce66c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d365be68 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      1. 
            1
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> c8cdb08 (Manifest_cache true)
=======
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> ebcdce06 (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
>>>>>>> 0f8241bb (Featire specs)
          
      2. 
            1
=======
          
      3. 
            
>>>>>>> 752f0c0 (Featire specs)
=======
          
      4. 
            
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> ebcdce06 (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
>>>>>>> 0f8241bb (Featire specs)
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      5. 
            
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> 73f364d8 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ed32b84 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> fb61c5a (Featire specs)
<<<<<<< HEAD
>>>>>>> 73f364d8 (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 4f4ea3f9 (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 7a08014b (Featire specs)
=======
>>>>>>> e6fc67c7 (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> f92a45b (Featire specs)
=======
          
      6. 
            1
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> e6fc67c7 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 7a08014b (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 752f0c0 (Featire specs)
=======
          
      7. 
            
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
          
      8. 
            
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
          
      9. 
            1
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 75fa7e1b (Rebased)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
=======
>>>>>>> df37394 (Featire specs)
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
=======
          
      10. 
            1
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> ebcdce06 (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> 37e48018 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 37e48018 (Featire specs)
            Capybara.configure do |config|
>>>>>>> 610b6138 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
>>>>>>> 34509eee (Featire specs)
=======
>>>>>>> 75fa7e1b (Rebased)
=======
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
            Capybara.configure do |config|
<<<<<<< HEAD
=======
            Capybara.configure do |config|
>>>>>>> ebcdce06 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> df37394 (Featire specs)
=======
          
      11. 
            
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
=======
=======
          
      12. 
            
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
=======
          
      13. 
            1
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
=======
=======
>>>>>>> df37394 (Featire specs)
>>>>>>> f92a45b (Featire specs)
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 715fac2 (Featire specs)
>>>>>>> fb61c5a (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> e6fc67c7 (Featire specs)
=======
>>>>>>> 73f364d8 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
=======
          
      14. 
            
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
=======
=======
          
      15. 
            
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
=======
          
      16. 
            1
>>>>>>> bf554f4 (Rebased)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
>>>>>>> b5ac3004 (Featire specs)
            Capybara.configure do |config|
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
=======
            Capybara.configure do |config|
<<<<<<< HEAD
>>>>>>> 11792758 (Rebased)
=======
            Capybara.configure do |config|
>>>>>>> 6da9530 (Featire specs)
=======
=======
>>>>>>> 49e8a6c (Rebased)
            Capybara.configure do |config|
<<<<<<< HEAD
>>>>>>> e055dd0 (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fb61c5a (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> df37394 (Featire specs)
=======
          
      17. 
            
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5506bd0 (Featire specs)
=======
=======
          
      18. 
            
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
=======
          
      19. 
            1
>>>>>>> bf554f4 (Rebased)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
            Capybara.configure do |config|
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
=======
            Capybara.configure do |config|
>>>>>>> 715fac2 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> ebcdce06 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
>>>>>>> 0f8241bb (Featire specs)
            Capybara.configure do |config|
=======
            
>>>>>>> 752f0c0 (Featire specs)
=======
            
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> fb61c5a (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
            
>>>>>>> 08edf50 (Featire specs)
=======
            
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> bdc24a1a (Rebased)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
=======
>>>>>>> bf554f4 (Rebased)
=======
=======
            
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ed32b84 (Featire specs)
=======
=======
>>>>>>> bf554f4 (Rebased)
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> bf554f4 (Rebased)
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> bf554f4 (Rebased)
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0f8241bb (Featire specs)
=======
=======
            
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ebcdce06 (Featire specs)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
>>>>>>> bf554f4 (Rebased)
>>>>>>> 11792758 (Rebased)
=======
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
>>>>>>> bf554f4 (Rebased)
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
>>>>>>> 715fac2 (Featire specs)
<<<<<<< HEAD
>>>>>>> fb61c5a (Featire specs)
<<<<<<< HEAD
>>>>>>> 73f364d8 (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
        20. 
        
        
      
        
        
          
      20. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> bdc24a1a (Rebased)
=======
>>>>>>> 73f364d8 (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 311e9fa (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ebcdce06 (Featire specs)
=======
>>>>>>> 11792758 (Rebased)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> e055dd0 (Rebased)
=======
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
>>>>>>> 715fac2 (Featire specs)
>>>>>>> fb61c5a (Featire specs)
=======
>>>>>>> 73f364d8 (Featire specs)
          
      21. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
            1
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 4f4ea3f9 (Featire specs)
=======
>>>>>>> 365d41ed (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 7a08014b (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 73f364d8 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> f92a45b (Featire specs)
>>>>>>> e6fc67c7 (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
>>>>>>> fb61c5a (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 0676508 (Featire specs)
>>>>>>> 448bef30 (Featire specs)
=======
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
>>>>>>> aa4361fd (Featire specs)
>>>>>>> b3f2049 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
=======
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> b3f2049 (Featire specs)
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> b3f2049 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
>>>>>>> 3cf8dd4 (Featire specs)
>>>>>>> aa4361fd (Featire specs)
          
      22. 
            1
=======
          
      23. 
            
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
>>>>>>> 3cf8dd4 (Featire specs)
>>>>>>> aa4361fd (Featire specs)
>>>>>>> a636fda (Featire specs)
=======
=======
          
      24. 
            
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
>>>>>>> efd6af09 (Featire specs)
=======
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
>>>>>>> 3cf8dd4 (Featire specs)
>>>>>>> aa4361fd (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> d8dd3b4a (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
>>>>>>> efd6af09 (Featire specs)
=======
=======
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
>>>>>>> 3cf8dd4 (Featire specs)
>>>>>>> aa4361fd (Featire specs)
              config.asset_host = 'http://localhost:3000'
=======
            Capybara.configure do |config|
>>>>>>> 752f0c0 (Featire specs)
          
        25. 
        
        
      
        
        
          
      25. 
=======
          
      26. 
>>>>>>> aa7b40c (Manifest_cache true)
            1
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
=======
            

            

<<<<<<< HEAD
<<<<<<< HEAD
              config.default_max_wait_time = 5
=======
              config.asset_host = 'http://localhost:3000'
>>>>>>> 752f0c0 (Featire specs)
=======
            Capybara.configure do |config|
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
            Capybara.configure do |config|
>>>>>>> c033601 (Rebased)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
            Capybara.configure do |config|
=======
            
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
=======
=======
            
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
              config.asset_host = 'http://localhost:3000'
=======
            Capybara.configure do |config|
>>>>>>> 752f0c0 (Featire specs)
          
        27. 
        
        
      
        
        
          
      27. 
=======
          
      28. 
>>>>>>> aa7b40c (Manifest_cache true)
            1
<<<<<<< HEAD
>>>>>>> f92a45b (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
              config.default_max_wait_time = 5
=======
              config.asset_host = 'http://localhost:3000'
>>>>>>> 752f0c0 (Featire specs)
=======
            Capybara.configure do |config|
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
=======
            Capybara.configure do |config|
>>>>>>> c033601 (Rebased)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
            Capybara.configure do |config|
=======
            
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
=======
=======
            
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
              config.asset_host = 'http://localhost:3000'
=======
            Capybara.configure do |config|
>>>>>>> 752f0c0 (Featire specs)
          
        29. 
        
        
      
        
        
          
      29. 
=======
          
      30. 
>>>>>>> aa7b40c (Manifest_cache true)
            1
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
=======
=======
>>>>>>> 715fac2 (Featire specs)
>>>>>>> fb61c5a (Featire specs)
>>>>>>> 73f364d8 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
              config.default_max_wait_time = 5
=======
              config.asset_host = 'http://localhost:3000'
>>>>>>> 752f0c0 (Featire specs)
=======
            Capybara.configure do |config|
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6da9530 (Featire specs)
=======
            Capybara.configure do |config|
>>>>>>> c033601 (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0676508 (Featire specs)
            Capybara.configure do |config|
=======
            
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
>>>>>>> a636fda (Featire specs)
=======
=======
            
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
              config.asset_host = 'http://localhost:3000'
=======
            Capybara.configure do |config|
>>>>>>> 752f0c0 (Featire specs)
          
        31. 
        
        
      
        
        
          
      31. 
=======
          
      32. 
>>>>>>> aa7b40c (Manifest_cache true)
            1
=======
>>>>>>> ebcdce06 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
              config.default_max_wait_time = 5
=======
              config.asset_host = 'http://localhost:3000'
>>>>>>> 752f0c0 (Featire specs)
=======
            Capybara.configure do |config|
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 4f4ea3f9 (Featire specs)
=======
>>>>>>> 365d41ed (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
            Capybara.configure do |config|
>>>>>>> c033601 (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
            Capybara.configure do |config|
=======
            
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 009401d (Featire specs)
>>>>>>> a636fda (Featire specs)
=======
=======
            
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> b832d45 (Featire specs)
=======
=======
            
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> df37394 (Featire specs)
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> df37394 (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
            Capybara.configure do |config|
>>>>>>> c033601 (Rebased)
=======
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
            Capybara.configure do |config|
>>>>>>> c033601 (Rebased)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
=======
>>>>>>> 659083f (Featire specs)
>>>>>>> 2274daf2 (Featire specs)
            Capybara.configure do |config|
=======
            
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 2274daf2 (Featire specs)
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
            
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
=======
            
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> df37394 (Featire specs)
>>>>>>> c51bf93 (Featire specs)
>>>>>>> 7a08014b (Featire specs)
=======
=======
>>>>>>> efd6af09 (Featire specs)
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
=======
            
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
=======
            
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> df37394 (Featire specs)
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
=======
>>>>>>> 0676508 (Featire specs)
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
=======
=======
            
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> b832d45 (Featire specs)
=======
=======
            
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 2a25e4c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 3e9f99d (Featire specs)
              config.asset_host = 'http://localhost:3000'
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> 7a02bbe (Featire specs)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.asset_host = 'http://localhost:3000'
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
            Capybara.configure do |config|
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
>>>>>>> c033601 (Rebased)
=======
=======
            Capybara.configure do |config|
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
=======
=======
            Capybara.configure do |config|
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
          
        33. 
        
        
      
        
        
<<<<<<< HEAD
          
      33. 
=======
          
      34. 
>>>>>>> bd8bda4 (Manifest_cache true)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.default_max_wait_time = 5
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.default_driver = :rack_test
=======
              config.server_port = 3001
>>>>>>> 752f0c0 (Featire specs)
=======
              config.default_max_wait_time = 5
>>>>>>> 4e81ea2 (Featire specs)
=======
              config.asset_host = 'http://localhost:3000'
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
              config.default_max_wait_time = 5
=======
              config.asset_host = 'http://localhost:3000'
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
            Capybara.configure do |config|
>>>>>>> 752f0c0 (Featire specs)
          
        35. 
        
        
      
        
        
          
      35. 
=======
          
      36. 
>>>>>>> aa7b40c (Manifest_cache true)
            1
            

            

<<<<<<< HEAD
              config.default_max_wait_time = 5
=======
              config.asset_host = 'http://localhost:3000'
>>>>>>> 752f0c0 (Featire specs)
=======
            Capybara.configure do |config|
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> 715fac2 (Featire specs)
<<<<<<< HEAD
>>>>>>> fb61c5a (Featire specs)
<<<<<<< HEAD
>>>>>>> 73f364d8 (Featire specs)
=======
=======
=======
=======
            Capybara.configure do |config|
>>>>>>> c033601 (Rebased)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
            Capybara.configure do |config|
=======
            
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
=======
            
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
>>>>>>> afa56d1 (Featire specs)
>>>>>>> e1ecabbe (Featire specs)
          
        37. 
        
        
      
        
        
          
      37. 
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
>>>>>>> efd6af09 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 563720e (Featire specs)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
<<<<<<< HEAD
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> 563720e (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
>>>>>>> 3e9f99d (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> e1ecabbe (Featire specs)
          
      38. 
>>>>>>> 02a399d (Manifest_cache true)
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 75fa7e1b (Rebased)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> b3f2049 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> 3cf8dd4 (Featire specs)
>>>>>>> b3f2049 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
=======
>>>>>>> bf554f4 (Rebased)
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 13fca83d (Rebased)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 37e48018 (Featire specs)
=======
=======
>>>>>>> bf554f4 (Rebased)
>>>>>>> 11792758 (Rebased)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> b3f2049 (Featire specs)
>>>>>>> 009401d (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> b3f2049 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
>>>>>>> bf554f4 (Rebased)
>>>>>>> 49e8a6c (Rebased)
>>>>>>> 311e9fa (Rebased)
>>>>>>> bc6bc8d2 (Rebased)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> b3f2049 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
=======
>>>>>>> bf554f4 (Rebased)
>>>>>>> 49e8a6c (Rebased)
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
>>>>>>> afa56d1 (Featire specs)
>>>>>>> e1ecabbe (Featire specs)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
>>>>>>> 34509eee (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 11792758 (Rebased)
              config.asset_host = 'http://localhost:3000'
<<<<<<< HEAD
=======
=======
>>>>>>> 84809242 (Featire specs)
=======
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 365d41ed (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
>>>>>>> 13fca83d (Rebased)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> bdc24a1a (Rebased)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> e055dd0 (Rebased)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> bdc24a1a (Rebased)
=======
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 13fca83d (Rebased)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> efd6af09 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 49e8a6c (Rebased)
>>>>>>> bc6bc8d2 (Rebased)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
>>>>>>> 49e8a6c (Rebased)
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
>>>>>>> afa56d1 (Featire specs)
>>>>>>> e1ecabbe (Featire specs)
              config.asset_host = 'http://localhost:3000'
<<<<<<< HEAD
=======
<<<<<<< HEAD
              config.asset_host = 'http://localhost:3000'
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
=======
              config.asset_host = 'http://localhost:3000'
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
              config.asset_host = 'http://localhost:3000'
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
              config.asset_host = 'http://localhost:3000'
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
              config.asset_host = 'http://localhost:3000'
<<<<<<< HEAD
=======
<<<<<<< HEAD
              config.asset_host = 'http://localhost:3000'
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> 6da9530 (Featire specs)
>>>>>>> 0f8241bb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 75fa7e1b (Rebased)
=======
<<<<<<< HEAD
>>>>>>> 13fca83d (Rebased)
=======
>>>>>>> 11792758 (Rebased)
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> bdc24a1a (Rebased)
=======
=======
>>>>>>> 2a25e4c (Featire specs)
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
            Capybara.configure do |config|
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
=======
=======
>>>>>>> c033601 (Rebased)
=======
=======
            Capybara.configure do |config|
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 216fe41 (Featire specs)
>>>>>>> f3d746cb (Featire specs)
>>>>>>> a636fda (Featire specs)
=======
=======
            Capybara.configure do |config|
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> da3a9a3 (Featire specs)
>>>>>>> b5ac3004 (Featire specs)
          
        39. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
          
      39. 
=======
          
      40. 
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
          
      41. 
>>>>>>> e5752db (Featire specs)
>>>>>>> ed32b84 (Featire specs)
=======
          
      42. 
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
>>>>>>> ed32b84 (Featire specs)
=======
          
      43. 
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
=======
=======
          
      44. 
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.default_max_wait_time = 5
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.default_driver = :rack_test
=======
              config.server_port = 3001
>>>>>>> 752f0c0 (Featire specs)
=======
              config.default_max_wait_time = 5
>>>>>>> 4e81ea2 (Featire specs)
=======
              config.asset_host = 'http://localhost:3000'
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 7a08014b (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
              config.default_max_wait_time = 5
=======
              config.asset_host = 'http://localhost:3000'
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> a636fda (Featire specs)
=======
=======
            Capybara.configure do |config|
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
              config.asset_host = 'http://localhost:3000'
=======
            Capybara.configure do |config|
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> ebcdce06 (Featire specs)
=======
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
          
        45. 
        
        
      
        
        
          
      45. 
=======
          
      46. 
>>>>>>> aa7b40c (Manifest_cache true)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
            Capybara.configure do |config|
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> efd6af09 (Featire specs)
          
        47. 
        
        
      
        
        
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
=======
          
      47. 
=======
>>>>>>> b3f2049 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
              config.asset_host = 'http://localhost:3000'
<<<<<<< HEAD
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
              config.default_driver = :rack_test
=======
              config.server_port = 3001
>>>>>>> d0dc1f1 (Featire specs)
=======
              config.default_max_wait_time = 5
>>>>>>> 752f0c0 (Featire specs)
=======
              config.asset_host = 'http://localhost:3000'
>>>>>>> 4e81ea2 (Featire specs)
=======
            Capybara.configure do |config|
>>>>>>> 08edf50 (Featire specs)
          
        48. 
        
        
      
        
        
<<<<<<< HEAD
>>>>>>> 86d584a (Manifest_cache true)
=======
<<<<<<< HEAD
=======
=======
          
      48. 
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
          
      49. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.default_max_wait_time = 5
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.default_driver = :rack_test
=======
              config.server_port = 3001
>>>>>>> 752f0c0 (Featire specs)
=======
              config.default_max_wait_time = 5
>>>>>>> 4e81ea2 (Featire specs)
=======
              config.asset_host = 'http://localhost:3000'
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
              config.default_max_wait_time = 5
=======
              config.asset_host = 'http://localhost:3000'
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
>>>>>>> a636fda (Featire specs)
=======
=======
            Capybara.configure do |config|
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
        50. 
        
        
      
        
        
          
      50. 
=======
          
      51. 
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
            1
            

            

>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
            Capybara.configure do |config|
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
          
        52. 
        
        
      
        
        
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0ed7f7c (Featire specs)
          
      52. 
>>>>>>> 009401d (Featire specs)
=======
          
      53. 
>>>>>>> 6da9530 (Featire specs)
=======
=======
          
      54. 
<<<<<<< HEAD
>>>>>>> 0e864a5 (Manifest_cache true)
=======
=======
>>>>>>> 0b43b18 (Manifest_cache true)
>>>>>>> 1cce66c (Manifest_cache true)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
              config.default_max_wait_time = 5
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.default_driver = :rack_test
=======
<<<<<<< HEAD
=======
>>>>>>> 904663c (Featire specs)
              config.javascript_driver = :headless_chrome
>>>>>>> 86d584a (Manifest_cache true)
=======
=======
>>>>>>> 6da9530 (Featire specs)
              config.server_port = 3001
>>>>>>> 752f0c0 (Featire specs)
=======
              config.default_max_wait_time = 5
>>>>>>> 4e81ea2 (Featire specs)
=======
              config.asset_host = 'http://localhost:3000'
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6da9530 (Featire specs)
=======
              config.default_max_wait_time = 5
=======
              config.asset_host = 'http://localhost:3000'
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
=======
<<<<<<< HEAD
=======
            Capybara.configure do |config|
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 6da9530 (Featire specs)
          
        55. 
        
        
      
        
        
<<<<<<< HEAD
          
      55. 
=======
          
      56. 
>>>>>>> aa7b40c (Manifest_cache true)
            1
<<<<<<< HEAD
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      57. 
=======
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 24b58e6 (Manifest_cache true)
            1
>>>>>>> 08edf50 (Featire specs)
=======
          
      58. 
            1
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
          
      59. 
            1
>>>>>>> 6da9530 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
=======
=======
>>>>>>> 7a08014b (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> b3f2049 (Featire specs)
>>>>>>> 009401d (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
            end
>>>>>>> e5752db (Featire specs)
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> b3f2049 (Featire specs)
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 6cdb2e1 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
              config.server_port = 3001
>>>>>>> 9d98d9ab (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
            Capybara.configure do |config|
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
          
        60. 
        
        
      
        
        
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
=======
          
      60. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.default_driver = :rack_test
=======
              config.server_port = 3001
>>>>>>> d0dc1f1 (Featire specs)
=======
              config.default_max_wait_time = 5
>>>>>>> 752f0c0 (Featire specs)
=======
              config.asset_host = 'http://localhost:3000'
>>>>>>> 4e81ea2 (Featire specs)
=======
            Capybara.configure do |config|
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
=======
            Capybara.configure do |config|
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> 610b6138 (Featire specs)
          
        61. 
        
        
      
        
        
<<<<<<< HEAD
>>>>>>> 86d584a (Manifest_cache true)
=======
          
      61. 
=======
          
      62. 
>>>>>>> fd6db03 (Manifest_cache true)
            1
            

            

=======
=======
=======
>>>>>>> b3f2049 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
              config.server_port = 3001
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.javascript_driver = :headless_chrome
=======
              config.default_driver = :rack_test
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
=======
              config.server_port = 3001
>>>>>>> 752f0c0 (Featire specs)
=======
              config.default_max_wait_time = 5
>>>>>>> 4e81ea2 (Featire specs)
=======
              config.asset_host = 'http://localhost:3000'
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
              config.server_port = 3001
>>>>>>> 4e81ea2 (Featire specs)
=======
              config.default_max_wait_time = 5
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
              config.default_max_wait_time = 5
>>>>>>> c033601 (Rebased)
=======
              config.default_max_wait_time = 5
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 6da9530 (Featire specs)
=======
=======
=======
              config.asset_host = 'http://localhost:3000'
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
          
        63. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      63. 
            
=======
          
      64. 
=======
          
      65. 
<<<<<<< HEAD
>>>>>>> 02a399d (Manifest_cache true)
            1
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      66. 
=======
          
      67. 
=======
>>>>>>> 6da9530 (Featire specs)
>>>>>>> bd8bda4 (Manifest_cache true)
            1
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
          
      68. 
=======
          
      69. 
>>>>>>> aa7b40c (Manifest_cache true)
            1
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      70. 
=======
>>>>>>> 0f8241bb (Featire specs)
          
      71. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
<<<<<<< HEAD
=======
          
      72. 
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
              config.javascript_driver = :headless_chrome
>>>>>>> f7852d17 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
              config.javascript_driver = :headless_chrome
=======
>>>>>>> 84003439 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
              config.javascript_driver = :headless_chrome
=======
              config.default_driver = :rack_test
>>>>>>> 752f0c0 (Featire specs)
=======
              config.server_port = 3001
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> df37394 (Featire specs)
              config.default_max_wait_time = 5
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
              config.default_max_wait_time = 5
>>>>>>> c033601 (Rebased)
=======
              config.default_max_wait_time = 5
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
              config.server_port = 3001
>>>>>>> c8cdb08 (Manifest_cache true)
=======
              config.default_driver = :rack_test
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> e5890c2 (Manifest_cache true)
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
              config.server_port = 3001
>>>>>>> c8cdb08 (Manifest_cache true)
=======
              config.default_driver = :rack_test
>>>>>>> 4a0e3b6 (Manifest_cache true)
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
=======
=======
              config.server_port = 3001
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> a636fda (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
              config.server_port = 3001
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
=======
=======
              config.default_max_wait_time = 5
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e5890c2 (Manifest_cache true)
              config.asset_host = 'http://localhost:3000'
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
              config.default_max_wait_time = 5
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> b832d45 (Featire specs)
>>>>>>> 86d584a (Manifest_cache true)
>>>>>>> e5890c2 (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
          
        73. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      73. 
            
=======
          
      74. 
=======
          
      75. 
<<<<<<< HEAD
=======
>>>>>>> 02a399d (Manifest_cache true)
            1
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      76. 
=======
          
      77. 
>>>>>>> 4a0e3b6 (Manifest_cache true)
>>>>>>> bd8bda4 (Manifest_cache true)
            1
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> 6da9530 (Featire specs)
          
      78. 
=======
>>>>>>> 5c33a07 (Featire specs)
          
      79. 
<<<<<<< HEAD
=======
          
      80. 
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
>>>>>>> 6da9530 (Featire specs)
            1
<<<<<<< HEAD
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      81. 
            1
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
          
      82. 
            1
>>>>>>> c033601 (Rebased)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
              config.default_max_wait_time = 5
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
              config.default_driver = :rack_test
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5890c2 (Manifest_cache true)
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 86d584a (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
            end
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
              config.javascript_driver = :headless_chrome
<<<<<<< HEAD
>>>>>>> 86d584a (Manifest_cache true)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
              config.default_driver = :rack_test
>>>>>>> 4e81ea2 (Featire specs)
=======
              config.server_port = 3001
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
              config.server_port = 3001
>>>>>>> c033601 (Rebased)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
              config.default_driver = :rack_test
=======
              config.javascript_driver = :headless_chrome
>>>>>>> c8cdb08 (Manifest_cache true)
=======
              config.default_driver = :rack_test
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
=======
=======
              config.server_port = 3001
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
          
        83. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c8cdb08 (Manifest_cache true)
<<<<<<< HEAD
          
      83. 
            
=======
          
      84. 
=======
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
          
      85. 
=======
          
      86. 
>>>>>>> b9cc4e9 (Manifest_cache true)
            1
<<<<<<< HEAD
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      87. 
            1
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
          
      88. 
            1
>>>>>>> c033601 (Rebased)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
              config.javascript_driver = :headless_chrome
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
            end
=======
              config.javascript_driver = :headless_chrome
>>>>>>> 4e81ea2 (Featire specs)
=======
              config.default_driver = :rack_test
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
              config.default_driver = :rack_test
>>>>>>> c033601 (Rebased)
          
        89. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
          
      89. 
            
=======
          
      90. 
=======
          
      91. 
>>>>>>> c033601 (Rebased)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
            end
=======
=======
>>>>>>> c033601 (Rebased)
=======
>>>>>>> a636fda (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
              config.javascript_driver = :headless_chrome
=======
              config.default_driver = :rack_test
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
              config.server_port = 3001
>>>>>>> 752f0c0 (Featire specs)
=======
              config.default_max_wait_time = 5
>>>>>>> 4e81ea2 (Featire specs)
=======
              config.asset_host = 'http://localhost:3000'
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
=======
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 5c33a07 (Featire specs)
=======
>>>>>>> 84003439 (Featire specs)
              config.default_max_wait_time = 5
=======
              config.asset_host = 'http://localhost:3000'
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
=======
<<<<<<< HEAD
=======
            Capybara.configure do |config|
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
          
        92. 
        
        
      
        
        
<<<<<<< HEAD
          
      92. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
          
      93. 
>>>>>>> aa7b40c (Manifest_cache true)
            1
<<<<<<< HEAD
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      94. 
=======
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 24b58e6 (Manifest_cache true)
            1
>>>>>>> 08edf50 (Featire specs)
=======
          
      95. 
            1
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
=======
          
      96. 
            1
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> b3f2049 (Featire specs)
>>>>>>> 009401d (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
<<<<<<< HEAD
            end
>>>>>>> e5752db (Featire specs)
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> b3f2049 (Featire specs)
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 6cdb2e1 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
              config.server_port = 3001
=======
              config.default_max_wait_time = 5
>>>>>>> d0dc1f1 (Featire specs)
=======
              config.asset_host = 'http://localhost:3000'
>>>>>>> 752f0c0 (Featire specs)
=======
            Capybara.configure do |config|
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 490b01d6 (Manifest_cache true)
=======
              config.default_max_wait_time = 5
=======
              config.asset_host = 'http://localhost:3000'
>>>>>>> 752f0c0 (Featire specs)
=======
            Capybara.configure do |config|
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> ebcdce06 (Featire specs)
          
        97. 
        
        
      
        
        
          
      97. 
=======
          
      98. 
>>>>>>> aa7b40c (Manifest_cache true)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.default_driver = :rack_test
=======
              config.server_port = 3001
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
=======
              config.default_max_wait_time = 5
>>>>>>> 752f0c0 (Featire specs)
=======
              config.asset_host = 'http://localhost:3000'
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> ebcdce06 (Featire specs)
>>>>>>> 4e81ea2 (Featire specs)
=======
            Capybara.configure do |config|
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
=======
              config.asset_host = 'http://localhost:3000'
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> ebcdce06 (Featire specs)
          
        99. 
        
        
      
        
        
          
      99. 
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
          
      100. 
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84809242 (Featire specs)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.default_max_wait_time = 5
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.javascript_driver = :headless_chrome
>>>>>>> 490b01d6 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.javascript_driver = :headless_chrome
=======
>>>>>>> 490b01d6 (Manifest_cache true)
              config.default_driver = :rack_test
=======
              config.server_port = 3001
>>>>>>> 752f0c0 (Featire specs)
=======
              config.default_max_wait_time = 5
>>>>>>> 4e81ea2 (Featire specs)
=======
<<<<<<< HEAD
              config.asset_host = 'http://localhost:3000'
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
          
        101. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      101. 
            
=======
          
      102. 
=======
          
      103. 
>>>>>>> 02a399d (Manifest_cache true)
            1
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      104. 
=======
          
      105. 
>>>>>>> bd8bda4 (Manifest_cache true)
            1
>>>>>>> 752f0c0 (Featire specs)
=======
          
      106. 
=======
          
      107. 
>>>>>>> aa7b40c (Manifest_cache true)
            1
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      108. 
=======
          
      109. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      110. 
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
              config.javascript_driver = :headless_chrome
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
              config.javascript_driver = :headless_chrome
=======
              config.default_driver = :rack_test
>>>>>>> 752f0c0 (Featire specs)
=======
              config.server_port = 3001
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 4f4ea3f9 (Featire specs)
=======
              config.default_max_wait_time = 5
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
              config.default_max_wait_time = 5
>>>>>>> c033601 (Rebased)
=======
              config.default_max_wait_time = 5
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
              config.server_port = 3001
>>>>>>> c8cdb08 (Manifest_cache true)
=======
              config.default_driver = :rack_test
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> e5890c2 (Manifest_cache true)
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
              config.server_port = 3001
>>>>>>> c8cdb08 (Manifest_cache true)
=======
              config.default_driver = :rack_test
>>>>>>> 4a0e3b6 (Manifest_cache true)
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
=======
=======
              config.server_port = 3001
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> a636fda (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
              config.server_port = 3001
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
=======
=======
              config.default_max_wait_time = 5
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 490b01d6 (Manifest_cache true)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
=======
>>>>>>> e5890c2 (Manifest_cache true)
              config.asset_host = 'http://localhost:3000'
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
              config.default_max_wait_time = 5
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> b832d45 (Featire specs)
>>>>>>> 86d584a (Manifest_cache true)
>>>>>>> e5890c2 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 251144b4 (Manifest_cache true)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
          
        111. 
        
        
      
        
        
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      111. 
            
=======
          
      112. 
=======
          
      113. 
<<<<<<< HEAD
=======
>>>>>>> 02a399d (Manifest_cache true)
            1
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      114. 
=======
          
      115. 
>>>>>>> 4a0e3b6 (Manifest_cache true)
>>>>>>> bd8bda4 (Manifest_cache true)
            1
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
          
      116. 
=======
>>>>>>> 5c33a07 (Featire specs)
          
      117. 
=======
          
      118. 
>>>>>>> b9cc4e9 (Manifest_cache true)
            1
<<<<<<< HEAD
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      119. 
            1
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
>>>>>>> 490b01d6 (Manifest_cache true)
          
      120. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.server_port = 3001
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
<<<<<<< HEAD
=======
              config.default_max_wait_time = 5
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6da9530 (Featire specs)
              config.default_driver = :rack_test
>>>>>>> 84809242 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5890c2 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 86d584a (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 6da9530 (Featire specs)
>>>>>>> 0f8241bb (Featire specs)
            end
=======
>>>>>>> 84809242 (Featire specs)
              config.javascript_driver = :headless_chrome
=======
              config.default_driver = :rack_test
>>>>>>> 752f0c0 (Featire specs)
=======
              config.server_port = 3001
>>>>>>> 4e81ea2 (Featire specs)
=======
<<<<<<< HEAD
=======
              config.server_port = 3001
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
              config.server_port = 3001
>>>>>>> c033601 (Rebased)
=======
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
              config.default_driver = :rack_test
=======
              config.javascript_driver = :headless_chrome
>>>>>>> c8cdb08 (Manifest_cache true)
=======
              config.default_driver = :rack_test
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
=======
=======
              config.server_port = 3001
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
              config.default_driver = :rack_test
=======
              config.server_port = 3001
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> a636fda (Featire specs)
>>>>>>> 6da9530 (Featire specs)
          
        121. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c8cdb08 (Manifest_cache true)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
          
      121. 
            
=======
          
      122. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
          
      123. 
=======
          
      124. 
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
>>>>>>> 5c33a07 (Featire specs)
          
      125. 
>>>>>>> 6da9530 (Featire specs)
            1
<<<<<<< HEAD
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      126. 
            1
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
          
      127. 
            1
>>>>>>> c033601 (Rebased)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
              config.javascript_driver = :headless_chrome
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
            end
=======
              config.javascript_driver = :headless_chrome
>>>>>>> 4e81ea2 (Featire specs)
=======
              config.default_driver = :rack_test
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
              config.default_driver = :rack_test
>>>>>>> c033601 (Rebased)
          
        128. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
          
      128. 
            
=======
          
      129. 
=======
          
      130. 
>>>>>>> c033601 (Rebased)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6da9530 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
            end
=======
=======
>>>>>>> c033601 (Rebased)
=======
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
              config.javascript_driver = :headless_chrome
=======
              config.default_driver = :rack_test
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
              config.server_port = 3001
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 84809242 (Featire specs)
              config.default_max_wait_time = 5
<<<<<<< HEAD
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
              config.asset_host = 'http://localhost:3000'
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 5c33a07 (Featire specs)
=======
              config.default_max_wait_time = 5
=======
              config.asset_host = 'http://localhost:3000'
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> a636fda (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
>>>>>>> 0f8241bb (Featire specs)
          
        131. 
        
        
      
        
        
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> a636fda (Featire specs)
=======
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
>>>>>>> 6e923b9d (Featire specs)
          
      131. 
            
=======
          
      132. 
=======
          
      133. 
>>>>>>> bd8bda4 (Manifest_cache true)
            1
>>>>>>> 752f0c0 (Featire specs)
=======
          
      134. 
=======
>>>>>>> 5c33a07 (Featire specs)
          
      135. 
=======
          
      136. 
=======
          
      137. 
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 4a0e3b6 (Manifest_cache true)
            1
<<<<<<< HEAD
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
<<<<<<< HEAD
          
      138. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
          
      139. 
            1
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 6e923b9d (Featire specs)
=======
=======
          
      140. 
            1
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
          
      141. 
            1
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
            

            

<<<<<<< HEAD
              config.default_driver = :rack_test
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
            end
=======
              config.javascript_driver = :headless_chrome
>>>>>>> 752f0c0 (Featire specs)
=======
              config.default_driver = :rack_test
>>>>>>> 4e81ea2 (Featire specs)
=======
              config.server_port = 3001
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.javascript_driver = :headless_chrome
=======
              config.default_driver = :rack_test
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 824bb2b (Featire specs)
=======
              config.server_port = 3001
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 4e81ea2 (Featire specs)
=======
              config.default_max_wait_time = 5
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
              config.asset_host = 'http://localhost:3000'
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 75fa7e1b (Rebased)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
=======
              config.default_max_wait_time = 5
>>>>>>> c033601 (Rebased)
=======
              config.default_max_wait_time = 5
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> a636fda (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
              config.asset_host = 'http://localhost:3000'
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5c33a07 (Featire specs)
=======
              config.default_max_wait_time = 5
>>>>>>> c033601 (Rebased)
=======
              config.default_max_wait_time = 5
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> a636fda (Featire specs)
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
          
        142. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c033601 (Rebased)
          
      142. 
=======
=======
          
      143. 
=======
          
      144. 
>>>>>>> c8cdb08 (Manifest_cache true)
=======
          
      145. 
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
          
      146. 
>>>>>>> 24b58e6 (Manifest_cache true)
=======
          
      147. 
>>>>>>> 00f8b58 (Manifest_cache true)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
              config.default_max_wait_time = 5
>>>>>>> 11792758 (Rebased)
          
        148. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
<<<<<<< HEAD
=======
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c033601 (Rebased)
          
      148. 
>>>>>>> 490b01d6 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      149. 
            
=======
          
      150. 
=======
>>>>>>> 5c33a07 (Featire specs)
          
      151. 
            1
<<<<<<< HEAD
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      152. 
<<<<<<< HEAD
=======
>>>>>>> c8cdb08 (Manifest_cache true)
=======
          
      153. 
>>>>>>> 4a0e3b6 (Manifest_cache true)
>>>>>>> 490b01d6 (Manifest_cache true)
            1
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.javascript_driver = :headless_chrome
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
            end
=======
=======
              config.default_driver = :rack_test
=======
              config.server_port = 3001
>>>>>>> 08edf50 (Featire specs)
=======
=======
>>>>>>> 75fa7e1b (Rebased)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> ebcdce06 (Featire specs)
              config.default_max_wait_time = 5
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.default_driver = :rack_test
=======
              config.server_port = 3001
>>>>>>> 752f0c0 (Featire specs)
=======
              config.default_max_wait_time = 5
>>>>>>> 4e81ea2 (Featire specs)
=======
              config.asset_host = 'http://localhost:3000'
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
              config.server_port = 3001
>>>>>>> 11792758 (Rebased)
          
        154. 
        
        
      
        
        
<<<<<<< HEAD
=======
          
      154. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
              config.server_port = 3001
<<<<<<< HEAD
          
        155. 
        
        
      
        
        
>>>>>>> 34509eee (Featire specs)
          
      155. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
              config.javascript_driver = :headless_chrome
>>>>>>> 4e81ea2 (Featire specs)
=======
              config.default_driver = :rack_test
<<<<<<< HEAD
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
>>>>>>> 6e923b9d (Featire specs)
          
        156. 
        
        
      
        
        
          
      156. 
            1
            

            

=======
>>>>>>> 34509eee (Featire specs)
=======
>>>>>>> 75fa7e1b (Rebased)
=======
<<<<<<< HEAD
>>>>>>> 11792758 (Rebased)
              config.javascript_driver = :headless_chrome
>>>>>>> 08edf50 (Featire specs)
          
        157. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      157. 
            
=======
          
      158. 
=======
          
      159. 
>>>>>>> 490b01d6 (Manifest_cache true)
            1
>>>>>>> 08edf50 (Featire specs)
            

            

<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
            end
=======
              config.javascript_driver = :headless_chrome
>>>>>>> 08edf50 (Featire specs)
          
        160. 
        
        
      
        
        
<<<<<<< HEAD
          
      160. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> c8cdb08 (Manifest_cache true)
          
      161. 
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
          
      162. 
=======
          
      163. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
=======
          
      164. 
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 490b01d6 (Manifest_cache true)
=======
=======
=======
          
      165. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
=======
          
      166. 
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 24b58e6 (Manifest_cache true)
=======
<<<<<<< HEAD
          
      167. 
<<<<<<< HEAD
=======
            
=======
          
      168. 
=======
          
      169. 
<<<<<<< HEAD
=======
>>>>>>> 02a399d (Manifest_cache true)
            1
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      170. 
=======
          
      171. 
>>>>>>> 4a0e3b6 (Manifest_cache true)
>>>>>>> bd8bda4 (Manifest_cache true)
            1
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
          
      172. 
=======
>>>>>>> 5c33a07 (Featire specs)
          
      173. 
            1
<<<<<<< HEAD
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      174. 
            1
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
          
      175. 
            1
>>>>>>> c033601 (Rebased)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
              config.default_driver = :rack_test
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
            end
=======
              config.javascript_driver = :headless_chrome
>>>>>>> 752f0c0 (Featire specs)
=======
              config.default_driver = :rack_test
>>>>>>> 4e81ea2 (Featire specs)
=======
              config.server_port = 3001
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
              config.server_port = 3001
>>>>>>> c033601 (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
              config.default_driver = :rack_test
=======
              config.server_port = 3001
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
>>>>>>> a636fda (Featire specs)
=======
=======
              config.default_max_wait_time = 5
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
          
        176. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      176. 
            
=======
          
      177. 
=======
>>>>>>> 5c33a07 (Featire specs)
          
      178. 
            1
<<<<<<< HEAD
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
<<<<<<< HEAD
          
      179. 
            1
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
          
      180. 
            1
>>>>>>> c033601 (Rebased)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
              config.javascript_driver = :headless_chrome
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
            end
=======
              config.javascript_driver = :headless_chrome
>>>>>>> 4e81ea2 (Featire specs)
=======
              config.default_driver = :rack_test
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
              config.default_driver = :rack_test
>>>>>>> c033601 (Rebased)
          
        181. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
          
      181. 
            
=======
          
      182. 
=======
          
      183. 
>>>>>>> c033601 (Rebased)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
            end
=======
=======
>>>>>>> c033601 (Rebased)
=======
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
              config.javascript_driver = :headless_chrome
=======
              config.default_driver = :rack_test
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 563720e (Featire specs)
=======
              config.server_port = 3001
>>>>>>> 752f0c0 (Featire specs)
=======
              config.asset_host = 'http://localhost:3000'
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
=======
              config.asset_host = 'http://localhost:3000'
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
=======
              config.server_port = 3001
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
          
        184. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
=======
>>>>>>> a636fda (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> a636fda (Featire specs)
=======
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> b3f2049 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
          
      184. 
            
=======
          
      185. 
            1
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
          
      186. 
            1
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
          
      187. 
=======
          
      188. 
=======
          
      189. 
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 4a0e3b6 (Manifest_cache true)
            1
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 86d584a (Manifest_cache true)
=======
=======
          
      190. 
            1
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 904663c (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
            end
=======
              config.javascript_driver = :headless_chrome
>>>>>>> d0dc1f1 (Featire specs)
=======
              config.default_driver = :rack_test
<<<<<<< HEAD
=======
=======
              config.server_port = 3001
>>>>>>> 4e81ea2 (Featire specs)
=======
              config.default_max_wait_time = 5
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
=======
              config.asset_host = 'http://localhost:3000'
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf554f4 (Rebased)
>>>>>>> 49e8a6c (Rebased)
          
        191. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c033601 (Rebased)
          
      191. 
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c033601 (Rebased)
          
      192. 
=======
=======
>>>>>>> 563720e (Featire specs)
=======
          
      193. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
              config.javascript_driver = :headless_chrome
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
              config.javascript_driver = :headless_chrome
=======
              config.default_driver = :rack_test
>>>>>>> 752f0c0 (Featire specs)
=======
              config.server_port = 3001
>>>>>>> 4e81ea2 (Featire specs)
=======
              config.default_max_wait_time = 5
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
          
        194. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> c033601 (Rebased)
          
      194. 
>>>>>>> 86d584a (Manifest_cache true)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
          
      195. 
>>>>>>> b9cc4e9 (Manifest_cache true)
>>>>>>> b3f2049 (Featire specs)
>>>>>>> 009401d (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
            
=======
          
      196. 
=======
          
      197. 
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 02a399d (Manifest_cache true)
            1
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      198. 
=======
          
      199. 
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
>>>>>>> 7a08014b (Featire specs)
>>>>>>> bd8bda4 (Manifest_cache true)
            1
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 7a08014b (Featire specs)
          
      200. 
=======
>>>>>>> 5c33a07 (Featire specs)
          
      201. 
            1
<<<<<<< HEAD
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      202. 
            1
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
=======
          
      203. 
            1
>>>>>>> c033601 (Rebased)
=======
>>>>>>> 7a08014b (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
              config.default_driver = :rack_test
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
            end
=======
              config.javascript_driver = :headless_chrome
>>>>>>> 752f0c0 (Featire specs)
=======
              config.default_driver = :rack_test
>>>>>>> 4e81ea2 (Featire specs)
=======
              config.server_port = 3001
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
              config.server_port = 3001
>>>>>>> c033601 (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
              config.default_driver = :rack_test
=======
              config.server_port = 3001
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> a636fda (Featire specs)
=======
=======
              config.default_max_wait_time = 5
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
          
        204. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      204. 
            
=======
          
      205. 
=======
>>>>>>> 5c33a07 (Featire specs)
          
      206. 
            1
<<<<<<< HEAD
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
<<<<<<< HEAD
          
      207. 
            1
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
          
      208. 
            1
>>>>>>> c033601 (Rebased)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
              config.javascript_driver = :headless_chrome
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
            end
=======
              config.javascript_driver = :headless_chrome
>>>>>>> 4e81ea2 (Featire specs)
=======
              config.default_driver = :rack_test
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
              config.default_driver = :rack_test
>>>>>>> c033601 (Rebased)
          
        209. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
          
      209. 
            
=======
          
      210. 
=======
          
      211. 
>>>>>>> c033601 (Rebased)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
            end
=======
=======
>>>>>>> c033601 (Rebased)
=======
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
              config.javascript_driver = :headless_chrome
=======
              config.default_driver = :rack_test
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 563720e (Featire specs)
=======
              config.server_port = 3001
>>>>>>> 752f0c0 (Featire specs)
=======
              config.asset_host = 'http://localhost:3000'
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
=======
              config.asset_host = 'http://localhost:3000'
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
          
        212. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> a636fda (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> a636fda (Featire specs)
=======
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
          
      212. 
            
=======
          
      213. 
            1
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      214. 
            1
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
=======
          
      215. 
=======
          
      216. 
=======
          
      217. 
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 4a0e3b6 (Manifest_cache true)
            1
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 86d584a (Manifest_cache true)
=======
=======
          
      218. 
            1
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 904663c (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
            end
=======
              config.javascript_driver = :headless_chrome
>>>>>>> d0dc1f1 (Featire specs)
=======
              config.default_driver = :rack_test
<<<<<<< HEAD
=======
=======
              config.server_port = 3001
>>>>>>> 4e81ea2 (Featire specs)
=======
              config.default_max_wait_time = 5
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
=======
              config.asset_host = 'http://localhost:3000'
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf554f4 (Rebased)
>>>>>>> 49e8a6c (Rebased)
          
        219. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c033601 (Rebased)
          
      219. 
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c033601 (Rebased)
          
      220. 
=======
=======
>>>>>>> 563720e (Featire specs)
=======
          
      221. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
              config.javascript_driver = :headless_chrome
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
              config.javascript_driver = :headless_chrome
=======
              config.default_driver = :rack_test
>>>>>>> 752f0c0 (Featire specs)
=======
              config.server_port = 3001
>>>>>>> 4e81ea2 (Featire specs)
=======
              config.default_max_wait_time = 5
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
              config.default_max_wait_time = 5
>>>>>>> c7a726c5 (Rebased)
          
        222. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> c033601 (Rebased)
          
      222. 
>>>>>>> 86d584a (Manifest_cache true)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
          
      223. 
>>>>>>> b9cc4e9 (Manifest_cache true)
>>>>>>> b3f2049 (Featire specs)
>>>>>>> 009401d (Featire specs)
>>>>>>> d8dd3b4a (Featire specs)
            
=======
          
      224. 
=======
          
      225. 
<<<<<<< HEAD
>>>>>>> bd8bda4 (Manifest_cache true)
=======
>>>>>>> c8cdb08 (Manifest_cache true)
=======
          
      226. 
>>>>>>> 4a0e3b6 (Manifest_cache true)
>>>>>>> 86d584a (Manifest_cache true)
            1
>>>>>>> 752f0c0 (Featire specs)
=======
          
      227. 
=======
>>>>>>> 5c33a07 (Featire specs)
          
      228. 
            1
<<<<<<< HEAD
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      229. 
            1
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
          
      230. 
            1
>>>>>>> c7a726c5 (Rebased)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 4f4ea3f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> 4f4ea3f9 (Featire specs)
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84809242 (Featire specs)
=======
>>>>>>> c51bf93 (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 4e81ea2 (Featire specs)
=======
=======
              config.default_driver = :rack_test
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> df37394 (Featire specs)
            end
=======
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
              config.javascript_driver = :headless_chrome
>>>>>>> 752f0c0 (Featire specs)
=======
              config.default_driver = :rack_test
<<<<<<< HEAD
>>>>>>> 4e81ea2 (Featire specs)
=======
              config.server_port = 3001
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
=======
              config.server_port = 3001
>>>>>>> 08edf50 (Featire specs)
=======
=======
>>>>>>> 49e8a6c (Rebased)
=======
=======
<<<<<<< HEAD
>>>>>>> 9620751 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 9620751 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
<<<<<<< HEAD
>>>>>>> 9620751 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
              config.default_max_wait_time = 5
=======
              config.asset_host = 'http://localhost:3000'
>>>>>>> d0dc1f1 (Featire specs)
=======
            Capybara.configure do |config|
>>>>>>> 752f0c0 (Featire specs)
=======
              config.default_max_wait_time = 5
>>>>>>> 4552227 (Featire specs)
=======
              config.server_port = 3001
>>>>>>> c7a726c5 (Rebased)
          
        231. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      231. 
=======
          
      232. 
>>>>>>> e9f3851 (Manifest_cache true)
=======
          
      233. 
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
=======
=======
          
      234. 
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 35d17b9 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 36356d3 (Featire specs)
          
      235. 
=======
          
      236. 
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      237. 
>>>>>>> 4552227 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.javascript_driver = :headless_chrome
>>>>>>> 4e81ea2 (Featire specs)
=======
              config.default_driver = :rack_test
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
=======
              config.server_port = 3001
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
              config.server_port = 3001
>>>>>>> 49e8a6c (Rebased)
=======
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 36356d3 (Featire specs)
              config.server_port = 3001
=======
              config.default_max_wait_time = 5
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
=======
              config.asset_host = 'http://localhost:3000'
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
            Capybara.configure do |config|
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
              config.asset_host = 'http://localhost:3000'
>>>>>>> 752f0c0 (Featire specs)
=======
            Capybara.configure do |config|
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
              config.server_port = 3001
>>>>>>> 4552227 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
          
        238. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      238. 
=======
          
      239. 
>>>>>>> e9f3851 (Manifest_cache true)
=======
          
      240. 
>>>>>>> d782a28 (Manifest_cache true)
=======
          
      241. 
>>>>>>> 35d17b9 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 36356d3 (Featire specs)
          
      242. 
=======
          
      243. 
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      244. 
>>>>>>> 4552227 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
=======
          
      245. 
>>>>>>> c59d1a99 (Manifest_cache true)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.javascript_driver = :headless_chrome
>>>>>>> 08edf50 (Featire specs)
          
        246. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
          
      246. 
            
=======
          
      247. 
<<<<<<< HEAD
=======
>>>>>>> 5c33a07 (Featire specs)
=======
>>>>>>> 86d584a (Manifest_cache true)
          
      248. 
            1
<<<<<<< HEAD
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      249. 
            1
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
            1
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      250. 
            1
>>>>>>> c7a726c5 (Rebased)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
            end
=======
              config.javascript_driver = :headless_chrome
>>>>>>> d0dc1f1 (Featire specs)
          
        251. 
        
        
      
        
        
>>>>>>> c033601 (Rebased)
          
      251. 
            
>>>>>>> 93bdda9 (Featire specs)
            

            

<<<<<<< HEAD
              config.javascript_driver = :headless_chrome
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
            end
=======
              config.javascript_driver = :headless_chrome
>>>>>>> 4e81ea2 (Featire specs)
=======
              config.default_driver = :rack_test
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
              config.default_driver = :rack_test
>>>>>>> c7a726c5 (Rebased)
          
        252. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      252. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> c8cdb08 (Manifest_cache true)
          
      253. 
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
          
      254. 
=======
          
      255. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
=======
          
      256. 
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 86d584a (Manifest_cache true)
=======
=======
=======
          
      257. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
            
=======
          
      258. 
=======
          
      259. 
>>>>>>> c7a726c5 (Rebased)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
            end
=======
=======
>>>>>>> c7a726c5 (Rebased)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ebcdce06 (Featire specs)
              config.javascript_driver = :headless_chrome
=======
              config.default_driver = :rack_test
>>>>>>> 752f0c0 (Featire specs)
=======
              config.server_port = 3001
>>>>>>> 4e81ea2 (Featire specs)
=======
              config.default_max_wait_time = 5
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
          
        260. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
          
      260. 
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ebcdce06 (Featire specs)
          
      261. 
            
=======
          
      262. 
=======
          
      263. 
<<<<<<< HEAD
>>>>>>> bd8bda4 (Manifest_cache true)
=======
>>>>>>> c8cdb08 (Manifest_cache true)
=======
          
      264. 
>>>>>>> 4a0e3b6 (Manifest_cache true)
>>>>>>> 86d584a (Manifest_cache true)
            1
>>>>>>> 752f0c0 (Featire specs)
=======
          
      265. 
=======
>>>>>>> 5c33a07 (Featire specs)
          
      266. 
            1
<<<<<<< HEAD
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      267. 
            1
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
            

            

<<<<<<< HEAD
              config.default_driver = :rack_test
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
            end
=======
              config.javascript_driver = :headless_chrome
>>>>>>> 752f0c0 (Featire specs)
=======
              config.default_driver = :rack_test
>>>>>>> 4e81ea2 (Featire specs)
=======
              config.server_port = 3001
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
          
        268. 
        
        
      
        
        
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      268. 
            
=======
          
      269. 
=======
>>>>>>> 5c33a07 (Featire specs)
          
      270. 
            1
<<<<<<< HEAD
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      271. 
            1
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
            

            

<<<<<<< HEAD
              config.javascript_driver = :headless_chrome
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
            end
=======
              config.javascript_driver = :headless_chrome
>>>>>>> 4e81ea2 (Featire specs)
=======
              config.default_driver = :rack_test
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
          
        272. 
        
        
      
        
        
<<<<<<< HEAD
          
      272. 
            
=======
          
      273. 
            1
>>>>>>> 08edf50 (Featire specs)
            

            

<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
            end
=======
              config.javascript_driver = :headless_chrome
>>>>>>> 08edf50 (Featire specs)
          
        274. 
        
        
      
        
        
          
      274. 
>>>>>>> c7a726c5 (Rebased)
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> c7a726c5 (Rebased)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> c51bf93 (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 4e81ea2 (Featire specs)
=======
=======
              config.default_driver = :rack_test
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> df37394 (Featire specs)
            end
=======
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
              config.javascript_driver = :headless_chrome
>>>>>>> 752f0c0 (Featire specs)
=======
              config.default_driver = :rack_test
<<<<<<< HEAD
>>>>>>> 4e81ea2 (Featire specs)
=======
              config.server_port = 3001
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
=======
              config.server_port = 3001
>>>>>>> 08edf50 (Featire specs)
=======
=======
>>>>>>> 49e8a6c (Rebased)
=======
=======
<<<<<<< HEAD
>>>>>>> 9620751 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 9620751 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
<<<<<<< HEAD
>>>>>>> 9620751 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
              config.default_max_wait_time = 5
=======
              config.asset_host = 'http://localhost:3000'
>>>>>>> d0dc1f1 (Featire specs)
=======
            Capybara.configure do |config|
>>>>>>> 752f0c0 (Featire specs)
=======
              config.default_max_wait_time = 5
>>>>>>> 4552227 (Featire specs)
          
        275. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      275. 
=======
          
      276. 
>>>>>>> e9f3851 (Manifest_cache true)
=======
          
      277. 
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
=======
=======
          
      278. 
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 35d17b9 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 36356d3 (Featire specs)
          
      279. 
=======
          
      280. 
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      281. 
>>>>>>> 4552227 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.javascript_driver = :headless_chrome
>>>>>>> 4e81ea2 (Featire specs)
=======
              config.default_driver = :rack_test
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
=======
              config.server_port = 3001
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
              config.server_port = 3001
>>>>>>> 49e8a6c (Rebased)
=======
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 36356d3 (Featire specs)
              config.server_port = 3001
=======
              config.default_max_wait_time = 5
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
=======
              config.asset_host = 'http://localhost:3000'
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
            Capybara.configure do |config|
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
              config.asset_host = 'http://localhost:3000'
>>>>>>> 752f0c0 (Featire specs)
=======
            Capybara.configure do |config|
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
              config.server_port = 3001
>>>>>>> 4552227 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
          
        282. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      282. 
=======
          
      283. 
>>>>>>> e9f3851 (Manifest_cache true)
=======
          
      284. 
>>>>>>> d782a28 (Manifest_cache true)
=======
          
      285. 
>>>>>>> 35d17b9 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 36356d3 (Featire specs)
          
      286. 
=======
          
      287. 
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      288. 
>>>>>>> 4552227 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.javascript_driver = :headless_chrome
>>>>>>> 08edf50 (Featire specs)
          
        289. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
          
      289. 
            
=======
          
      290. 
<<<<<<< HEAD
=======
>>>>>>> 5c33a07 (Featire specs)
=======
>>>>>>> 86d584a (Manifest_cache true)
          
      291. 
            1
<<<<<<< HEAD
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      292. 
            1
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
            1
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
            end
=======
              config.javascript_driver = :headless_chrome
>>>>>>> d0dc1f1 (Featire specs)
=======
              config.default_driver = :rack_test
          
        293. 
        
        
      
        
        
<<<<<<< HEAD
>>>>>>> c033601 (Rebased)
          
      293. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c033601 (Rebased)
          
      294. 
=======
=======
          
      295. 
            1
            

            

              config.javascript_driver = :headless_chrome
>>>>>>> 752f0c0 (Featire specs)
          
        296. 
        
        
      
        
        
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
          
      296. 
>>>>>>> b9cc4e9 (Manifest_cache true)
>>>>>>> b3f2049 (Featire specs)
            
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
              config.javascript_driver = :headless_chrome
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
            end
=======
              config.javascript_driver = :headless_chrome
>>>>>>> 4e81ea2 (Featire specs)
=======
              config.default_driver = :rack_test
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
          
        297. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
          
      297. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> c8cdb08 (Manifest_cache true)
          
      298. 
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
          
      299. 
=======
          
      300. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
=======
          
      301. 
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 86d584a (Manifest_cache true)
=======
=======
=======
          
      302. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
            
=======
          
      303. 
            1
>>>>>>> 08edf50 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
            end
=======
              config.javascript_driver = :headless_chrome
>>>>>>> 08edf50 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 4e81ea2 (Featire specs)
=======
            end
>>>>>>> 6da9530 (Featire specs)
          
        304. 
        
        
      
        
        
          
      304. 
            
            

            

>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> ebcdce06 (Featire specs)
            
=======
=======
>>>>>>> c033601 (Rebased)
=======
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
>>>>>>> 0f8241bb (Featire specs)
            
=======
            end
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
=======
>>>>>>> 9440753 (Featire specs)
            end
>>>>>>> 4e81ea2 (Featire specs)
=======
            end
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
>>>>>>> 0f8241bb (Featire specs)
          
        305. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a636fda (Featire specs)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a636fda (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> ebcdce06 (Featire specs)
          
      305. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      306. 
=======
          
      307. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
      308. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
      309. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      310. 
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
      311. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
            1
<<<<<<< HEAD
=======
=======
          
      312. 
<<<<<<< HEAD
=======
          
      313. 
>>>>>>> 02a399d (Manifest_cache true)
            
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      314. 
<<<<<<< HEAD
=======
          
      315. 
>>>>>>> bd8bda4 (Manifest_cache true)
            
>>>>>>> 752f0c0 (Featire specs)
=======
            
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
            
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
>>>>>>> d8dd3b4a (Featire specs)
            

            

<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
>>>>>>> c05ee511 (Featire specs)
            Capybara.register_driver :headless_chrome do |app|
<<<<<<< HEAD
=======
=======
            
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
            end
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> bf554f4 (Rebased)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> d782a28 (Manifest_cache true)
=======
>>>>>>> 96394f1 (Featire specs)
              config.default_driver = :rack_test
=======
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
=======
=======
            end
>>>>>>> 009401d (Featire specs)
=======
=======
=======
>>>>>>> bf554f4 (Rebased)
>>>>>>> 311e9fa (Rebased)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> c59d1a99 (Manifest_cache true)
              config.default_driver = :rack_test
=======
              config.server_port = 3001
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
=======
=======
              config.default_max_wait_time = 5
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
=======
=======
              config.asset_host = 'http://localhost:3000'
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> bf05825 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> c59d1a99 (Manifest_cache true)
=======
              config.default_max_wait_time = 5
>>>>>>> 752f0c0 (Featire specs)
=======
              config.asset_host = 'http://localhost:3000'
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
=======
            Capybara.configure do |config|
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
              config.default_driver = :rack_test
>>>>>>> 4552227 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> c59d1a99 (Manifest_cache true)
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
          
        316. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      316. 
=======
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
          
      317. 
>>>>>>> e9f3851 (Manifest_cache true)
=======
          
      318. 
=======
=======
>>>>>>> 36356d3 (Featire specs)
          
      319. 
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
          
      320. 
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      321. 
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
          
      322. 
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> ebcdce06 (Featire specs)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
              config.javascript_driver = :headless_chrome
=======
              config.default_driver = :rack_test
>>>>>>> d0dc1f1 (Featire specs)
=======
              config.server_port = 3001
>>>>>>> 752f0c0 (Featire specs)
=======
              config.default_max_wait_time = 5
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
              config.asset_host = 'http://localhost:3000'
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
              config.asset_host = 'http://localhost:3000'
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
          
        323. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 8cbdfeb (Manifest_cache true)
<<<<<<< HEAD
          
      323. 
            
=======
          
      324. 
=======
          
      325. 
>>>>>>> 02a399d (Manifest_cache true)
            1
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      326. 
=======
          
      327. 
>>>>>>> bd8bda4 (Manifest_cache true)
            1
>>>>>>> 752f0c0 (Featire specs)
=======
          
      328. 
=======
          
      329. 
>>>>>>> aa7b40c (Manifest_cache true)
            1
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      330. 
=======
          
      331. 
<<<<<<< HEAD
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.javascript_driver = :headless_chrome
=======
              config.default_driver = :rack_test
>>>>>>> d0dc1f1 (Featire specs)
=======
              config.server_port = 3001
>>>>>>> 752f0c0 (Featire specs)
=======
              config.default_max_wait_time = 5
>>>>>>> 4e81ea2 (Featire specs)
=======
              config.asset_host = 'http://localhost:3000'
>>>>>>> 08edf50 (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
          
        332. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> e3e66f3 (Featire specs)
          
      332. 
            
=======
          
      333. 
=======
          
      334. 
>>>>>>> 02a399d (Manifest_cache true)
            1
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      335. 
=======
          
      336. 
>>>>>>> bd8bda4 (Manifest_cache true)
            1
>>>>>>> 752f0c0 (Featire specs)
=======
          
      337. 
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 35d17b9 (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      338. 
<<<<<<< HEAD
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.javascript_driver = :headless_chrome
>>>>>>> 08edf50 (Featire specs)
=======
              config.javascript_driver = :headless_chrome
=======
              config.default_driver = :rack_test
>>>>>>> d0dc1f1 (Featire specs)
=======
              config.server_port = 3001
>>>>>>> 752f0c0 (Featire specs)
=======
              config.default_max_wait_time = 5
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
          
        339. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> c8cdb08 (Manifest_cache true)
=======
>>>>>>> c4adab0 (Featire specs)
          
      339. 
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
>>>>>>> 24b58e6 (Manifest_cache true)
<<<<<<< HEAD
          
      340. 
=======
          
      341. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
=======
          
      342. 
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
=======
          
      343. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
=======
=======
          
      344. 
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 24b58e6 (Manifest_cache true)
            
<<<<<<< HEAD
=======
=======
          
      345. 
=======
          
      346. 
>>>>>>> 02a399d (Manifest_cache true)
            1
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      347. 
=======
          
      348. 
>>>>>>> bd8bda4 (Manifest_cache true)
            1
>>>>>>> 752f0c0 (Featire specs)
=======
          
      349. 
=======
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 2722d07 (Manifest_cache true)
            1
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      350. 
=======
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 5b6aeb7 (Manifest_cache true)
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> e54deeb (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> e54deeb (Featire specs)
=======
=======
          
      351. 
=======
          
      352. 
>>>>>>> fd6db03 (Manifest_cache true)
            1
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 3b03895 (Featire specs)
=======
=======
          
      353. 
            1
>>>>>>> 4552227 (Featire specs)
>>>>>>> 94841b5 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 4e81ea2 (Featire specs)
=======
            end
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
            end
=======
              config.javascript_driver = :headless_chrome
>>>>>>> d0dc1f1 (Featire specs)
=======
              config.default_driver = :rack_test
=======
              config.server_port = 3001
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
=======
=======
              config.default_max_wait_time = 5
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54deeb (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
              config.default_max_wait_time = 5
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> e54deeb (Featire specs)
=======
=======
              config.asset_host = 'http://localhost:3000'
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
=======
              config.javascript_driver = :headless_chrome
>>>>>>> 4552227 (Featire specs)
>>>>>>> 94841b5 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
          
        354. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
>>>>>>> 36356d3 (Featire specs)
          
      354. 
=======
          
      355. 
=======
          
      356. 
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      357. 
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
=======
>>>>>>> 94841b5 (Featire specs)
          
      358. 
>>>>>>> 2c640cf (Manifest_cache true)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
              config.javascript_driver = :headless_chrome
>>>>>>> 752f0c0 (Featire specs)
=======
              config.default_driver = :rack_test
=======
              config.server_port = 3001
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
=======
=======
              config.default_max_wait_time = 5
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
          
        359. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
          
      359. 
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
=======
>>>>>>> c59d1a99 (Manifest_cache true)
          
      360. 
            1
            

            

<<<<<<< HEAD
              config.default_max_wait_time = 5
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.javascript_driver = :headless_chrome
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.javascript_driver = :headless_chrome
=======
              config.default_driver = :rack_test
>>>>>>> 752f0c0 (Featire specs)
=======
              config.server_port = 3001
>>>>>>> 4e81ea2 (Featire specs)
=======
              config.default_max_wait_time = 5
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
              config.default_max_wait_time = 5
>>>>>>> c033601 (Rebased)
=======
              config.default_max_wait_time = 5
=======
              config.server_port = 3001
>>>>>>> c8cdb08 (Manifest_cache true)
=======
              config.default_driver = :rack_test
>>>>>>> 4a0e3b6 (Manifest_cache true)
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
=======
=======
              config.server_port = 3001
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
=======
=======
              config.default_max_wait_time = 5
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> b832d45 (Featire specs)
>>>>>>> c59d1a99 (Manifest_cache true)
          
        361. 
        
        
      
        
        
<<<<<<< HEAD
>>>>>>> 64dceec (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      361. 
            
=======
          
      362. 
=======
          
      363. 
<<<<<<< HEAD
=======
>>>>>>> 02a399d (Manifest_cache true)
            1
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      364. 
=======
          
      365. 
>>>>>>> 4a0e3b6 (Manifest_cache true)
>>>>>>> bd8bda4 (Manifest_cache true)
            1
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
          
      366. 
=======
>>>>>>> 5c33a07 (Featire specs)
          
      367. 
=======
>>>>>>> c59d1a99 (Manifest_cache true)
          
      368. 
>>>>>>> 8cbdfeb (Manifest_cache true)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.javascript_driver = :headless_chrome
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
              config.default_driver = :rack_test
=======
<<<<<<< HEAD
              config.javascript_driver = :headless_chrome
>>>>>>> 4e81ea2 (Featire specs)
=======
              config.default_driver = :rack_test
=======
              config.server_port = 3001
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
          
        369. 
        
        
      
        
        
          
      369. 
            1
            

            

<<<<<<< HEAD
=======
>>>>>>> 64dceec (Manifest_cache true)
              config.javascript_driver = :headless_chrome
<<<<<<< HEAD
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
=======
>>>>>>> 5b7749a (Fix)
              config.javascript_driver = :headless_chrome
<<<<<<< HEAD
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
              config.default_driver = :rack_test
>>>>>>> d0dc1f1 (Featire specs)
=======
              config.server_port = 3001
>>>>>>> 752f0c0 (Featire specs)
=======
              config.default_max_wait_time = 5
>>>>>>> 4e81ea2 (Featire specs)
=======
              config.asset_host = 'http://localhost:3000'
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 610b6138 (Featire specs)
          
        370. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 610b6138 (Featire specs)
>>>>>>> b832d45 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
          
      370. 
            
=======
          
      371. 
=======
          
      372. 
>>>>>>> 02a399d (Manifest_cache true)
            1
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      373. 
=======
          
      374. 
>>>>>>> 02a399d (Manifest_cache true)
            1
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      375. 
=======
          
      376. 
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> c8cdb08 (Manifest_cache true)
            1
>>>>>>> 752f0c0 (Featire specs)
=======
          
      377. 
=======
          
      378. 
=======
          
      379. 
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 4a0e3b6 (Manifest_cache true)
            1
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      380. 
            1
>>>>>>> 08edf50 (Featire specs)
=======
          
      381. 
            1
>>>>>>> 7a02bbe (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
            end
=======
              config.javascript_driver = :headless_chrome
>>>>>>> d0dc1f1 (Featire specs)
=======
              config.default_driver = :rack_test
=======
              config.server_port = 3001
>>>>>>> 4e81ea2 (Featire specs)
=======
              config.default_max_wait_time = 5
>>>>>>> 08edf50 (Featire specs)
=======
              config.asset_host = 'http://localhost:3000'
>>>>>>> 7a02bbe (Featire specs)
          
        382. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c033601 (Rebased)
          
      382. 
=======
=======
          
      383. 
=======
          
      384. 
>>>>>>> c8cdb08 (Manifest_cache true)
=======
          
      385. 
>>>>>>> 4a0e3b6 (Manifest_cache true)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.javascript_driver = :headless_chrome
>>>>>>> 752f0c0 (Featire specs)
=======
              config.default_driver = :rack_test
=======
              config.server_port = 3001
>>>>>>> 08edf50 (Featire specs)
=======
              config.default_max_wait_time = 5
>>>>>>> 7a02bbe (Featire specs)
          
        386. 
        
        
      
        
        
          
      386. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
              config.javascript_driver = :headless_chrome
>>>>>>> 4e81ea2 (Featire specs)
=======
              config.default_driver = :rack_test
=======
              config.server_port = 3001
>>>>>>> 7a02bbe (Featire specs)
          
        387. 
        
        
      
        
        
          
      387. 
            1
            

            

<<<<<<< HEAD
              config.javascript_driver = :headless_chrome
>>>>>>> 08edf50 (Featire specs)
          
        388. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> c8cdb08 (Manifest_cache true)
          
      388. 
>>>>>>> b9cc4e9 (Manifest_cache true)
>>>>>>> c59d1a99 (Manifest_cache true)
=======
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
          
      389. 
=======
          
      390. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
=======
          
      391. 
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
=======
          
      392. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 3723aad (Featire specs)
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c59d1a99 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
=======
=======
          
      393. 
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 2722d07 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 610b6138 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 2722d07 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      394. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> e54deeb (Featire specs)
=======
=======
          
      395. 
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
=======
          
      396. 
>>>>>>> 4552227 (Featire specs)
>>>>>>> 94841b5 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
            
            

            

<<<<<<< HEAD
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
>>>>>>> c033601 (Rebased)
=======
>>>>>>> a636fda (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
            
=======
            end
>>>>>>> d0dc1f1 (Featire specs)
=======
            end
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
            end
>>>>>>> 08edf50 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
            end
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
            end
>>>>>>> 4552227 (Featire specs)
>>>>>>> 94841b5 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
=======
=======
            end
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 610b6138 (Featire specs)
          
        397. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> a636fda (Featire specs)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a636fda (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 6da9530 (Featire specs)
>>>>>>> 0f8241bb (Featire specs)
          
      397. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      398. 
=======
          
      399. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
      400. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
      401. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      402. 
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
      403. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
          
      404. 
>>>>>>> c033601 (Rebased)
            1
=======
          
      405. 
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      406. 
>>>>>>> 02a399d (Manifest_cache true)
            
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      407. 
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      408. 
>>>>>>> bd8bda4 (Manifest_cache true)
            
>>>>>>> 752f0c0 (Featire specs)
=======
            
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 824bb2b (Featire specs)
=======
            
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
=======
            
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 6da9530 (Featire specs)
=======
            
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
            Capybara.register_driver :headless_chrome do |app|
=======
            
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
            end
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> bf554f4 (Rebased)
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 59d75f9 (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> bf554f4 (Rebased)
>>>>>>> 11792758 (Rebased)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> d782a28 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> bd30d038 (Manifest_cache true)
=======
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> c12b71de (Featire specs)
              config.default_driver = :rack_test
=======
<<<<<<< HEAD
              config.javascript_driver = :headless_chrome
>>>>>>> 96aecde (Manifest_cache true)
=======
              config.default_driver = :rack_test
>>>>>>> d0dc1f1 (Featire specs)
=======
              config.server_port = 3001
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
=======
              config.default_driver = :rack_test
>>>>>>> 3b03895 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
              config.default_driver = :rack_test
>>>>>>> 37e48018 (Featire specs)
=======
=======
              config.default_driver = :rack_test
=======
<<<<<<< HEAD
>>>>>>> d52f9efe (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
=======
            end
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
=======
>>>>>>> bf554f4 (Rebased)
>>>>>>> 311e9fa (Rebased)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 36356d3 (Featire specs)
              config.default_driver = :rack_test
=======
              config.server_port = 3001
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
=======
=======
              config.default_max_wait_time = 5
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
=======
=======
              config.asset_host = 'http://localhost:3000'
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> bf05825 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
              config.default_max_wait_time = 5
>>>>>>> 752f0c0 (Featire specs)
=======
              config.asset_host = 'http://localhost:3000'
>>>>>>> 4e81ea2 (Featire specs)
=======
            Capybara.configure do |config|
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
              config.default_driver = :rack_test
>>>>>>> 4552227 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
=======
=======
            end
>>>>>>> 0ed7f7c (Featire specs)
          
        409. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      409. 
=======
          
      410. 
>>>>>>> e9f3851 (Manifest_cache true)
=======
          
      411. 
=======
=======
>>>>>>> 36356d3 (Featire specs)
          
      412. 
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
          
      413. 
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      414. 
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 8cbdfeb (Manifest_cache true)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
              config.javascript_driver = :headless_chrome
=======
              config.default_driver = :rack_test
>>>>>>> d0dc1f1 (Featire specs)
=======
              config.server_port = 3001
>>>>>>> 752f0c0 (Featire specs)
=======
              config.default_max_wait_time = 5
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
              config.asset_host = 'http://localhost:3000'
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
              config.asset_host = 'http://localhost:3000'
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
          
        415. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 8cbdfeb (Manifest_cache true)
<<<<<<< HEAD
          
      415. 
            
=======
          
      416. 
=======
          
      417. 
>>>>>>> 02a399d (Manifest_cache true)
            1
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      418. 
=======
          
      419. 
>>>>>>> bd8bda4 (Manifest_cache true)
            1
>>>>>>> 752f0c0 (Featire specs)
=======
          
      420. 
=======
          
      421. 
>>>>>>> aa7b40c (Manifest_cache true)
            1
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      422. 
=======
          
      423. 
<<<<<<< HEAD
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.javascript_driver = :headless_chrome
=======
              config.default_driver = :rack_test
>>>>>>> d0dc1f1 (Featire specs)
=======
              config.server_port = 3001
>>>>>>> 752f0c0 (Featire specs)
=======
              config.default_max_wait_time = 5
>>>>>>> 4e81ea2 (Featire specs)
=======
              config.asset_host = 'http://localhost:3000'
>>>>>>> 08edf50 (Featire specs)
          
        424. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
          
      424. 
            
=======
          
      425. 
=======
          
      426. 
>>>>>>> 02a399d (Manifest_cache true)
            1
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      427. 
=======
          
      428. 
>>>>>>> bd8bda4 (Manifest_cache true)
            1
>>>>>>> 752f0c0 (Featire specs)
=======
          
      429. 
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 35d17b9 (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      430. 
<<<<<<< HEAD
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.javascript_driver = :headless_chrome
>>>>>>> 08edf50 (Featire specs)
=======
              config.javascript_driver = :headless_chrome
=======
              config.default_driver = :rack_test
>>>>>>> d0dc1f1 (Featire specs)
=======
              config.server_port = 3001
>>>>>>> 752f0c0 (Featire specs)
=======
              config.default_max_wait_time = 5
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
          
        431. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> c8cdb08 (Manifest_cache true)
=======
>>>>>>> c4adab0 (Featire specs)
          
      431. 
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
>>>>>>> 24b58e6 (Manifest_cache true)
<<<<<<< HEAD
          
      432. 
=======
          
      433. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
=======
          
      434. 
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
=======
          
      435. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
=======
=======
          
      436. 
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 24b58e6 (Manifest_cache true)
            
<<<<<<< HEAD
=======
=======
          
      437. 
=======
          
      438. 
>>>>>>> 02a399d (Manifest_cache true)
            1
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      439. 
=======
          
      440. 
>>>>>>> bd8bda4 (Manifest_cache true)
            1
>>>>>>> 752f0c0 (Featire specs)
=======
          
      441. 
=======
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 2722d07 (Manifest_cache true)
            1
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      442. 
=======
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 5b6aeb7 (Manifest_cache true)
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> e54deeb (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> e54deeb (Featire specs)
=======
=======
          
      443. 
=======
          
      444. 
>>>>>>> fd6db03 (Manifest_cache true)
            1
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 3b03895 (Featire specs)
=======
=======
          
      445. 
            1
>>>>>>> 4552227 (Featire specs)
>>>>>>> 94841b5 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 4e81ea2 (Featire specs)
=======
            end
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
            end
=======
              config.javascript_driver = :headless_chrome
>>>>>>> d0dc1f1 (Featire specs)
=======
              config.default_driver = :rack_test
=======
              config.server_port = 3001
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
=======
=======
              config.default_max_wait_time = 5
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54deeb (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
              config.default_max_wait_time = 5
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> e54deeb (Featire specs)
=======
=======
              config.asset_host = 'http://localhost:3000'
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
=======
              config.javascript_driver = :headless_chrome
>>>>>>> 4552227 (Featire specs)
>>>>>>> 94841b5 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
          
        446. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
>>>>>>> 36356d3 (Featire specs)
          
      446. 
=======
          
      447. 
=======
          
      448. 
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      449. 
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
=======
>>>>>>> 94841b5 (Featire specs)
          
      450. 
>>>>>>> 2c640cf (Manifest_cache true)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
              config.javascript_driver = :headless_chrome
>>>>>>> 752f0c0 (Featire specs)
=======
              config.default_driver = :rack_test
=======
              config.server_port = 3001
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
=======
=======
              config.default_max_wait_time = 5
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
          
        451. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
          
      451. 
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
=======
              config.default_driver = :rack_test
=======
              config.server_port = 3001
>>>>>>> d0dc1f1 (Featire specs)
=======
              config.default_max_wait_time = 5
>>>>>>> 752f0c0 (Featire specs)
=======
              config.asset_host = 'http://localhost:3000'
>>>>>>> 4e81ea2 (Featire specs)
=======
            Capybara.configure do |config|
>>>>>>> 08edf50 (Featire specs)
          
        452. 
        
        
      
        
        
>>>>>>> 86d584a (Manifest_cache true)
>>>>>>> 0e864a5 (Manifest_cache true)
          
      452. 
            1
            

            

<<<<<<< HEAD
              config.default_max_wait_time = 5
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
              config.default_max_wait_time = 5
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.default_driver = :rack_test
=======
=======
>>>>>>> 904663c (Featire specs)
              config.javascript_driver = :headless_chrome
>>>>>>> 86d584a (Manifest_cache true)
=======
              config.server_port = 3001
>>>>>>> 752f0c0 (Featire specs)
=======
              config.default_max_wait_time = 5
>>>>>>> 4e81ea2 (Featire specs)
=======
              config.asset_host = 'http://localhost:3000'
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
=======
              config.default_max_wait_time = 5
=======
              config.asset_host = 'http://localhost:3000'
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> a636fda (Featire specs)
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> f92a45b (Featire specs)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
          
        453. 
        
        
      
        
        
>>>>>>> 64dceec (Manifest_cache true)
          
      453. 
>>>>>>> 8cbdfeb (Manifest_cache true)
            1
<<<<<<< HEAD
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      454. 
=======
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 24b58e6 (Manifest_cache true)
            1
>>>>>>> 08edf50 (Featire specs)
=======
          
      455. 
            1
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
            end
>>>>>>> e5752db (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> b3f2049 (Featire specs)
=======
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
              config.server_port = 3001
=======
<<<<<<< HEAD
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 86d584a (Manifest_cache true)
              config.javascript_driver = :headless_chrome
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
              config.default_driver = :rack_test
=======
<<<<<<< HEAD
              config.javascript_driver = :headless_chrome
>>>>>>> 4e81ea2 (Featire specs)
=======
<<<<<<< HEAD
              config.default_driver = :rack_test
=======
<<<<<<< HEAD
              config.server_port = 3001
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
              config.default_max_wait_time = 5
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
              config.default_max_wait_time = 5
>>>>>>> c033601 (Rebased)
=======
              config.default_max_wait_time = 5
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
=======
=======
              config.server_port = 3001
>>>>>>> c8cdb08 (Manifest_cache true)
=======
              config.default_driver = :rack_test
>>>>>>> 4a0e3b6 (Manifest_cache true)
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
=======
=======
              config.server_port = 3001
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> a636fda (Featire specs)
=======
=======
<<<<<<< HEAD
              config.asset_host = 'http://localhost:3000'
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 659083f (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
=======
=======
              config.default_max_wait_time = 5
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> b832d45 (Featire specs)
>>>>>>> 86d584a (Manifest_cache true)
>>>>>>> 0e864a5 (Manifest_cache true)
          
        456. 
        
        
      
        
        
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 86d584a (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      456. 
            
=======
          
      457. 
=======
          
      458. 
<<<<<<< HEAD
=======
>>>>>>> 02a399d (Manifest_cache true)
            1
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      459. 
=======
          
      460. 
>>>>>>> 4a0e3b6 (Manifest_cache true)
>>>>>>> bd8bda4 (Manifest_cache true)
            1
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
          
      461. 
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 0e864a5 (Manifest_cache true)
          
      462. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
              config.default_driver = :rack_test
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
            end
>>>>>>> 659083f (Featire specs)
=======
>>>>>>> 64dceec (Manifest_cache true)
              config.javascript_driver = :headless_chrome
<<<<<<< HEAD
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5b7749a (Fix)
              config.javascript_driver = :headless_chrome
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
              config.server_port = 3001
>>>>>>> c033601 (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
              config.default_driver = :rack_test
=======
              config.server_port = 3001
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> a636fda (Featire specs)
=======
=======
              config.default_max_wait_time = 5
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 659083f (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
          
        463. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
          
      463. 
=======
<<<<<<< HEAD
=======
          
      464. 
=======
>>>>>>> 5c33a07 (Featire specs)
          
      465. 
            1
<<<<<<< HEAD
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
<<<<<<< HEAD
          
      466. 
            1
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
          
      467. 
            1
>>>>>>> c033601 (Rebased)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
              config.javascript_driver = :headless_chrome
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
            end
=======
              config.javascript_driver = :headless_chrome
>>>>>>> 4e81ea2 (Featire specs)
=======
              config.default_driver = :rack_test
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
              config.default_driver = :rack_test
>>>>>>> c033601 (Rebased)
          
        468. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
          
      468. 
            
=======
          
      469. 
=======
          
      470. 
>>>>>>> c033601 (Rebased)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
            end
=======
=======
>>>>>>> c033601 (Rebased)
=======
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
              config.javascript_driver = :headless_chrome
=======
              config.default_driver = :rack_test
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 563720e (Featire specs)
=======
              config.server_port = 3001
>>>>>>> 752f0c0 (Featire specs)
=======
              config.asset_host = 'http://localhost:3000'
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
=======
              config.asset_host = 'http://localhost:3000'
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
          
        471. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> a636fda (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> a636fda (Featire specs)
=======
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
          
      471. 
            
=======
          
      472. 
            1
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      473. 
            1
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
=======
          
      474. 
=======
          
      475. 
=======
          
      476. 
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 4a0e3b6 (Manifest_cache true)
            1
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 86d584a (Manifest_cache true)
=======
=======
          
      477. 
            1
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 904663c (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
            end
=======
              config.javascript_driver = :headless_chrome
>>>>>>> d0dc1f1 (Featire specs)
=======
              config.default_driver = :rack_test
<<<<<<< HEAD
=======
=======
              config.server_port = 3001
>>>>>>> 4e81ea2 (Featire specs)
=======
              config.default_max_wait_time = 5
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
=======
              config.asset_host = 'http://localhost:3000'
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> bf554f4 (Rebased)
>>>>>>> 49e8a6c (Rebased)
          
        478. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c033601 (Rebased)
>>>>>>> 659083f (Featire specs)
          
      478. 
<<<<<<< HEAD
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c033601 (Rebased)
          
      479. 
=======
=======
>>>>>>> 563720e (Featire specs)
=======
          
      480. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
              config.javascript_driver = :headless_chrome
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
              config.javascript_driver = :headless_chrome
=======
              config.default_driver = :rack_test
>>>>>>> 752f0c0 (Featire specs)
=======
              config.server_port = 3001
>>>>>>> 4e81ea2 (Featire specs)
=======
              config.default_max_wait_time = 5
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
          
        481. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> c033601 (Rebased)
          
      481. 
>>>>>>> 86d584a (Manifest_cache true)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 563720e (Featire specs)
          
      482. 
>>>>>>> b9cc4e9 (Manifest_cache true)
>>>>>>> b3f2049 (Featire specs)
            
=======
          
      483. 
=======
          
      484. 
<<<<<<< HEAD
>>>>>>> bd8bda4 (Manifest_cache true)
=======
>>>>>>> c8cdb08 (Manifest_cache true)
=======
          
      485. 
>>>>>>> 4a0e3b6 (Manifest_cache true)
>>>>>>> 86d584a (Manifest_cache true)
            1
>>>>>>> 752f0c0 (Featire specs)
=======
          
      486. 
=======
>>>>>>> 5c33a07 (Featire specs)
          
      487. 
            1
<<<<<<< HEAD
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      488. 
            1
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> f92a45b (Featire specs)
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
=======
=======
<<<<<<< HEAD
          
      489. 
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2722d07 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 2722d07 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      490. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> e54deeb (Featire specs)
=======
=======
          
      491. 
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
=======
          
      492. 
>>>>>>> 4552227 (Featire specs)
>>>>>>> 94841b5 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
=======
              config.default_driver = :rack_test
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> df37394 (Featire specs)
            end
=======
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
              config.javascript_driver = :headless_chrome
>>>>>>> 752f0c0 (Featire specs)
=======
              config.default_driver = :rack_test
<<<<<<< HEAD
>>>>>>> 4e81ea2 (Featire specs)
=======
              config.server_port = 3001
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
=======
              config.server_port = 3001
>>>>>>> 08edf50 (Featire specs)
=======
=======
>>>>>>> 49e8a6c (Rebased)
=======
=======
<<<<<<< HEAD
>>>>>>> 9620751 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
              config.default_max_wait_time = 5
=======
              config.asset_host = 'http://localhost:3000'
>>>>>>> d0dc1f1 (Featire specs)
=======
            Capybara.configure do |config|
>>>>>>> 752f0c0 (Featire specs)
=======
              config.default_max_wait_time = 5
>>>>>>> 4552227 (Featire specs)
          
        493. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      493. 
=======
          
      494. 
>>>>>>> e9f3851 (Manifest_cache true)
=======
=======
>>>>>>> 6fba6be (Featire specs)
          
      495. 
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
=======
=======
          
      496. 
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 35d17b9 (Manifest_cache true)
=======
=======
          
      497. 
>>>>>>> 4552227 (Featire specs)
>>>>>>> 6fba6be (Featire specs)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.javascript_driver = :headless_chrome
>>>>>>> 4e81ea2 (Featire specs)
=======
              config.default_driver = :rack_test
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
=======
              config.server_port = 3001
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
              config.server_port = 3001
>>>>>>> 49e8a6c (Rebased)
=======
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 6fba6be (Featire specs)
              config.server_port = 3001
=======
              config.default_max_wait_time = 5
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
=======
              config.asset_host = 'http://localhost:3000'
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
            Capybara.configure do |config|
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
              config.server_port = 3001
>>>>>>> 4552227 (Featire specs)
>>>>>>> 6fba6be (Featire specs)
          
        498. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      498. 
=======
          
      499. 
>>>>>>> e9f3851 (Manifest_cache true)
=======
          
      500. 
>>>>>>> d782a28 (Manifest_cache true)
=======
=======
>>>>>>> 6fba6be (Featire specs)
          
      501. 
<<<<<<< HEAD
>>>>>>> 35d17b9 (Manifest_cache true)
=======
=======
          
      502. 
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> add330c (Manifest_cache true)
=======
=======
          
      503. 
>>>>>>> 4552227 (Featire specs)
>>>>>>> 6fba6be (Featire specs)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.javascript_driver = :headless_chrome
>>>>>>> 08edf50 (Featire specs)
          
        504. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
          
      504. 
            
=======
          
      505. 
<<<<<<< HEAD
=======
>>>>>>> 5c33a07 (Featire specs)
=======
>>>>>>> 86d584a (Manifest_cache true)
          
      506. 
            1
<<<<<<< HEAD
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      507. 
            1
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
            1
>>>>>>> d0dc1f1 (Featire specs)
            

            

<<<<<<< HEAD
            end
=======
              config.javascript_driver = :headless_chrome
>>>>>>> d0dc1f1 (Featire specs)
          
        508. 
        
        
      
        
        
>>>>>>> c033601 (Rebased)
          
      508. 
            
>>>>>>> 93bdda9 (Featire specs)
            

            

<<<<<<< HEAD
              config.javascript_driver = :headless_chrome
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
            end
=======
              config.javascript_driver = :headless_chrome
>>>>>>> 4e81ea2 (Featire specs)
=======
              config.default_driver = :rack_test
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
          
        509. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
          
      509. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> c8cdb08 (Manifest_cache true)
          
      510. 
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
          
      511. 
=======
          
      512. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
=======
          
      513. 
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 86d584a (Manifest_cache true)
=======
=======
=======
          
      514. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
            
=======
          
      515. 
            1
>>>>>>> 08edf50 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
            end
=======
              config.javascript_driver = :headless_chrome
>>>>>>> 08edf50 (Featire specs)
          
        516. 
        
        
      
        
        
          
      516. 
>>>>>>> f92a45b (Featire specs)
            
            

            

<<<<<<< HEAD
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
>>>>>>> c033601 (Rebased)
=======
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
            
=======
            end
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
=======
            end
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
            end
>>>>>>> 08edf50 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
            end
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
            end
>>>>>>> 4552227 (Featire specs)
>>>>>>> 94841b5 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
=======
=======
            end
>>>>>>> 4e81ea2 (Featire specs)
=======
            end
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
          
        517. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 416166f (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> a636fda (Featire specs)
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a636fda (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
          
      517. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      518. 
=======
          
      519. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
      520. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
      521. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      522. 
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
      523. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
          
      524. 
>>>>>>> c033601 (Rebased)
            1
=======
          
      525. 
=======
          
      526. 
>>>>>>> 02a399d (Manifest_cache true)
            
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      527. 
=======
          
      528. 
>>>>>>> bd8bda4 (Manifest_cache true)
            
>>>>>>> 752f0c0 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6da9530 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
            Capybara.register_driver :headless_chrome do |app|
=======
            
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
=======
            end
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> bf554f4 (Rebased)
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> d782a28 (Manifest_cache true)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 6fba6be (Featire specs)
              config.default_driver = :rack_test
=======
              config.javascript_driver = :headless_chrome
>>>>>>> 96aecde (Manifest_cache true)
=======
              config.default_driver = :rack_test
>>>>>>> d0dc1f1 (Featire specs)
=======
              config.server_port = 3001
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
=======
              config.default_driver = :rack_test
>>>>>>> 3b03895 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
=======
=======
=======
>>>>>>> bf554f4 (Rebased)
>>>>>>> e055dd0 (Rebased)
=======
>>>>>>> 5e31aeb (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
>>>>>>> 51bc18c (Featire specs)
              config.default_driver = :rack_test
=======
              config.server_port = 3001
>>>>>>> d0dc1f1 (Featire specs)
=======
              config.default_max_wait_time = 5
>>>>>>> 752f0c0 (Featire specs)
=======
              config.asset_host = 'http://localhost:3000'
>>>>>>> 4e81ea2 (Featire specs)
=======
            Capybara.configure do |config|
>>>>>>> 08edf50 (Featire specs)
=======
              config.default_driver = :rack_test
>>>>>>> 4552227 (Featire specs)
          
        529. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      529. 
=======
          
      530. 
>>>>>>> e9f3851 (Manifest_cache true)
=======
=======
>>>>>>> 6fba6be (Featire specs)
          
      531. 
=======
          
      532. 
>>>>>>> fd6db03 (Manifest_cache true)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.javascript_driver = :headless_chrome
=======
              config.default_driver = :rack_test
>>>>>>> d0dc1f1 (Featire specs)
=======
              config.server_port = 3001
>>>>>>> 752f0c0 (Featire specs)
=======
              config.default_max_wait_time = 5
>>>>>>> 4e81ea2 (Featire specs)
=======
              config.asset_host = 'http://localhost:3000'
>>>>>>> 08edf50 (Featire specs)
          
        533. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      533. 
            
=======
          
      534. 
=======
          
      535. 
>>>>>>> 02a399d (Manifest_cache true)
            1
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      536. 
=======
          
      537. 
>>>>>>> bd8bda4 (Manifest_cache true)
            1
>>>>>>> 752f0c0 (Featire specs)
=======
          
      538. 
=======
          
      539. 
>>>>>>> aa7b40c (Manifest_cache true)
            1
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      540. 
>>>>>>> add330c (Manifest_cache true)
=======
          
      541. 
<<<<<<< HEAD
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.javascript_driver = :headless_chrome
=======
              config.default_driver = :rack_test
>>>>>>> d0dc1f1 (Featire specs)
=======
              config.server_port = 3001
>>>>>>> 752f0c0 (Featire specs)
=======
              config.default_max_wait_time = 5
>>>>>>> 4e81ea2 (Featire specs)
=======
              config.asset_host = 'http://localhost:3000'
>>>>>>> 08edf50 (Featire specs)
          
        542. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      542. 
            
=======
          
      543. 
=======
          
      544. 
>>>>>>> 02a399d (Manifest_cache true)
            1
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      545. 
=======
          
      546. 
>>>>>>> bd8bda4 (Manifest_cache true)
            1
>>>>>>> 752f0c0 (Featire specs)
=======
          
      547. 
>>>>>>> 35d17b9 (Manifest_cache true)
=======
          
      548. 
<<<<<<< HEAD
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.javascript_driver = :headless_chrome
>>>>>>> 08edf50 (Featire specs)
=======
              config.javascript_driver = :headless_chrome
=======
              config.default_driver = :rack_test
>>>>>>> d0dc1f1 (Featire specs)
=======
              config.server_port = 3001
>>>>>>> 752f0c0 (Featire specs)
=======
              config.default_max_wait_time = 5
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
          
        549. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> c8cdb08 (Manifest_cache true)
=======
>>>>>>> c4adab0 (Featire specs)
          
      549. 
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
>>>>>>> 24b58e6 (Manifest_cache true)
<<<<<<< HEAD
          
      550. 
=======
          
      551. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
=======
          
      552. 
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
=======
          
      553. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
=======
=======
          
      554. 
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 24b58e6 (Manifest_cache true)
            
<<<<<<< HEAD
=======
=======
          
      555. 
=======
          
      556. 
>>>>>>> 02a399d (Manifest_cache true)
            1
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      557. 
=======
          
      558. 
>>>>>>> bd8bda4 (Manifest_cache true)
            1
>>>>>>> 752f0c0 (Featire specs)
=======
          
      559. 
=======
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 2722d07 (Manifest_cache true)
            1
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
=======
=======
          
      560. 
=======
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 5b6aeb7 (Manifest_cache true)
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> e54deeb (Featire specs)
=======
=======
          
      561. 
=======
          
      562. 
>>>>>>> fd6db03 (Manifest_cache true)
            1
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 3b03895 (Featire specs)
=======
=======
          
      563. 
            1
>>>>>>> 4552227 (Featire specs)
>>>>>>> 94841b5 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 4e81ea2 (Featire specs)
=======
            end
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> 94841b5 (Featire specs)
            end
=======
              config.javascript_driver = :headless_chrome
>>>>>>> d0dc1f1 (Featire specs)
=======
              config.default_driver = :rack_test
=======
              config.server_port = 3001
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
=======
=======
              config.default_max_wait_time = 5
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> e54deeb (Featire specs)
=======
=======
              config.asset_host = 'http://localhost:3000'
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 3b03895 (Featire specs)
=======
=======
              config.javascript_driver = :headless_chrome
>>>>>>> 4552227 (Featire specs)
>>>>>>> 94841b5 (Featire specs)
          
        564. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      564. 
=======
          
      565. 
=======
          
      566. 
>>>>>>> 2722d07 (Manifest_cache true)
=======
          
      567. 
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
=======
>>>>>>> 94841b5 (Featire specs)
          
      568. 
>>>>>>> 2c640cf (Manifest_cache true)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.javascript_driver = :headless_chrome
>>>>>>> 752f0c0 (Featire specs)
=======
              config.default_driver = :rack_test
=======
              config.server_port = 3001
>>>>>>> 08edf50 (Featire specs)
=======
              config.default_max_wait_time = 5
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> 7c4ea7f (Fix)
=======
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
          
        569. 
        
        
      
        
        
          
      569. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.default_driver = :rack_test
=======
              config.server_port = 3001
>>>>>>> d0dc1f1 (Featire specs)
=======
              config.default_max_wait_time = 5
>>>>>>> 752f0c0 (Featire specs)
=======
              config.asset_host = 'http://localhost:3000'
>>>>>>> 4e81ea2 (Featire specs)
=======
            Capybara.configure do |config|
>>>>>>> 08edf50 (Featire specs)
          
        570. 
        
        
      
        
        
          
      570. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 2a25e4c (Featire specs)
              config.default_max_wait_time = 5
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
              config.javascript_driver = :headless_chrome
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.javascript_driver = :headless_chrome
=======
              config.default_driver = :rack_test
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0b43b18 (Manifest_cache true)
=======
              config.server_port = 3001
>>>>>>> 3e9f99d (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.default_driver = :rack_test
=======
              config.server_port = 3001
>>>>>>> 752f0c0 (Featire specs)
=======
              config.default_max_wait_time = 5
>>>>>>> 4e81ea2 (Featire specs)
=======
              config.asset_host = 'http://localhost:3000'
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
              config.default_max_wait_time = 5
=======
<<<<<<< HEAD
              config.asset_host = 'http://localhost:3000'
=======
              config.default_max_wait_time = 5
=======
              config.server_port = 3001
>>>>>>> c8cdb08 (Manifest_cache true)
=======
              config.default_driver = :rack_test
>>>>>>> 4a0e3b6 (Manifest_cache true)
>>>>>>> 0b43b18 (Manifest_cache true)
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
=======
=======
<<<<<<< HEAD
              config.asset_host = 'http://localhost:3000'
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
=======
              config.server_port = 3001
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
=======
=======
              config.default_max_wait_time = 5
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> b832d45 (Featire specs)
>>>>>>> 0b43b18 (Manifest_cache true)
          
        571. 
        
        
      
        
        
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      571. 
            
=======
          
      572. 
=======
          
      573. 
<<<<<<< HEAD
=======
>>>>>>> 02a399d (Manifest_cache true)
            1
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      574. 
=======
          
      575. 
>>>>>>> 4a0e3b6 (Manifest_cache true)
>>>>>>> bd8bda4 (Manifest_cache true)
            1
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
          
      576. 
=======
>>>>>>> 5c33a07 (Featire specs)
          
      577. 
=======
          
      578. 
>>>>>>> b9cc4e9 (Manifest_cache true)
            1
<<<<<<< HEAD
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      579. 
            1
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
>>>>>>> 0b43b18 (Manifest_cache true)
          
      580. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
              config.default_driver = :rack_test
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
            end
=======
>>>>>>> 3e9f99d (Featire specs)
              config.javascript_driver = :headless_chrome
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 5c33a07 (Featire specs)
=======
              config.server_port = 3001
>>>>>>> c033601 (Rebased)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
              config.default_driver = :rack_test
=======
              config.server_port = 3001
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
=======
=======
              config.default_max_wait_time = 5
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
              config.asset_host = 'http://localhost:3000'
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
          
        581. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      581. 
=======
<<<<<<< HEAD
=======
          
      582. 
=======
>>>>>>> 5c33a07 (Featire specs)
          
      583. 
=======
          
      584. 
>>>>>>> b9cc4e9 (Manifest_cache true)
            1
<<<<<<< HEAD
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      585. 
            1
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
          
      586. 
            1
>>>>>>> c033601 (Rebased)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
              config.javascript_driver = :headless_chrome
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
            end
=======
              config.javascript_driver = :headless_chrome
>>>>>>> 4e81ea2 (Featire specs)
=======
              config.default_driver = :rack_test
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
              config.default_driver = :rack_test
>>>>>>> c033601 (Rebased)
          
        587. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
          
      587. 
            
=======
          
      588. 
=======
          
      589. 
>>>>>>> c033601 (Rebased)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
            end
=======
=======
>>>>>>> c033601 (Rebased)
=======
>>>>>>> a636fda (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
              config.javascript_driver = :headless_chrome
=======
              config.default_driver = :rack_test
>>>>>>> d0dc1f1 (Featire specs)
=======
              config.server_port = 3001
>>>>>>> 752f0c0 (Featire specs)
          
        590. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> a636fda (Featire specs)
=======
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
          
      590. 
            
=======
          
      591. 
=======
          
      592. 
>>>>>>> 02a399d (Manifest_cache true)
            1
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      593. 
            1
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
=======
          
      594. 
=======
          
      595. 
=======
          
      596. 
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 4a0e3b6 (Manifest_cache true)
            1
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      597. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 2ee03d3 (Featire specs)
=======
=======
          
      598. 
            1
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
            end
=======
              config.javascript_driver = :headless_chrome
>>>>>>> d0dc1f1 (Featire specs)
=======
              config.default_driver = :rack_test
<<<<<<< HEAD
=======
=======
              config.server_port = 3001
>>>>>>> 4e81ea2 (Featire specs)
=======
              config.default_max_wait_time = 5
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 2ee03d3 (Featire specs)
=======
=======
              config.asset_host = 'http://localhost:3000'
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
          
        599. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c033601 (Rebased)
>>>>>>> 3e9f99d (Featire specs)
          
      599. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
=======
=======
=======
          
      600. 
            1
            

            

<<<<<<< HEAD
              config.javascript_driver = :headless_chrome
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.javascript_driver = :headless_chrome
>>>>>>> 752f0c0 (Featire specs)
=======
              config.default_driver = :rack_test
=======
              config.server_port = 3001
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 2ee03d3 (Featire specs)
=======
=======
              config.default_max_wait_time = 5
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
          
        601. 
        
        
      
        
        
<<<<<<< HEAD
=======
          
      601. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
              config.javascript_driver = :headless_chrome
>>>>>>> 4e81ea2 (Featire specs)
=======
              config.default_driver = :rack_test
=======
              config.server_port = 3001
>>>>>>> 7a02bbe (Featire specs)
          
        602. 
        
        
      
        
        
          
      602. 
            1
            

            

<<<<<<< HEAD
              config.javascript_driver = :headless_chrome
>>>>>>> 08edf50 (Featire specs)
          
        603. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
          
      603. 
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 2722d07 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
=======
          
      604. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 3723aad (Featire specs)
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 2ee03d3 (Featire specs)
=======
=======
          
      605. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> e54deeb (Featire specs)
=======
=======
          
      606. 
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
=======
          
      607. 
>>>>>>> 4552227 (Featire specs)
>>>>>>> 94841b5 (Featire specs)
            
            

            

<<<<<<< HEAD
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
>>>>>>> c033601 (Rebased)
=======
>>>>>>> a636fda (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
            
=======
            end
>>>>>>> d0dc1f1 (Featire specs)
=======
            end
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
            end
>>>>>>> 08edf50 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
=======
=======
            end
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54deeb (Featire specs)
=======
            end
>>>>>>> 4552227 (Featire specs)
>>>>>>> 94841b5 (Featire specs)
=======
=======
            end
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
          
        608. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> a636fda (Featire specs)
=======
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
          
      608. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      609. 
=======
          
      610. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
      611. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
      612. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      613. 
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
      614. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
          
      615. 
>>>>>>> c033601 (Rebased)
            1
=======
          
      616. 
=======
          
      617. 
>>>>>>> 02a399d (Manifest_cache true)
            
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      618. 
<<<<<<< HEAD
=======
          
      619. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
>>>>>>> 3e9f99d (Featire specs)
            
>>>>>>> 752f0c0 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
            Capybara.register_driver :headless_chrome do |app|
=======
            
>>>>>>> d0dc1f1 (Featire specs)
=======
            end
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> bf554f4 (Rebased)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
              config.default_driver = :rack_test
=======
              config.javascript_driver = :headless_chrome
>>>>>>> 96aecde (Manifest_cache true)
=======
              config.default_driver = :rack_test
>>>>>>> d0dc1f1 (Featire specs)
=======
              config.server_port = 3001
>>>>>>> 752f0c0 (Featire specs)
=======
              config.default_driver = :rack_test
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
=======
              config.default_driver = :rack_test
          
        620. 
        
        
      
        
        
          
      620. 
            1
            

            

              config.javascript_driver = :headless_chrome
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
          
        621. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      621. 
            
=======
          
      622. 
=======
          
      623. 
>>>>>>> 02a399d (Manifest_cache true)
            1
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      624. 
=======
          
      625. 
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
=======
=======
          
      626. 
>>>>>>> 3b03895 (Featire specs)
>>>>>>> a9e66e9 (Featire specs)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.javascript_driver = :headless_chrome
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> e055dd0 (Rebased)
=======
=======
              config.default_driver = :rack_test
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5e31aeb (Featire specs)
=======
=======
              config.server_port = 3001
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 51bc18c (Featire specs)
          
        627. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
          
      627. 
            
=======
          
      628. 
=======
          
      629. 
>>>>>>> 02a399d (Manifest_cache true)
            1
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      630. 
=======
          
      631. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      632. 
>>>>>>> 3b03895 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.javascript_driver = :headless_chrome
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> bc6bc8d2 (Rebased)
=======
=======
=======
              config.default_driver = :rack_test
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 932dbec (Featire specs)
>>>>>>> d52f9efe (Featire specs)
          
        633. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
          
      633. 
            
=======
          
      634. 
=======
=======
>>>>>>> 84003439 (Featire specs)
          
      635. 
>>>>>>> 02a399d (Manifest_cache true)
            1
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      636. 
=======
          
      637. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      638. 
>>>>>>> 3b03895 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
          
      639. 
>>>>>>> 37e48018 (Featire specs)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              config.javascript_driver = :headless_chrome
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> 311e9fa (Rebased)
=======
=======
              config.default_driver = :rack_test
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
=======
=======
              config.server_port = 3001
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
<<<<<<< HEAD
              config.javascript_driver = :headless_chrome
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
=======
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
              config.default_driver = :rack_test
>>>>>>> d0dc1f1 (Featire specs)
=======
              config.server_port = 3001
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
          
        640. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      640. 
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
          
      641. 
>>>>>>> 84809242 (Featire specs)
            1
            

            

              config.javascript_driver = :headless_chrome
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 34509eee (Featire specs)
=======
>>>>>>> 75fa7e1b (Rebased)
=======
              config.javascript_driver = :headless_chrome
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 11792758 (Rebased)
          
        642. 
        
        
      
        
        
<<<<<<< HEAD
          
      642. 
            1
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
              config.server_port = 3001
>>>>>>> 715fac2 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ae07231a (Featire specs)
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> e9f3851 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> e9f3851 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 75fa7e1b (Rebased)
=======
<<<<<<< HEAD
=======
=======
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> d34a0770 (Manifest_cache true)
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> e9f3851 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bc6bc8d2 (Rebased)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
          
      643. 
            
=======
<<<<<<< HEAD
          
      644. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
>>>>>>> 251144b4 (Manifest_cache true)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> cc390719 (Manifest_cache true)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
          
      645. 
=======
          
      646. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
>>>>>>> c59d1a99 (Manifest_cache true)
=======
>>>>>>> 37e48018 (Featire specs)
>>>>>>> c8cdb08 (Manifest_cache true)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
>>>>>>> c8cdb08 (Manifest_cache true)
>>>>>>> 86d584a (Manifest_cache true)
>>>>>>> e5890c2 (Manifest_cache true)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
>>>>>>> c8cdb08 (Manifest_cache true)
>>>>>>> 86d584a (Manifest_cache true)
>>>>>>> e5890c2 (Manifest_cache true)
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
          
      647. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
=======
          
      648. 
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8cdb08 (Manifest_cache true)
>>>>>>> 86d584a (Manifest_cache true)
>>>>>>> 0e864a5 (Manifest_cache true)
=======
=======
          
      649. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
=======
=======
=======
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 24b58e6 (Manifest_cache true)
=======
=======
            
            

            

            end
          
        650. 
        
        
      
        
        
          
      650. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 37e48018 (Featire specs)
            
            

            

            
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> c59d1a99 (Manifest_cache true)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> 34509eee (Featire specs)
          
      651. 
>>>>>>> 4e81ea2 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
=======
          
      652. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
=======
=======
=======
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 24b58e6 (Manifest_cache true)
=======
=======
<<<<<<< HEAD
=======
=======
=======
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
          
      653. 
>>>>>>> 75fa7e1b (Rebased)
=======
>>>>>>> bf554f4 (Rebased)
          
      654. 
>>>>>>> 11792758 (Rebased)
            
            

            

            end
          
        655. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 75fa7e1b (Rebased)
=======
<<<<<<< HEAD
>>>>>>> 11792758 (Rebased)
          
      655. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
=======
          
      656. 
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 00f8b58 (Manifest_cache true)
=======
          
      657. 
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 75fa7e1b (Rebased)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
          
      658. 
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
>>>>>>> 11792758 (Rebased)
=======
>>>>>>> 9d98d9ab (Featire specs)
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
<<<<<<< HEAD
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 7a08014b (Featire specs)
=======
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
            end
          
        659. 
        
        
      
        
        
          
      659. 
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
=======
>>>>>>> b832d45 (Featire specs)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
          
      660. 
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
=======
=======
=======
          
      661. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
            
            

            

>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
            
>>>>>>> f8e5c9db (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> b832d45 (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 0e864a5 (Manifest_cache true)
=======
>>>>>>> da3a9a3 (Featire specs)
          
      662. 
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 86d584a (Manifest_cache true)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
=======
=======
          
      663. 
<<<<<<< HEAD
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
=======
=======
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 24b58e6 (Manifest_cache true)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
=======
=======
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 59d75f9 (Featire specs)
          
      664. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
=======
>>>>>>> 9620751 (Featire specs)
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> d34a0770 (Manifest_cache true)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
>>>>>>> ae07231a (Featire specs)
          
      665. 
>>>>>>> 49e8a6c (Rebased)
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
>>>>>>> 416166f (Featire specs)
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0e864a5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> cc390719 (Manifest_cache true)
=======
=======
=======
=======
=======
          
      666. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
=======
=======
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 24b58e6 (Manifest_cache true)
=======
=======
<<<<<<< HEAD
=======
=======
=======
>>>>>>> bf554f4 (Rebased)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 59d75f9 (Featire specs)
          
      667. 
>>>>>>> 49e8a6c (Rebased)
            
=======
          
      668. 
=======
          
      669. 
>>>>>>> 02a399d (Manifest_cache true)
            1
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      670. 
=======
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> 96aecde (Manifest_cache true)
            1
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
=======
          
      671. 
=======
          
      672. 
=======
          
      673. 
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 4a0e3b6 (Manifest_cache true)
            1
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 0b43b18 (Manifest_cache true)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
            end
=======
              config.javascript_driver = :headless_chrome
>>>>>>> d0dc1f1 (Featire specs)
=======
              config.default_driver = :rack_test
=======
              config.server_port = 3001
>>>>>>> 7c4ea7f (Fix)
          
        674. 
        
        
      
        
        
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> e9f3851 (Manifest_cache true)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> d782a28 (Manifest_cache true)
=======
>>>>>>> 15bff2e (Manifest_cache true)
=======
>>>>>>> 6c71f00 (Manifest_cache true)
          
      674. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
=======
=======
=======
>>>>>>> c033601 (Rebased)
>>>>>>> 0b43b18 (Manifest_cache true)
          
      675. 
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 00f8b58 (Manifest_cache true)
=======
          
      676. 
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
=======
=======
=======
          
      677. 
=======
<<<<<<< HEAD
=======
          
      678. 
=======
          
      679. 
>>>>>>> c8cdb08 (Manifest_cache true)
=======
          
      680. 
>>>>>>> 4a0e3b6 (Manifest_cache true)
>>>>>>> 0b43b18 (Manifest_cache true)
            1
            

            

              config.default_driver = :rack_test
          
        681. 
        
        
      
        
        
<<<<<<< HEAD
>>>>>>> b15044a (Manifest_cache true)
          
      681. 
>>>>>>> 96aecde (Manifest_cache true)
=======
          
      682. 
>>>>>>> 2c640cf (Manifest_cache true)
=======
          
      683. 
>>>>>>> 0b43b18 (Manifest_cache true)
            1
            

            

              config.javascript_driver = :headless_chrome
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0b43b18 (Manifest_cache true)
=======
=======
<<<<<<< HEAD
>>>>>>> 2a25e4c (Featire specs)
              config.javascript_driver = :headless_chrome
=======
              config.default_driver = :rack_test
>>>>>>> 752f0c0 (Featire specs)
=======
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
          
      684. 
=======
          
      685. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
=======
          
      686. 
>>>>>>> aa7b40c (Manifest_cache true)
=======
>>>>>>> 2ee03d3 (Featire specs)
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
=======
          
      687. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 3723aad (Featire specs)
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0b43b18 (Manifest_cache true)
=======
              config.server_port = 3001
>>>>>>> 4e81ea2 (Featire specs)
=======
              config.default_max_wait_time = 5
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> 715fac2 (Featire specs)
=======
=======
              config.default_max_wait_time = 5
>>>>>>> c033601 (Rebased)
=======
              config.default_max_wait_time = 5
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> a636fda (Featire specs)
>>>>>>> 2a25e4c (Featire specs)
          
        688. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 59d75f9 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 96aecde (Manifest_cache true)
          
      688. 
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> e9f3851 (Manifest_cache true)
>>>>>>> 3be4d14 (Manifest_cache true)
>>>>>>> 1b8f36d8 (Manifest_cache true)
            
=======
          
      689. 
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d34a0770 (Manifest_cache true)
=======
          
      690. 
>>>>>>> 02a399d (Manifest_cache true)
            1
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      691. 
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> bd30d038 (Manifest_cache true)
=======
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> 96aecde (Manifest_cache true)
            1
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
            
>>>>>>> 4d4cf6b4 (Featire specs)
=======
            1
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> d52f9efe (Featire specs)
=======
            1
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> ae07231a (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> e6fc67c7 (Featire specs)
=======
>>>>>>> 53db2224 (Featire specs)
            end
=======
              config.javascript_driver = :headless_chrome
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
              config.default_driver = :rack_test
=======
              config.server_port = 3001
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 610b6138 (Featire specs)
=======
            end
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> d52f9efe (Featire specs)
=======
=======
              config.default_driver = :rack_test
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> ef483b6d (Fix)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 4e81ea2 (Featire specs)
=======
            end
>>>>>>> f92a45b (Featire specs)
>>>>>>> e6fc67c7 (Featire specs)
          
        692. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4367ccb1 (Manifest_cache true)
=======
>>>>>>> 4fac471d (Manifest_cache true)
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> d782a28 (Manifest_cache true)
<<<<<<< HEAD
=======
>>>>>>> d34a0770 (Manifest_cache true)
=======
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> bd30d038 (Manifest_cache true)
          
      692. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
>>>>>>> 64dceec (Manifest_cache true)
          
      693. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
>>>>>>> 64dceec (Manifest_cache true)
          
      694. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      695. 
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 00f8b58 (Manifest_cache true)
=======
          
      696. 
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 49e8a6c (Rebased)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      697. 
=======
=======
          
      698. 
            1
=======
          
      699. 
            
>>>>>>> f92a45b (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> 4fac471d (Manifest_cache true)
=======
>>>>>>> ef483b6d (Fix)
=======
>>>>>>> e6fc67c7 (Featire specs)
              config.default_driver = :rack_test
          
        700. 
        
        
      
        
        
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
          
      700. 
>>>>>>> 96aecde (Manifest_cache true)
=======
          
      701. 
>>>>>>> 2c640cf (Manifest_cache true)
            1
            

            

              config.javascript_driver = :headless_chrome
<<<<<<< HEAD
=======
=======
>>>>>>> 5e31aeb (Featire specs)
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
            
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f92a45b (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> e055dd0 (Rebased)
=======
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 752f0c0 (Featire specs)
=======
=======
>>>>>>> c033601 (Rebased)
=======
>>>>>>> a636fda (Featire specs)
            
=======
            end
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 49e8a6c (Rebased)
=======
<<<<<<< HEAD
            
=======
            end
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
          
        702. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 59d75f9 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 96aecde (Manifest_cache true)
          
      702. 
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 49e8a6c (Rebased)
>>>>>>> bc6bc8d2 (Rebased)
          
      703. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
          
      704. 
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 00f8b58 (Manifest_cache true)
=======
          
      705. 
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> bc6bc8d2 (Rebased)
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      706. 
=======
=======
>>>>>>> 4fac471d (Manifest_cache true)
          
      707. 
>>>>>>> 96aecde (Manifest_cache true)
=======
          
      708. 
>>>>>>> 2c640cf (Manifest_cache true)
            1
            

            

              config.javascript_driver = :headless_chrome
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
          
        709. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 59d75f9 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 96aecde (Manifest_cache true)
          
      709. 
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d34a0770 (Manifest_cache true)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
>>>>>>> ecb02dbf (Featire specs)
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
            
>>>>>>> 4d4cf6b4 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 7a08014b (Featire specs)
            
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> 311e9fa (Rebased)
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
=======
=======
=======
>>>>>>> c033601 (Rebased)
=======
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
            
=======
            end
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
=======
=======
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
=======
=======
<<<<<<< HEAD
            
=======
            end
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 11792758 (Rebased)
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
=======
>>>>>>> 4d4cf6b4 (Featire specs)
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
>>>>>>> 49e8a6c (Rebased)
>>>>>>> 311e9fa (Rebased)
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> d52f9efe (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
            
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
>>>>>>> ecb02dbf (Featire specs)
          
        710. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 75fa7e1b (Rebased)
=======
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 251144b4 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
<<<<<<< HEAD
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> c59d1a99 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 610b6138 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 11792758 (Rebased)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 0e864a5 (Manifest_cache true)
=======
=======
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> c8cdb08 (Manifest_cache true)
=======
<<<<<<< HEAD
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> c59d1a99 (Manifest_cache true)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> 0e864a5 (Manifest_cache true)
>>>>>>> cc390719 (Manifest_cache true)
<<<<<<< HEAD
=======
>>>>>>> bd8bda4 (Manifest_cache true)
=======
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> cc390719 (Manifest_cache true)
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
=======
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 24b58e6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> c59d1a99 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
>>>>>>> 86d584a (Manifest_cache true)
>>>>>>> 0e864a5 (Manifest_cache true)
>>>>>>> cc390719 (Manifest_cache true)
          
      710. 
<<<<<<< HEAD
>>>>>>> b9cc4e9 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 490b01d6 (Manifest_cache true)
=======
=======
=======
          
      711. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
=======
          
      712. 
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 00f8b58 (Manifest_cache true)
=======
          
      713. 
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 75fa7e1b (Rebased)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
=======
>>>>>>> c51bf93 (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> e5890c2 (Manifest_cache true)
=======
>>>>>>> 9440753 (Featire specs)
=======
=======
>>>>>>> afa56d1 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> d34a0770 (Manifest_cache true)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d52f9efe (Featire specs)
>>>>>>> 311e9fa (Rebased)
=======
=======
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d34a0770 (Manifest_cache true)
>>>>>>> 932dbec (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b719333 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 311e9fa (Rebased)
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> 932dbec (Featire specs)
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> d34a0770 (Manifest_cache true)
=======
=======
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5e31aeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 53db2224 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
>>>>>>> 3be4d14 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1b8f36d8 (Manifest_cache true)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
>>>>>>> afa56d1 (Featire specs)
>>>>>>> e1ecabbe (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
=======
=======
=======
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> c8cdb08 (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> afa56d1 (Featire specs)
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> bd8bda4 (Manifest_cache true)
=======
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 86d584a (Manifest_cache true)
=======
=======
=======
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d34a0770 (Manifest_cache true)
=======
>>>>>>> 53db2224 (Featire specs)
=======
=======
>>>>>>> 3be4d14 (Manifest_cache true)
>>>>>>> 1b8f36d8 (Manifest_cache true)
>>>>>>> 5507b42 (Featire specs)
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5507b42 (Featire specs)
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> d34a0770 (Manifest_cache true)
=======
=======
>>>>>>> 5507b42 (Featire specs)
>>>>>>> 5e31aeb (Featire specs)
>>>>>>> 53db2224 (Featire specs)
=======
=======
>>>>>>> 5507b42 (Featire specs)
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> 3be4d14 (Manifest_cache true)
>>>>>>> 1b8f36d8 (Manifest_cache true)
          
      714. 
<<<<<<< HEAD
>>>>>>> b9cc4e9 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
=======
<<<<<<< HEAD
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
          
      715. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      716. 
=======
          
      717. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
      718. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
      719. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      720. 
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
      721. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
=======
=======
<<<<<<< HEAD
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 845dac1 (Manifest_cache true)
          
      722. 
<<<<<<< HEAD
>>>>>>> b9cc4e9 (Manifest_cache true)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      723. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
=======
>>>>>>> bc6bc8d2 (Rebased)
          
      724. 
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 00f8b58 (Manifest_cache true)
=======
          
      725. 
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 49e8a6c (Rebased)
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> 13fca83d (Rebased)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 11792758 (Rebased)
=======
>>>>>>> 49e8a6c (Rebased)
>>>>>>> 311e9fa (Rebased)
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> 49e8a6c (Rebased)
>>>>>>> 311e9fa (Rebased)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
>>>>>>> f92a45b (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
          
      726. 
>>>>>>> b9cc4e9 (Manifest_cache true)
>>>>>>> b3f2049 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
=======
<<<<<<< HEAD
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
          
      727. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      728. 
=======
          
      729. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
      730. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
      731. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      732. 
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
      733. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
=======
=======
=======
          
      734. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
=======
=======
          
      735. 
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 00f8b58 (Manifest_cache true)
=======
          
      736. 
>>>>>>> bf554f4 (Rebased)
>>>>>>> 49e8a6c (Rebased)
>>>>>>> e055dd0 (Rebased)
>>>>>>> bdc24a1a (Rebased)
            1
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
            1
=======
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
          
      737. 
            
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
=======
          
      738. 
            1
>>>>>>> 752f0c0 (Featire specs)
=======
          
      739. 
            
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
      740. 
            1
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      741. 
            
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
      742. 
            1
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9bfbd88 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9bfbd88 (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
=======
=======
          
      743. 
>>>>>>> 84809242 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 7a02bbe (Featire specs)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
<<<<<<< HEAD
=======
>>>>>>> f0e2e12a (Featire specs)
>>>>>>> bb5c652 (Fix book_spec decrease quantity and price)
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 11792758 (Rebased)
=======
          
      744. 
            1
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9a49b7b (Rebased)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      745. 
=======
          
      746. 
>>>>>>> 02a399d (Manifest_cache true)
            
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 9620751 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 9620751 (Featire specs)
=======
=======
          
      747. 
=======
          
      748. 
>>>>>>> bd8bda4 (Manifest_cache true)
            
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> 9a49b7b (Rebased)
>>>>>>> 11792758 (Rebased)
            

            

<<<<<<< HEAD
>>>>>>> 75fa7e1b (Rebased)
=======
>>>>>>> 11792758 (Rebased)
            Capybara.register_driver :headless_chrome do |app|
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
          
        749. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 7a08014b (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
=======
=======
>>>>>>> b832d45 (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
>>>>>>> ebcdce06 (Featire specs)
=======
>>>>>>> c59d1a99 (Manifest_cache true)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
          
      749. 
            1
=======
<<<<<<< HEAD
<<<<<<< HEAD
          
      750. 
            
>>>>>>> ae2a012 (Manifest_cache true)
=======
          
      751. 
            1
>>>>>>> 752f0c0 (Featire specs)
=======
          
      752. 
            1
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      753. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
          
      754. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      755. 
            1
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
          
      756. 
            
>>>>>>> fd6db03 (Manifest_cache true)
=======
<<<<<<< HEAD
          
      757. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
          
      758. 
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
          
      759. 
            
>>>>>>> 11792758 (Rebased)
            
>>>>>>> 75fa7e1b (Rebased)
=======
          
      760. 
            1
>>>>>>> 67ab5299 (Fix)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
=======
          
      761. 
            1
>>>>>>> c7a726c5 (Rebased)
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
          
      762. 
            
<<<<<<< HEAD
=======
<<<<<<< HEAD
          
      763. 
=======
          
      764. 
>>>>>>> bf554f4 (Rebased)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
=======
>>>>>>> c51bf93 (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> e5890c2 (Manifest_cache true)
=======
>>>>>>> 9440753 (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
>>>>>>> ed32b84 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
=======
=======
=======
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> c8cdb08 (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> bd8bda4 (Manifest_cache true)
=======
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 4a0e3b6 (Manifest_cache true)
>>>>>>> 86d584a (Manifest_cache true)
          
      765. 
<<<<<<< HEAD
>>>>>>> b9cc4e9 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
=======
<<<<<<< HEAD
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
          
      766. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      767. 
=======
          
      768. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
      769. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
      770. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      771. 
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
      772. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
=======
=======
=======
=======
          
      773. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
            1
=======
<<<<<<< HEAD
          
      774. 
            
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
=======
          
      775. 
            1
>>>>>>> 752f0c0 (Featire specs)
=======
          
      776. 
            
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
      777. 
            1
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      778. 
            
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
      779. 
            1
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
>>>>>>> 9bfbd88 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
          
      780. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
      781. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bb5c652 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
=======
          
      782. 
            1
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9a49b7b (Rebased)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      783. 
=======
          
      784. 
>>>>>>> 02a399d (Manifest_cache true)
            
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 9620751 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 9620751 (Featire specs)
=======
=======
          
      785. 
=======
          
      786. 
>>>>>>> bd8bda4 (Manifest_cache true)
            
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
>>>>>>> 77d62af (Featire specs)
=======
=======
          
      787. 
=======
          
      788. 
>>>>>>> 02a399d (Manifest_cache true)
            
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 659083f (Featire specs)
=======
=======
>>>>>>> 9620751 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5e31aeb (Featire specs)
=======
=======
>>>>>>> 9620751 (Featire specs)
=======
=======
          
      789. 
=======
          
      790. 
>>>>>>> bd8bda4 (Manifest_cache true)
            
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
>>>>>>> af057e3 (Featire specs)
>>>>>>> 51bc18c (Featire specs)
            

            

<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 659083f (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> e055dd0 (Rebased)
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5e31aeb (Featire specs)
=======
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> 51bc18c (Featire specs)
            Capybara.register_driver :headless_chrome do |app|
=======
            
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
            end
=======
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
=======
            end
>>>>>>> af057e3 (Featire specs)
=======
              config.javascript_driver = :headless_chrome
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
          
        791. 
        
        
      
        
        
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 715fac2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      791. 
=======
=======
>>>>>>> 15bff2e (Manifest_cache true)
=======
>>>>>>> 6c71f00 (Manifest_cache true)
          
      792. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
=======
=======
          
      793. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> add330c (Manifest_cache true)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
          
      794. 
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 35d17b9 (Manifest_cache true)
=======
=======
          
      795. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> add330c (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> 715fac2 (Featire specs)
          
      796. 
            
=======
          
      797. 
=======
          
      798. 
>>>>>>> bd8bda4 (Manifest_cache true)
            1
>>>>>>> 752f0c0 (Featire specs)
=======
          
      799. 
=======
>>>>>>> 5c33a07 (Featire specs)
          
      800. 
            1
<<<<<<< HEAD
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      801. 
            1
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 2a25e4c (Featire specs)
              config.default_driver = :rack_test
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
            end
=======
              config.javascript_driver = :headless_chrome
>>>>>>> 752f0c0 (Featire specs)
=======
              config.default_driver = :rack_test
>>>>>>> 4e81ea2 (Featire specs)
=======
              config.server_port = 3001
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
=======
=======
              config.server_port = 3001
>>>>>>> c033601 (Rebased)
=======
              config.default_driver = :rack_test
=======
              config.server_port = 3001
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> a636fda (Featire specs)
>>>>>>> 2a25e4c (Featire specs)
          
        802. 
        
        
      
        
        
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      802. 
            
=======
          
      803. 
=======
>>>>>>> 5c33a07 (Featire specs)
          
      804. 
            1
<<<<<<< HEAD
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      805. 
            1
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
            

            

<<<<<<< HEAD
              config.javascript_driver = :headless_chrome
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
            end
=======
              config.javascript_driver = :headless_chrome
>>>>>>> 4e81ea2 (Featire specs)
=======
              config.default_driver = :rack_test
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
          
        806. 
        
        
      
        
        
<<<<<<< HEAD
          
      806. 
            
=======
          
      807. 
            1
>>>>>>> 08edf50 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 2a25e4c (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
            end
=======
<<<<<<< HEAD
              config.javascript_driver = :headless_chrome
>>>>>>> 08edf50 (Featire specs)
=======
=======
>>>>>>> c033601 (Rebased)
=======
>>>>>>> a636fda (Featire specs)
              config.javascript_driver = :headless_chrome
=======
              config.default_driver = :rack_test
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 2a25e4c (Featire specs)
          
        808. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      808. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
=======
=======
=======
>>>>>>> a636fda (Featire specs)
          
      809. 
            
=======
          
      810. 
            1
>>>>>>> d0dc1f1 (Featire specs)
            

            

<<<<<<< HEAD
            end
=======
              config.javascript_driver = :headless_chrome
>>>>>>> d0dc1f1 (Featire specs)
          
        811. 
        
        
      
        
        
>>>>>>> c033601 (Rebased)
>>>>>>> 2a25e4c (Featire specs)
          
      811. 
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 15bff2e (Manifest_cache true)
=======
=======
          
      812. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
          
      813. 
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> 6c71f00 (Manifest_cache true)
=======
          
      814. 
>>>>>>> 1d59aaa (Fix)
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 4e81ea2 (Featire specs)
=======
            end
          
        815. 
        
        
      
        
        
          
      815. 
            
            

            

>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
=======
=======
>>>>>>> c033601 (Rebased)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 2a25e4c (Featire specs)
            
=======
            end
>>>>>>> d0dc1f1 (Featire specs)
          
        816. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 2a25e4c (Featire specs)
          
      816. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      817. 
=======
          
      818. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
      819. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
      820. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      821. 
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
      822. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
            1
=======
          
      823. 
            
>>>>>>> d0dc1f1 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e18eb87 (Fix)
=======
=======
=======
>>>>>>> 0e864a5 (Manifest_cache true)
=======
>>>>>>> e055dd0 (Rebased)
=======
>>>>>>> 0c57e4e (Fix)
=======
>>>>>>> 3be4d14 (Manifest_cache true)
=======
>>>>>>> 72b9cab (Featire specs)
=======
>>>>>>> 15c51b7 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
          
      824. 
            
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f92a45b (Featire specs)
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0e864a5 (Manifest_cache true)
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
          
      825. 
<<<<<<< HEAD
=======
=======
=======
          
      826. 
            
=======
          
      827. 
=======
=======
          
      828. 
<<<<<<< HEAD
=======
=======
          
      829. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8cdb08 (Manifest_cache true)
=======
=======
          
      830. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> b832d45 (Featire specs)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
          
      831. 
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0b43b18 (Manifest_cache true)
=======
=======
=======
          
      832. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
=======
=======
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 24b58e6 (Manifest_cache true)
=======
=======
            
            

            

            end
          
        833. 
        
        
      
        
        
          
      833. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
            
            

            

            
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
          
        834. 
        
        
      
        
        
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
          
      834. 
>>>>>>> e9f3851 (Manifest_cache true)
            1
>>>>>>> 872e675 (Fix)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
            
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> 4552227 (Featire specs)
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> 1d59aaa (Fix)
            Capybara.register_driver :headless_chrome do |app|
>>>>>>> 307f31f (Manifest_cache true)
=======
            Capybara.register_driver :headless_chrome do |app|
=======
            
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 2a25e4c (Featire specs)
          
        835. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
          
      835. 
            
=======
>>>>>>> 715fac2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
=======
=======
=======
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> c8cdb08 (Manifest_cache true)
=======
<<<<<<< HEAD
=======
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> bd8bda4 (Manifest_cache true)
=======
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 4a0e3b6 (Manifest_cache true)
>>>>>>> 0b43b18 (Manifest_cache true)
          
      836. 
<<<<<<< HEAD
>>>>>>> b9cc4e9 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 563720e (Featire specs)
=======
          
      837. 
>>>>>>> 307f31f (Manifest_cache true)
=======
=======
=======
          
      838. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
            1
<<<<<<< HEAD
>>>>>>> 31d15e66 (Fix)
=======
=======
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
          
      839. 
            
>>>>>>> ae2a012 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a71befd (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> d782a28 (Manifest_cache true)
=======
>>>>>>> 35d17b9 (Manifest_cache true)
=======
>>>>>>> add330c (Manifest_cache true)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 15bff2e (Manifest_cache true)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> 6c71f00 (Manifest_cache true)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
          
      840. 
            1
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 51bc18c (Featire specs)
=======
          
      841. 
            1
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      842. 
            1
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
>>>>>>> 307f31f (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a71befd (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8a3779d4 (Manifest_cache true)
=======
=======
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> 51bc18c (Featire specs)
>>>>>>> 7b22ad7e (Featire specs)
            

            
=======
>>>>>>> 11792758 (Rebased)

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> 715fac2 (Featire specs)
=======
=======
          
      843. 
            1
>>>>>>> 752f0c0 (Featire specs)
=======
          
      844. 
            
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
      845. 
            1
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      846. 
            
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
      847. 
            1
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> df37394 (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 7a02bbe (Featire specs)
            Capybara.register_driver :headless_chrome do |app|
          
        848. 
        
        
      
        
        
<<<<<<< HEAD
>>>>>>> 5506bd0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0b43b18 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 5506bd0 (Featire specs)
          
      848. 
            1
<<<<<<< HEAD
=======
          
      849. 
            
>>>>>>> ae2a012 (Manifest_cache true)
=======
          
      850. 
            1
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      851. 
            1
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
          
      852. 
            1
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
          
      853. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
          
      854. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 5506bd0 (Featire specs)
=======
          
      855. 
            1
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
          
      856. 
            
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 15bff2e (Manifest_cache true)
=======
=======
          
      857. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a71befd (Manifest_cache true)
<<<<<<< HEAD
=======
          
      858. 
            
>>>>>>> fd6db03 (Manifest_cache true)
=======
          
      859. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
          
      860. 
            
>>>>>>> 49e8a6c (Rebased)
=======
          
      861. 
            1
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
          
      862. 
            
>>>>>>> 998f08d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 6c71f00 (Manifest_cache true)
=======
=======
          
      863. 
            1
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
          
      864. 
            1
>>>>>>> 1d59aaa (Fix)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 15c51b7 (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 563720e (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5e31aeb (Featire specs)
=======
=======
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 307f31f (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a71befd (Manifest_cache true)
=======
=======
>>>>>>> 2a25e4c (Featire specs)
>>>>>>> 216fe41 (Featire specs)
              client = Selenium::WebDriver::Remote::Http::Default.new
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
            Capybara.register_driver :headless_chrome do |app|
=======
            
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
            Capybara.register_driver :headless_chrome do |app|
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
=======
            Capybara.register_driver :headless_chrome do |app|
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
=======
            end
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
            end
>>>>>>> af057e3 (Featire specs)
=======
=======
            end
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
            end
=======
              config.javascript_driver = :headless_chrome
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
=======
=======
<<<<<<< HEAD
=======
            Capybara.register_driver :headless_chrome do |app|
<<<<<<< HEAD
>>>>>>> 0ed7f7c (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
=======
              client = Selenium::WebDriver::Remote::Http::Default.new
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
>>>>>>> 72b9cab (Featire specs)
=======
              client = Selenium::WebDriver::Remote::Http::Default.new
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> e055dd0 (Rebased)
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5e31aeb (Featire specs)
=======
=======
=======
            Capybara.register_driver :headless_chrome do |app|
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 51bc18c (Featire specs)
=======
=======
            Capybara.register_driver :headless_chrome do |app|
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 973ba8c (Featire specs)
=======
=======
=======
            Capybara.register_driver :headless_chrome do |app|
>>>>>>> 08edf50 (Featire specs)
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
=======
=======
=======
              client = Selenium::WebDriver::Remote::Http::Default.new
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
=======
=======
=======
              client = Selenium::WebDriver::Remote::Http::Default.new
>>>>>>> 4552227 (Featire specs)
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
=======
=======
              client = Selenium::WebDriver::Remote::Http::Default.new
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
=======
=======
=======
            Capybara.register_driver :headless_chrome do |app|
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
=======
=======
=======
            Capybara.register_driver :headless_chrome do |app|
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
=======
=======
=======
              client = Selenium::WebDriver::Remote::Http::Default.new
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
          
        865. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      865. 
=======
          
      866. 
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
=======
=======
          
      867. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
          
      868. 
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
>>>>>>> 64dceec (Manifest_cache true)
          
      869. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
          
      870. 
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 35d17b9 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      871. 
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 5b7749a (Fix)
          
      872. 
            
            

            

            end
          
        873. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      873. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      874. 
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
=======
          
      875. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      876. 
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> 64dceec (Manifest_cache true)
=======
          
      877. 
>>>>>>> 5b7749a (Fix)
            
            

            

            
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 4552227 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 5b7749a (Fix)
          
        878. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 64dceec (Manifest_cache true)
=======
>>>>>>> bd8bda4 (Manifest_cache true)
=======
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 0d6dd12 (Manifest_cache true)
          
      878. 
=======
=======
>>>>>>> 183b6c5 (Manifest_cache true)
          
      879. 
=======
          
      880. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      881. 
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
=======
          
      882. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      883. 
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> 64dceec (Manifest_cache true)
=======
          
      884. 
>>>>>>> 5b7749a (Fix)
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 563720e (Featire specs)
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
          
      885. 
            
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
          
      886. 
<<<<<<< HEAD
=======
=======
=======
          
      887. 
            
=======
          
      888. 
=======
          
      889. 
>>>>>>> e9f3851 (Manifest_cache true)
            1
>>>>>>> 872e675 (Fix)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
            
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
=======
            Capybara.register_driver :headless_chrome do |app|
>>>>>>> 307f31f (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
            Capybara.register_driver :headless_chrome do |app|
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> 4552227 (Featire specs)
=======
>>>>>>> 5b7749a (Fix)
            Capybara.register_driver :headless_chrome do |app|
>>>>>>> e3e66f3 (Featire specs)
          
        890. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
          
      890. 
>>>>>>> b9cc4e9 (Manifest_cache true)
>>>>>>> 563720e (Featire specs)
=======
          
      891. 
>>>>>>> 307f31f (Manifest_cache true)
=======
          
      892. 
>>>>>>> 0ed7f7c (Featire specs)
            1
=======
          
      893. 
            
>>>>>>> ae2a012 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> d782a28 (Manifest_cache true)
=======
>>>>>>> 35d17b9 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 64dceec (Manifest_cache true)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      894. 
            1
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
          
      895. 
            1
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      896. 
            1
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 307f31f (Manifest_cache true)
=======
>>>>>>> af057e3 (Featire specs)
=======
=======
          
      897. 
            1
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 416166f (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
=======
<<<<<<< HEAD
=======
=======
          
      898. 
            1
>>>>>>> 752f0c0 (Featire specs)
=======
          
      899. 
            
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
      900. 
            1
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      901. 
            
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
      902. 
            1
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
            

            

<<<<<<< HEAD
>>>>>>> df37394 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0676508 (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
          
      903. 
            1
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      904. 
            1
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
          
      905. 
            1
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
          
      906. 
            
>>>>>>> ae2a012 (Manifest_cache true)
=======
          
      907. 
            1
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      908. 
            1
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      909. 
            1
>>>>>>> 08edf50 (Featire specs)
=======
          
      910. 
            1
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> da3a9a3 (Featire specs)
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      911. 
            1
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
          
      912. 
            1
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      913. 
            
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
=======
          
      914. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
          
      915. 
            1
>>>>>>> b28889f (Fix)
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
          
      916. 
            
>>>>>>> fd6db03 (Manifest_cache true)
=======
          
      917. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
          
      918. 
            
>>>>>>> 49e8a6c (Rebased)
=======
          
      919. 
            1
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      920. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      921. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
          
      922. 
            1
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      923. 
            
>>>>>>> 998f08d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 64dceec (Manifest_cache true)
=======
=======
          
      924. 
            1
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      925. 
            1
>>>>>>> 5b7749a (Fix)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 563720e (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 307f31f (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0ed7f7c (Featire specs)
=======
=======
<<<<<<< HEAD
=======
=======
          
      926. 
            1
>>>>>>> 752f0c0 (Featire specs)
=======
          
      927. 
            
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
      928. 
            1
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      929. 
            
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
      930. 
            1
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
            

            

>>>>>>> df37394 (Featire specs)
>>>>>>> f92a45b (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
=======
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
              client = Selenium::WebDriver::Remote::Http::Default.new
=======
            Capybara.register_driver :headless_chrome do |app|
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
=======
=======
            Capybara.register_driver :headless_chrome do |app|
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
            Capybara.register_driver :headless_chrome do |app|
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
=======
=======
=======
            Capybara.register_driver :headless_chrome do |app|
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
=======
            Capybara.register_driver :headless_chrome do |app|
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
            Capybara.register_driver :headless_chrome do |app|
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 4e81ea2 (Featire specs)
=======
            Capybara.register_driver :headless_chrome do |app|
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
=======
              client = Selenium::WebDriver::Remote::Http::Default.new
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
=======
=======
              client = Selenium::WebDriver::Remote::Http::Default.new
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
=======
=======
=======
            Capybara.register_driver :headless_chrome do |app|
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
=======
=======
            Capybara.register_driver :headless_chrome do |app|
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
              client = Selenium::WebDriver::Remote::Http::Default.new
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
              client = Selenium::WebDriver::Remote::Http::Default.new
>>>>>>> 4552227 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
=======
              client = Selenium::WebDriver::Remote::Http::Default.new
>>>>>>> 5b7749a (Fix)
=======
>>>>>>> 6da9530 (Featire specs)
=======
=======
            Capybara.register_driver :headless_chrome do |app|
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
=======
=======
>>>>>>> 0676508 (Featire specs)
=======
            Capybara.register_driver :headless_chrome do |app|
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 659083f (Featire specs)
=======
=======
=======
            Capybara.register_driver :headless_chrome do |app|
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
            Capybara.register_driver :headless_chrome do |app|
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
=======
=======
=======
              client = Selenium::WebDriver::Remote::Http::Default.new
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
          
        931. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      931. 
            1
=======
>>>>>>> f92a45b (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> fb61c5a (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 7a08014b (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
>>>>>>> e055dd0 (Rebased)
=======
>>>>>>> 0c57e4e (Fix)
=======
>>>>>>> 3be4d14 (Manifest_cache true)
=======
>>>>>>> a71befd (Manifest_cache true)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 973ba8c (Featire specs)
=======
>>>>>>> 8181d13 (Featire specs)
=======
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 72b9cab (Featire specs)
=======
>>>>>>> c0159bf (Manifest_cache true)
=======
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 15c51b7 (Featire specs)
=======
>>>>>>> ca274ec (Manifest_cache true)
=======
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9e081dc (Fix)
>>>>>>> b3f2049 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 31d15e66 (Fix)
=======
=======
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4367ccb1 (Manifest_cache true)
=======
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
>>>>>>> b904d7ae (Featire specs)
=======
>>>>>>> 4fac471d (Manifest_cache true)
=======
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
=======
>>>>>>> ef483b6d (Fix)
>>>>>>> b28889f (Fix)
>>>>>>> fdab719f (Fix)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> e9f3851 (Manifest_cache true)
=======
>>>>>>> 307f31f (Manifest_cache true)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 64dceec (Manifest_cache true)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
=======
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 11792758 (Rebased)
=======
>>>>>>> b28889f (Fix)
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> e9f3851 (Manifest_cache true)
=======
>>>>>>> 307f31f (Manifest_cache true)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 15bff2e (Manifest_cache true)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> 6c71f00 (Manifest_cache true)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1d59aaa (Fix)
=======
<<<<<<< HEAD
=======
=======
>>>>>>> 715fac2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> 99dad91f (Fix)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 73f364d8 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f92a45b (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
=======
>>>>>>> e6fc67c7 (Featire specs)
=======
>>>>>>> 73f364d8 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
=======
>>>>>>> 715fac2 (Featire specs)
>>>>>>> fb61c5a (Featire specs)
>>>>>>> 73f364d8 (Featire specs)
          
      932. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 64dceec (Manifest_cache true)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 72b9cab (Featire specs)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
>>>>>>> c0159bf (Manifest_cache true)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> 15c51b7 (Featire specs)
=======
=======
>>>>>>> b15044a (Manifest_cache true)
>>>>>>> ca274ec (Manifest_cache true)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
          
      933. 
>>>>>>> 59d75f9 (Featire specs)
=======
          
      934. 
>>>>>>> 6da9530 (Featire specs)
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 973ba8c (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
          
      935. 
>>>>>>> 59d75f9 (Featire specs)
>>>>>>> 51bc18c (Featire specs)
            
=======
<<<<<<< HEAD
          
      936. 
            1
=======
          
      937. 
            
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
=======
>>>>>>> 715fac2 (Featire specs)
>>>>>>> fb61c5a (Featire specs)
=======
=======
          
      938. 
            1
>>>>>>> 752f0c0 (Featire specs)
=======
          
      939. 
            
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
      940. 
            1
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      941. 
            
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
      942. 
            1
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 9bfbd88 (Featire specs)
>>>>>>> ebcdce06 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 490b01d6 (Manifest_cache true)
              client = Selenium::WebDriver::Remote::Http::Default.new
<<<<<<< HEAD
=======
=======
            Capybara.register_driver :headless_chrome do |app|
>>>>>>> d0dc1f1 (Featire specs)
=======
            Capybara.register_driver :headless_chrome do |app|
>>>>>>> 752f0c0 (Featire specs)
=======
            Capybara.register_driver :headless_chrome do |app|
>>>>>>> 4e81ea2 (Featire specs)
=======
            Capybara.register_driver :headless_chrome do |app|
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
              client = Selenium::WebDriver::Remote::Http::Default.new
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 34509eee (Featire specs)
=======
              client = Selenium::WebDriver::Remote::Http::Default.new
>>>>>>> 75fa7e1b (Rebased)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
              client = Selenium::WebDriver::Remote::Http::Default.new
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
            Capybara.register_driver :headless_chrome do |app|
=======
            
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
            end
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
            end
>>>>>>> af057e3 (Featire specs)
=======
=======
            end
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
            end
=======
              config.javascript_driver = :headless_chrome
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
          
        943. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      943. 
=======
          
      944. 
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
=======
=======
          
      945. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
=======
          
      946. 
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
>>>>>>> 64dceec (Manifest_cache true)
          
      947. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
          
      948. 
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 35d17b9 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      949. 
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 5b7749a (Fix)
          
      950. 
            
            

            

            end
          
        951. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      951. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      952. 
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
=======
          
      953. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      954. 
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> 64dceec (Manifest_cache true)
=======
          
      955. 
>>>>>>> 5b7749a (Fix)
            
            

            

            
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 4552227 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 5b7749a (Fix)
          
        956. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 64dceec (Manifest_cache true)
=======
>>>>>>> bd8bda4 (Manifest_cache true)
=======
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 0d6dd12 (Manifest_cache true)
          
      956. 
=======
=======
>>>>>>> 183b6c5 (Manifest_cache true)
          
      957. 
=======
          
      958. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      959. 
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
=======
          
      960. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      961. 
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> 64dceec (Manifest_cache true)
=======
          
      962. 
>>>>>>> 5b7749a (Fix)
=======
          
      963. 
>>>>>>> ebcdce06 (Featire specs)
            1
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f92a45b (Featire specs)
=======
>>>>>>> fb61c5a (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
          
      964. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9bfbd88 (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 6da9530 (Featire specs)
=======
=======
          
      965. 
>>>>>>> 84003439 (Featire specs)
            
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      966. 
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> bb5c652 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
          
      967. 
>>>>>>> 84003439 (Featire specs)
            1
=======
          
      968. 
            
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
<<<<<<< HEAD
>>>>>>> 9a49b7b (Rebased)
>>>>>>> 84003439 (Featire specs)
=======
=======
          
      969. 
            1
>>>>>>> 752f0c0 (Featire specs)
=======
          
      970. 
            
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
      971. 
            1
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      972. 
            
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
      973. 
            1
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 9bfbd88 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 563720e (Featire specs)
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
          
      974. 
            
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
          
      975. 
<<<<<<< HEAD
=======
=======
=======
          
      976. 
            
=======
          
      977. 
=======
          
      978. 
>>>>>>> e9f3851 (Manifest_cache true)
            1
>>>>>>> 872e675 (Fix)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
            
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
=======
            Capybara.register_driver :headless_chrome do |app|
>>>>>>> 307f31f (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
            Capybara.register_driver :headless_chrome do |app|
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> 4552227 (Featire specs)
=======
>>>>>>> 5b7749a (Fix)
            Capybara.register_driver :headless_chrome do |app|
>>>>>>> e3e66f3 (Featire specs)
          
        979. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
          
      979. 
<<<<<<< HEAD
>>>>>>> b9cc4e9 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 563720e (Featire specs)
=======
          
      980. 
>>>>>>> 307f31f (Manifest_cache true)
=======
=======
=======
          
      981. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 37e48018 (Featire specs)
            1
=======
          
      982. 
            
>>>>>>> ae2a012 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> d782a28 (Manifest_cache true)
=======
>>>>>>> 35d17b9 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 64dceec (Manifest_cache true)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      983. 
            1
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
          
      984. 
            1
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      985. 
            1
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 307f31f (Manifest_cache true)
=======
>>>>>>> af057e3 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
=======
<<<<<<< HEAD
=======
=======
          
      986. 
            1
>>>>>>> 752f0c0 (Featire specs)
=======
          
      987. 
            
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
      988. 
            1
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      989. 
            
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
      990. 
            1
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> df37394 (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 7a02bbe (Featire specs)
            Capybara.register_driver :headless_chrome do |app|
          
        991. 
        
        
      
        
        
<<<<<<< HEAD
>>>>>>> 37e48018 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 37e48018 (Featire specs)
          
      991. 
            1
<<<<<<< HEAD
=======
          
      992. 
            1
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
          
      993. 
            1
>>>>>>> e3e66f3 (Featire specs)
=======
          
      994. 
            
>>>>>>> ae2a012 (Manifest_cache true)
=======
          
      995. 
            1
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      996. 
            1
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      997. 
            1
>>>>>>> 08edf50 (Featire specs)
=======
          
      998. 
            1
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
          
      999. 
            1
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
          
      1000. 
            1
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
=======
=======
          
      1001. 
            
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
=======
          
      1002. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
          
      1003. 
            
>>>>>>> fd6db03 (Manifest_cache true)
=======
          
      1004. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
          
      1005. 
            
>>>>>>> 49e8a6c (Rebased)
=======
          
      1006. 
            1
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      1007. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      1008. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
          
      1009. 
            1
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      1010. 
            
>>>>>>> 998f08d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 64dceec (Manifest_cache true)
=======
=======
          
      1011. 
            1
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      1012. 
            1
>>>>>>> 5b7749a (Fix)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 563720e (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 307f31f (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 37e48018 (Featire specs)
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> e3e66f3 (Featire specs)
              client = Selenium::WebDriver::Remote::Http::Default.new
=======
            Capybara.register_driver :headless_chrome do |app|
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
=======
            Capybara.register_driver :headless_chrome do |app|
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
            Capybara.register_driver :headless_chrome do |app|
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
=======
            Capybara.register_driver :headless_chrome do |app|
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
=======
            Capybara.register_driver :headless_chrome do |app|
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
            Capybara.register_driver :headless_chrome do |app|
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 4e81ea2 (Featire specs)
=======
            Capybara.register_driver :headless_chrome do |app|
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
              client = Selenium::WebDriver::Remote::Http::Default.new
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
              client = Selenium::WebDriver::Remote::Http::Default.new
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> 13fca83d (Rebased)
=======
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376a (Featire specs)
=======
=======
=======
=======
            Capybara.register_driver :headless_chrome do |app|
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0ea (Featire specs)
=======
=======
=======
            Capybara.register_driver :headless_chrome do |app|
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888bf (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
=======
              client = Selenium::WebDriver::Remote::Http::Default.new
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
              client = Selenium::WebDriver::Remote::Http::Default.new
>>>>>>> 4552227 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 393eff3b (Featire specs)
=======
=======
              client = Selenium::WebDriver::Remote::Http::Default.new
>>>>>>> 5b7749a (Fix)
>>>>>>> d9d85ca6 (Fix)
=======
=======
            Capybara.register_driver :headless_chrome do |app|
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 610b6138 (Featire specs)
=======
=======
              client = Selenium::WebDriver::Remote::Http::Default.new
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 37e48018 (Featire specs)
          
        1013. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      1013. 
            1
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 4f4ea3f9 (Featire specs)
=======
>>>>>>> c05ee511 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
>>>>>>> d8dd3b4a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
=======
>>>>>>> 74240509 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e59c273d (Manifest_cache true)
=======
>>>>>>> a1a479e2 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 393eff3b (Featire specs)
=======
>>>>>>> 7afa007b (Manifest_cache true)
=======
>>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d9d85ca6 (Fix)
>>>>>>> b28889f (Fix)
>>>>>>> 5a2009f1 (Fix)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> e9f3851 (Manifest_cache true)
=======
>>>>>>> 307f31f (Manifest_cache true)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 64dceec (Manifest_cache true)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 75fa7e1b (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5a2009f1 (Fix)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
=======
=======
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
          
      1014. 
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 64dceec (Manifest_cache true)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      1015. 
>>>>>>> 59d75f9 (Featire specs)
            
=======
          
      1016. 
            
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
<<<<<<< HEAD
          
      1017. 
            1
=======
          
      1018. 
            
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
          
      1019. 
            1
>>>>>>> 752f0c0 (Featire specs)
=======
          
      1020. 
            
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
      1021. 
            1
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      1022. 
            
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
      1023. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
>>>>>>> 9bfbd88 (Featire specs)
<<<<<<< HEAD
=======
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      1024. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
      1025. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 72b9cab (Featire specs)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bb5c652 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 6da9530 (Featire specs)
=======
          
      1026. 
            1
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
>>>>>>> 9a49b7b (Rebased)
=======
>>>>>>> 009401d (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
          
      1027. 
            
>>>>>>> b9cc4e9 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
>>>>>>> 78717cc (Manifest_cache true)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
          
      1028. 
            
=======
          
      1029. 
            
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
          
      1030. 
            
=======
<<<<<<< HEAD
>>>>>>> 0ed7f7c (Featire specs)
=======
          
      1031. 
            
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
>>>>>>> a71befd (Manifest_cache true)
<<<<<<< HEAD
          
      1032. 
            1
=======
          
      1033. 
            
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824ea7c9 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8a3779d4 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
>>>>>>> 6fa625b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 98beee2 (Manifest_cache true)
=======
=======
>>>>>>> 009401d (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
          
      1034. 
            1
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> ae409ca (Featire specs)
=======
=======
=======
          
      1035. 
            
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> c8cdb08 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 385b8df (Manifest_cache true)
=======
=======
=======
          
      1036. 
            1
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 379a979 (Featire specs)
=======
=======
=======
          
      1037. 
            
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 7bc7f9f (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 490b01d6 (Manifest_cache true)
=======
=======
=======
=======
          
      1038. 
            1
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 3723aad (Featire specs)
>>>>>>> adc21e0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
=======
=======
          
      1039. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 24b58e6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 84d0df6 (Manifest_cache true)
=======
=======
=======
          
      1040. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
=======
=======
=======
          
      1041. 
            1
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 4d90e3d (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
=======
=======
          
      1042. 
            
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 00f8b58 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 450f4e3 (Manifest_cache true)
=======
=======
=======
          
      1043. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
>>>>>>> 11792758 (Rebased)
=======
=======
          
      1044. 
            
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> aa3618b (Rebased)
<<<<<<< HEAD
>>>>>>> 75fa7e1b (Rebased)
=======
=======
>>>>>>> aa3618b (Rebased)
>>>>>>> 31d15e66 (Fix)
=======
=======
          
      1045. 
            1
>>>>>>> a5d032d (Fix)
>>>>>>> 160fb15 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
=======
=======
>>>>>>> d782a28 (Manifest_cache true)
>>>>>>> a304bcf (Manifest_cache true)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
          
      1046. 
            
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8cdb08 (Manifest_cache true)
=======
=======
>>>>>>> c4adab0 (Featire specs)
=======
          
      1047. 
            1
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
          
      1048. 
            
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 35d17b9 (Manifest_cache true)
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
          
      1049. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
=======
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
          
      1050. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 24b58e6 (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
      1051. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> e3e66f3 (Featire specs)
          
      1052. 
            1
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 8cbdfeb (Manifest_cache true)
>>>>>>> 9c0d812 (Featire specs)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
          
      1053. 
            
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 00f8b58 (Manifest_cache true)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
      1054. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      1055. 
            
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      1056. 
            1
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e5890c2 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 251144b4 (Manifest_cache true)
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> 13fca83d (Rebased)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> ae884b47 (Fix)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      1057. 
            
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b719333 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0341d6de (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> bf137e4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 21793167 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0ea (Featire specs)
=======
=======
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a304bcf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d245196f (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888bf (Featire specs)
=======
=======
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
>>>>>>> 35d17b9 (Manifest_cache true)
>>>>>>> 255dd8d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 304cd28a (Manifest_cache true)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 74240509 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e59c273d (Manifest_cache true)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a1a479e2 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
      1058. 
            1
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 393eff3b (Featire specs)
=======
=======
=======
=======
          
      1059. 
            
>>>>>>> 998f08d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 64dceec (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 7afa007b (Manifest_cache true)
=======
=======
=======
=======
          
      1060. 
            1
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
      1061. 
            1
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
>>>>>>> d9d85ca6 (Fix)
=======
=======
>>>>>>> 6da9530 (Featire specs)
=======
=======
>>>>>>> a71befd (Manifest_cache true)
=======
>>>>>>> 3cf8dd4 (Featire specs)
>>>>>>> 6fa625b (Manifest_cache true)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
          
      1062. 
            1
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> d782a28 (Manifest_cache true)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0ed7f7c (Featire specs)
=======
=======
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
          
      1063. 
            
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8cdb08 (Manifest_cache true)
=======
=======
>>>>>>> c4adab0 (Featire specs)
=======
          
      1064. 
            1
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
          
      1065. 
            
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 35d17b9 (Manifest_cache true)
=======
>>>>>>> ee5242b (Featire specs)
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
          
      1066. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
          
      1067. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 24b58e6 (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
      1068. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
=======
          
      1069. 
            1
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
          
      1070. 
            
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 00f8b58 (Manifest_cache true)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
      1071. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 49e8a6c (Rebased)
=======
          
      1072. 
            
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
          
      1073. 
            1
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> e18eb87 (Fix)
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> f92a45b (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
=======
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0e864a5 (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> e055dd0 (Rebased)
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 0c57e4e (Fix)
=======
=======
=======
          
      1074. 
            
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 3be4d14 (Manifest_cache true)
=======
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a71befd (Manifest_cache true)
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 51bc18c (Featire specs)
=======
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 551c6ab (Manifest_cache true)
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 973ba8c (Featire specs)
=======
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 35d17b9 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> fd310ed (Manifest_cache true)
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
=======
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> add330c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 42e9c2e (Manifest_cache true)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
=======
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 15bff2e (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> c0159bf (Manifest_cache true)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
      1075. 
            1
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
=======
=======
=======
=======
          
      1076. 
            
>>>>>>> 998f08d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 6c71f00 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> ca274ec (Manifest_cache true)
=======
=======
=======
=======
          
      1077. 
            1
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
      1078. 
            1
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 715fac2 (Featire specs)
<<<<<<< HEAD
>>>>>>> fb61c5a (Featire specs)
=======
=======
>>>>>>> 6fa625b (Manifest_cache true)
=======
=======
          
      1079. 
            1
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
=======
=======
=======
=======
          
      1080. 
            
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> c8cdb08 (Manifest_cache true)
=======
=======
          
      1081. 
            1
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
=======
          
      1082. 
            
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0b43b18 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1cce66c (Manifest_cache true)
=======
=======
=======
=======
          
      1083. 
            1
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
=======
=======
=======
=======
          
      1084. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 24b58e6 (Manifest_cache true)
=======
=======
          
      1085. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
          
      1086. 
            1
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> bdc24a1a (Rebased)
=======
>>>>>>> 53db2224 (Featire specs)
=======
>>>>>>> 7b22ad7e (Featire specs)
=======
>>>>>>> b97bb382 (Featire specs)
=======
>>>>>>> 4a2f2ad8 (Featire specs)
=======
>>>>>>> 21873de0 (Featire specs)
=======
>>>>>>> 392646b5 (Featire specs)
=======
>>>>>>> 1049b80c (Fix)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 0676508 (Featire specs)
>>>>>>> 448bef30 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
          
      1087. 
            1
>>>>>>> c7a726c5 (Rebased)
=======
=======
>>>>>>> 610b6138 (Featire specs)
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 7bc7f9f (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> c59d1a99 (Manifest_cache true)
=======
=======
=======
=======
          
      1088. 
            1
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 3723aad (Featire specs)
>>>>>>> adc21e0 (Featire specs)
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> 37e48018 (Featire specs)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
      1089. 
            1
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 4d90e3d (Featire specs)
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
>>>>>>> aa3618b (Rebased)
>>>>>>> 11792758 (Rebased)
=======
>>>>>>> 31d15e66 (Fix)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
=======
=======
>>>>>>> d782a28 (Manifest_cache true)
>>>>>>> a304bcf (Manifest_cache true)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
          
      1090. 
            
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8cdb08 (Manifest_cache true)
=======
=======
>>>>>>> c4adab0 (Featire specs)
=======
          
      1091. 
            1
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
          
      1092. 
            
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> e055dd0 (Rebased)
=======
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 973ba8c (Featire specs)
=======
>>>>>>> 8181d13 (Featire specs)
=======
>>>>>>> 72b9cab (Featire specs)
=======
>>>>>>> 15c51b7 (Featire specs)
=======
>>>>>>> 9e081dc (Fix)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 448bef30 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 904663c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 35d17b9 (Manifest_cache true)
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 53db2224 (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
              client.read_timeout = 150
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
          
      1093. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
=======
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
          
      1094. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 24b58e6 (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
      1095. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> e3e66f3 (Featire specs)
          
      1096. 
            1
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 8cbdfeb (Manifest_cache true)
>>>>>>> 9c0d812 (Featire specs)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
          
      1097. 
            
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 00f8b58 (Manifest_cache true)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
      1098. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      1099. 
            
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      1100. 
            1
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> fdab719f (Fix)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e5890c2 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> bc6bc8d2 (Rebased)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> 8288136d (Fix)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      1101. 
            
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b719333 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d34a0770 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> bf137e4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 824ea7c9 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a304bcf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> bd30d038 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> c12b71de (Featire specs)
=======
=======
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
>>>>>>> 35d17b9 (Manifest_cache true)
>>>>>>> 255dd8d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d4235040 (Manifest_cache true)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4367ccb1 (Manifest_cache true)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
      1102. 
            1
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b904d7ae (Featire specs)
=======
=======
=======
=======
          
      1103. 
            
>>>>>>> 998f08d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 64dceec (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4fac471d (Manifest_cache true)
=======
=======
=======
=======
          
      1104. 
            1
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
      1105. 
            1
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
>>>>>>> ef483b6d (Fix)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 365d41ed (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
>>>>>>> 13fca83d (Rebased)
=======
>>>>>>> f136376a (Featire specs)
=======
>>>>>>> 1ca9c0ea (Featire specs)
=======
>>>>>>> 4bf888bf (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 393eff3b (Featire specs)
=======
>>>>>>> d9d85ca6 (Fix)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> c12b71de (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> b904d7ae (Featire specs)
=======
>>>>>>> ef483b6d (Fix)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f136376a (Featire specs)
=======
=======
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1ca9c0ea (Featire specs)
=======
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> 4bf888bf (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> efd6af09 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 5507b42 (Featire specs)
>>>>>>> d52f9efe (Featire specs)
=======
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> ae07231a (Featire specs)
=======
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> c12b71de (Featire specs)
              client.read_timeout = 150
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
              client.read_timeout = 150
=======
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
>>>>>>> 36356d3 (Featire specs)
>>>>>>> 393eff3b (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> 37e48018 (Featire specs)
=======
              client.read_timeout = 150
=======
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 36356d3 (Featire specs)
>>>>>>> b904d7ae (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
>>>>>>> 5507b42 (Featire specs)
>>>>>>> 5e31aeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 53db2224 (Featire specs)
=======
=======
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> 973ba8c (Featire specs)
>>>>>>> b97bb382 (Featire specs)
              client.read_timeout = 150
=======
              client = Selenium::WebDriver::Remote::Http::Default.new
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
              client = Selenium::WebDriver::Remote::Http::Default.new
>>>>>>> 752f0c0 (Featire specs)
=======
              client = Selenium::WebDriver::Remote::Http::Default.new
>>>>>>> 4e81ea2 (Featire specs)
=======
              client = Selenium::WebDriver::Remote::Http::Default.new
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
              client.read_timeout = 150
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 34509eee (Featire specs)
=======
              client.read_timeout = 150
>>>>>>> 75fa7e1b (Rebased)
=======
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 53db2224 (Featire specs)
=======
>>>>>>> 7b22ad7e (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 365d41ed (Featire specs)
=======
>>>>>>> c05ee511 (Featire specs)
=======
>>>>>>> f136376a (Featire specs)
=======
>>>>>>> 1ca9c0ea (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
              client = Selenium::WebDriver::Remote::Http::Default.new
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
              client = Selenium::WebDriver::Remote::Http::Default.new
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 973ba8c (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
=======
              client = Selenium::WebDriver::Remote::Http::Default.new
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
=======
              client = Selenium::WebDriver::Remote::Http::Default.new
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
              client = Selenium::WebDriver::Remote::Http::Default.new
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 4e81ea2 (Featire specs)
=======
              client = Selenium::WebDriver::Remote::Http::Default.new
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
              client.read_timeout = 150
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
              client.read_timeout = 150
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> 13fca83d (Rebased)
=======
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376a (Featire specs)
=======
=======
=======
=======
              client = Selenium::WebDriver::Remote::Http::Default.new
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0ea (Featire specs)
=======
=======
=======
              client = Selenium::WebDriver::Remote::Http::Default.new
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888bf (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
=======
              client.read_timeout = 150
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
>>>>>>> b904d7ae (Featire specs)
=======
=======
              client.read_timeout = 150
>>>>>>> 4552227 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 393eff3b (Featire specs)
=======
=======
              client.read_timeout = 150
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
>>>>>>> d9d85ca6 (Fix)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
              client.read_timeout = 150
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 37e48018 (Featire specs)
=======
              client.read_timeout = 150
>>>>>>> 11792758 (Rebased)
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
              client = Selenium::WebDriver::Remote::Http::Default.new
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
=======
              client = Selenium::WebDriver::Remote::Http::Default.new
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
=======
              client = Selenium::WebDriver::Remote::Http::Default.new
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
              client = Selenium::WebDriver::Remote::Http::Default.new
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 4e81ea2 (Featire specs)
=======
              client = Selenium::WebDriver::Remote::Http::Default.new
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
              client.read_timeout = 150
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
              client.read_timeout = 150
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> bc6bc8d2 (Rebased)
=======
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> d52f9efe (Featire specs)
=======
=======
=======
=======
              client = Selenium::WebDriver::Remote::Http::Default.new
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
=======
              client = Selenium::WebDriver::Remote::Http::Default.new
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> c12b71de (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
=======
              client.read_timeout = 150
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> b904d7ae (Featire specs)
=======
=======
              client.read_timeout = 150
>>>>>>> 5b7749a (Fix)
>>>>>>> ef483b6d (Fix)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
              client = Selenium::WebDriver::Remote::Http::Default.new
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 0676508 (Featire specs)
=======
              client = Selenium::WebDriver::Remote::Http::Default.new
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
=======
              client = Selenium::WebDriver::Remote::Http::Default.new
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
              client = Selenium::WebDriver::Remote::Http::Default.new
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
=======
              client.read_timeout = 150
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
              client.read_timeout = 150
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5e31aeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 53db2224 (Featire specs)
=======
=======
=======
=======
              client = Selenium::WebDriver::Remote::Http::Default.new
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
              client = Selenium::WebDriver::Remote::Http::Default.new
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
=======
=======
              client = Selenium::WebDriver::Remote::Http::Default.new
>>>>>>> 08edf50 (Featire specs)
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
=======
=======
              client.read_timeout = 150
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
=======
=======
              client.read_timeout = 150
>>>>>>> 4552227 (Featire specs)
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 392646b5 (Featire specs)
=======
=======
=======
              client.read_timeout = 150
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
              client = Selenium::WebDriver::Remote::Http::Default.new
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
=======
              client = Selenium::WebDriver::Remote::Http::Default.new
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
=======
              client.read_timeout = 150
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
        1106. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> e6fc67c7 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 73f364d8 (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> d365be68 (Manifest_cache true)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
          
      1106. 
            1
=======
>>>>>>> f92a45b (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> fb61c5a (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> 1cce66c (Manifest_cache true)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5506bd0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 7a08014b (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 11792758 (Rebased)
=======
<<<<<<< HEAD
>>>>>>> 31d15e66 (Fix)
=======
=======
>>>>>>> fdab719f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 4f4ea3f9 (Featire specs)
=======
>>>>>>> c05ee511 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
>>>>>>> 0e864a5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> cc390719 (Manifest_cache true)
=======
=======
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
>>>>>>> 0c57e4e (Fix)
<<<<<<< HEAD
>>>>>>> 8887ba5b (Fix)
=======
=======
>>>>>>> 3be4d14 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1b8f36d8 (Manifest_cache true)
=======
=======
>>>>>>> a71befd (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8a3779d4 (Manifest_cache true)
=======
=======
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
>>>>>>> 551c6ab (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 56531f25 (Manifest_cache true)
=======
=======
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
>>>>>>> fd310ed (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 86229876 (Manifest_cache true)
=======
=======
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
>>>>>>> 42e9c2e (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 16ebb0ff (Manifest_cache true)
=======
=======
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0f24a043 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
>>>>>>> c0159bf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1d0f5cbf (Manifest_cache true)
=======
=======
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> b8c2784f (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 15c51b7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 392646b5 (Featire specs)
=======
=======
>>>>>>> ca274ec (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a56ba36d (Manifest_cache true)
=======
=======
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 9e081dc (Fix)
>>>>>>> 1049b80c (Fix)
>>>>>>> b3f2049 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
=======
>>>>>>> 74240509 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e59c273d (Manifest_cache true)
=======
>>>>>>> a1a479e2 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 393eff3b (Featire specs)
=======
>>>>>>> 7afa007b (Manifest_cache true)
=======
>>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d9d85ca6 (Fix)
=======
>>>>>>> 4367ccb1 (Manifest_cache true)
=======
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
>>>>>>> b904d7ae (Featire specs)
=======
>>>>>>> 4fac471d (Manifest_cache true)
=======
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
=======
>>>>>>> ef483b6d (Fix)
>>>>>>> b28889f (Fix)
>>>>>>> 5a2009f1 (Fix)
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 49e8a6c (Rebased)
=======
<<<<<<< HEAD
>>>>>>> 872e675 (Fix)
=======
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 35d17b9 (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 64dceec (Manifest_cache true)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
>>>>>>> b28889f (Fix)
>>>>>>> fdab719f (Fix)
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 49e8a6c (Rebased)
=======
<<<<<<< HEAD
>>>>>>> 872e675 (Fix)
=======
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 35d17b9 (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 64dceec (Manifest_cache true)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
=======
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 75fa7e1b (Rebased)
=======
>>>>>>> b28889f (Fix)
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 49e8a6c (Rebased)
=======
<<<<<<< HEAD
>>>>>>> 872e675 (Fix)
=======
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 35d17b9 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> add330c (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 15bff2e (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 6c71f00 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 1d59aaa (Fix)
=======
<<<<<<< HEAD
=======
=======
>>>>>>> 715fac2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 490b01d6 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5a2009f1 (Fix)
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> 99dad91f (Fix)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 73f364d8 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 7a08014b (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> f92a45b (Featire specs)
>>>>>>> e6fc67c7 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
>>>>>>> e6fc67c7 (Featire specs)
=======
>>>>>>> 73f364d8 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 7a08014b (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
=======
>>>>>>> 715fac2 (Featire specs)
>>>>>>> fb61c5a (Featire specs)
>>>>>>> 73f364d8 (Featire specs)
          
      1107. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 7b22ad7e (Featire specs)
=======
>>>>>>> 56531f25 (Manifest_cache true)
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 86229876 (Manifest_cache true)
=======
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
>>>>>>> b8c2784f (Fix book_spec decrease quantity and price)
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b904d7ae (Featire specs)
=======
>>>>>>> 392646b5 (Featire specs)
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4fac471d (Manifest_cache true)
=======
>>>>>>> a56ba36d (Manifest_cache true)
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price)
>>>>>>> 64dceec (Manifest_cache true)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ae07231a (Featire specs)
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> bd30d038 (Manifest_cache true)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> c12b71de (Featire specs)
=======
>>>>>>> d4235040 (Manifest_cache true)
=======
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 8cbdfeb (Manifest_cache true)
>>>>>>> 4367ccb1 (Manifest_cache true)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
>>>>>>> b904d7ae (Featire specs)
=======
>>>>>>> 64dceec (Manifest_cache true)
>>>>>>> 4fac471d (Manifest_cache true)
=======
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> fd310ed (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 86229876 (Manifest_cache true)
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
>>>>>>> 42e9c2e (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 16ebb0ff (Manifest_cache true)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0f24a043 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
>>>>>>> c0159bf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1d0f5cbf (Manifest_cache true)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> b8c2784f (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> 15c51b7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 392646b5 (Featire specs)
=======
=======
=======
>>>>>>> b15044a (Manifest_cache true)
>>>>>>> ca274ec (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a56ba36d (Manifest_cache true)
=======
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
>>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price)
          
      1108. 
>>>>>>> 59d75f9 (Featire specs)
=======
          
      1109. 
>>>>>>> 6da9530 (Featire specs)
=======
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 551c6ab (Manifest_cache true)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 973ba8c (Featire specs)
          
      1110. 
>>>>>>> 59d75f9 (Featire specs)
>>>>>>> 51bc18c (Featire specs)
            
=======
<<<<<<< HEAD
          
      1111. 
            1
=======
          
      1112. 
            
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
=======
>>>>>>> 715fac2 (Featire specs)
>>>>>>> fb61c5a (Featire specs)
=======
=======
          
      1113. 
            1
>>>>>>> 752f0c0 (Featire specs)
=======
          
      1114. 
            
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
      1115. 
            1
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      1116. 
            
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
      1117. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
>>>>>>> fb61c5a (Featire specs)
>>>>>>> 73f364d8 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 9bfbd88 (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
>>>>>>> 9bfbd88 (Featire specs)
<<<<<<< HEAD
=======
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 6da9530 (Featire specs)
=======
=======
          
      1118. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
      1119. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> bb5c652 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
          
      1120. 
            1
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
>>>>>>> 9a49b7b (Rebased)
=======
>>>>>>> 009401d (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
          
      1121. 
            
>>>>>>> b9cc4e9 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
>>>>>>> 78717cc (Manifest_cache true)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> e5890c2 (Manifest_cache true)
<<<<<<< HEAD
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> c8cdb08 (Manifest_cache true)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
>>>>>>> e5890c2 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 251144b4 (Manifest_cache true)
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> c59d1a99 (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
>>>>>>> e5890c2 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
          
      1122. 
            
=======
          
      1123. 
            
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> c8cdb08 (Manifest_cache true)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 86d584a (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 0b43b18 (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
          
      1124. 
            
=======
<<<<<<< HEAD
>>>>>>> 0ed7f7c (Featire specs)
=======
          
      1125. 
            
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
>>>>>>> a71befd (Manifest_cache true)
<<<<<<< HEAD
          
      1126. 
            1
=======
          
      1127. 
            
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6fa625b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 98beee2 (Manifest_cache true)
=======
=======
>>>>>>> 009401d (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
          
      1128. 
            1
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> ae409ca (Featire specs)
=======
=======
=======
          
      1129. 
            
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> c8cdb08 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 385b8df (Manifest_cache true)
=======
=======
=======
          
      1130. 
            1
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 379a979 (Featire specs)
=======
=======
=======
          
      1131. 
            
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 7bc7f9f (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 490b01d6 (Manifest_cache true)
=======
=======
=======
=======
          
      1132. 
            1
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 3723aad (Featire specs)
>>>>>>> adc21e0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
=======
=======
          
      1133. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 24b58e6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 84d0df6 (Manifest_cache true)
=======
=======
=======
          
      1134. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
=======
=======
=======
          
      1135. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 11792758 (Rebased)
=======
=======
          
      1136. 
            
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> aa3618b (Rebased)
<<<<<<< HEAD
>>>>>>> 75fa7e1b (Rebased)
=======
=======
>>>>>>> aa3618b (Rebased)
>>>>>>> 31d15e66 (Fix)
=======
=======
          
      1137. 
            1
>>>>>>> a5d032d (Fix)
>>>>>>> 160fb15 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
=======
=======
>>>>>>> d782a28 (Manifest_cache true)
>>>>>>> a304bcf (Manifest_cache true)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
          
      1138. 
            
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8cdb08 (Manifest_cache true)
=======
=======
>>>>>>> c4adab0 (Featire specs)
=======
          
      1139. 
            1
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
          
      1140. 
            
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 35d17b9 (Manifest_cache true)
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
          
      1141. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
=======
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
          
      1142. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 24b58e6 (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
      1143. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
      1144. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      1145. 
            
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      1146. 
            1
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e5890c2 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 251144b4 (Manifest_cache true)
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> 13fca83d (Rebased)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> ae884b47 (Fix)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      1147. 
            
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b719333 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0341d6de (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> bf137e4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 21793167 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0ea (Featire specs)
=======
=======
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a304bcf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d245196f (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888bf (Featire specs)
=======
=======
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
>>>>>>> 35d17b9 (Manifest_cache true)
>>>>>>> 255dd8d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 304cd28a (Manifest_cache true)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 74240509 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a1a479e2 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
      1148. 
            1
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
      1149. 
            1
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
>>>>>>> d9d85ca6 (Fix)
=======
          
      1150. 
            1
>>>>>>> c7a726c5 (Rebased)
=======
=======
>>>>>>> 610b6138 (Featire specs)
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 7bc7f9f (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> c59d1a99 (Manifest_cache true)
=======
=======
=======
=======
          
      1151. 
            1
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 3723aad (Featire specs)
>>>>>>> adc21e0 (Featire specs)
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
      1152. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
>>>>>>> aa3618b (Rebased)
>>>>>>> 11792758 (Rebased)
=======
>>>>>>> 31d15e66 (Fix)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
=======
=======
>>>>>>> d782a28 (Manifest_cache true)
>>>>>>> a304bcf (Manifest_cache true)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
          
      1153. 
            
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8cdb08 (Manifest_cache true)
=======
=======
>>>>>>> c4adab0 (Featire specs)
=======
          
      1154. 
            1
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
          
      1155. 
            
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 35d17b9 (Manifest_cache true)
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
          
      1156. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
=======
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
          
      1157. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 24b58e6 (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
      1158. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
      1159. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      1160. 
            
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      1161. 
            1
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> fdab719f (Fix)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e5890c2 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> bc6bc8d2 (Rebased)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> 8288136d (Fix)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      1162. 
            
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b719333 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d34a0770 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> bf137e4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 824ea7c9 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a304bcf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> bd30d038 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> c12b71de (Featire specs)
=======
=======
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
>>>>>>> 35d17b9 (Manifest_cache true)
>>>>>>> 255dd8d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d4235040 (Manifest_cache true)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
      1163. 
            1
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
      1164. 
            1
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
>>>>>>> ef483b6d (Fix)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
>>>>>>> a71befd (Manifest_cache true)
=======
>>>>>>> 3cf8dd4 (Featire specs)
>>>>>>> 6fa625b (Manifest_cache true)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
          
      1165. 
            1
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> d782a28 (Manifest_cache true)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
          
      1166. 
            
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8cdb08 (Manifest_cache true)
=======
=======
>>>>>>> c4adab0 (Featire specs)
=======
          
      1167. 
            1
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
          
      1168. 
            
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 35d17b9 (Manifest_cache true)
=======
>>>>>>> ee5242b (Featire specs)
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
          
      1169. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
          
      1170. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 24b58e6 (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
      1171. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
      1172. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 49e8a6c (Rebased)
=======
          
      1173. 
            
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
          
      1174. 
            1
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0e864a5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> cc390719 (Manifest_cache true)
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 0c57e4e (Fix)
<<<<<<< HEAD
>>>>>>> 8887ba5b (Fix)
=======
=======
=======
=======
          
      1175. 
            
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 3be4d14 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1b8f36d8 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a71befd (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8a3779d4 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 551c6ab (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 56531f25 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 35d17b9 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> fd310ed (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 86229876 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> add330c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 42e9c2e (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 16ebb0ff (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0f24a043 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> b8c2784f (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
=======
          
      1176. 
            1
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
      1177. 
            1
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 715fac2 (Featire specs)
<<<<<<< HEAD
>>>>>>> fb61c5a (Featire specs)
<<<<<<< HEAD
>>>>>>> 73f364d8 (Featire specs)
=======
=======
=======
>>>>>>> 6fa625b (Manifest_cache true)
=======
=======
          
      1178. 
            1
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
=======
=======
          
      1179. 
            
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> c8cdb08 (Manifest_cache true)
=======
=======
          
      1180. 
            1
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
=======
          
      1181. 
            
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0b43b18 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1cce66c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d365be68 (Manifest_cache true)
=======
=======
=======
=======
=======
          
      1182. 
            1
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 3723aad (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
>>>>>>> afa56d1 (Featire specs)
>>>>>>> e1ecabbe (Featire specs)
            

            

<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 311e9fa (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bf05825 (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> bf05825 (Featire specs)
=======
>>>>>>> c12b71de (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> e055dd0 (Rebased)
=======
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
>>>>>>> 5e31aeb (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 53db2224 (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
>>>>>>> 973ba8c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
>>>>>>> 8181d13 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
>>>>>>> 9e081dc (Fix)
=======
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> 53db2224 (Featire specs)
>>>>>>> 311e9fa (Rebased)
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> 7b22ad7e (Featire specs)
>>>>>>> 932dbec (Featire specs)
=======
=======
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c12b71de (Featire specs)
=======
>>>>>>> b97bb382 (Featire specs)
>>>>>>> 77d62af (Featire specs)
=======
=======
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5b7749a (Fix)
=======
<<<<<<< HEAD
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> 11792758 (Rebased)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 311e9fa (Rebased)
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> 932dbec (Featire specs)
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> c12b71de (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 5b7749a (Fix)
>>>>>>> ef483b6d (Fix)
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
>>>>>>> 49e8a6c (Rebased)
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
=======
>>>>>>> 5507b42 (Featire specs)
>>>>>>> 5e31aeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 53db2224 (Featire specs)
=======
=======
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
=======
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
=======
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
>>>>>>> afa56d1 (Featire specs)
>>>>>>> e1ecabbe (Featire specs)
              options = ::Selenium::WebDriver::Chrome::Options.new
=======
              client.read_timeout = 150
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
              client.read_timeout = 150
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
              client.read_timeout = 150
>>>>>>> 4e81ea2 (Featire specs)
=======
              client.read_timeout = 150
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
=======
=======
              client.read_timeout = 150
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
=======
=======
=======
              client.read_timeout = 150
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
              client.read_timeout = 150
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
=======
              client.read_timeout = 150
=======
>>>>>>> 6b6d1c2d (Featire specs)
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
              client.read_timeout = 150
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
              client.read_timeout = 150
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
=======
              client.read_timeout = 150
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
              client.read_timeout = 150
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
              client.read_timeout = 150
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
>>>>>>> afa56d1 (Featire specs)
>>>>>>> e1ecabbe (Featire specs)
          
        1183. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c59d1a99 (Manifest_cache true)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> 7a08014b (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> e6fc67c7 (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> cc390719 (Manifest_cache true)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> 73f364d8 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> d365be68 (Manifest_cache true)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> c51bf93 (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> e5890c2 (Manifest_cache true)
=======
>>>>>>> 9440753 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> c51bf93 (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> e5890c2 (Manifest_cache true)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
>>>>>>> f92a45b (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> 0e864a5 (Manifest_cache true)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> fb61c5a (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> 1cce66c (Manifest_cache true)
=======
>>>>>>> afa56d1 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 0b43b18 (Manifest_cache true)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 715fac2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f92a45b (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
>>>>>>> fb61c5a (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 659083f (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> df37394 (Featire specs)
>>>>>>> 7a08014b (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 73f364d8 (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 6da9530 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 715fac2 (Featire specs)
<<<<<<< HEAD
>>>>>>> fb61c5a (Featire specs)
<<<<<<< HEAD
>>>>>>> 73f364d8 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 2a25e4c (Featire specs)
>>>>>>> 216fe41 (Featire specs)
>>>>>>> f3d746cb (Featire specs)
          
      1183. 
            
=======
<<<<<<< HEAD
          
      1184. 
            1
=======
          
      1185. 
            
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
=======
          
      1186. 
            1
>>>>>>> 752f0c0 (Featire specs)
=======
          
      1187. 
            
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
      1188. 
            1
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      1189. 
            
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
      1190. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> e6fc67c7 (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> fb61c5a (Featire specs)
>>>>>>> 73f364d8 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 2a25e4c (Featire specs)
>>>>>>> 216fe41 (Featire specs)
>>>>>>> f3d746cb (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
=======
          
      1191. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
      1192. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
          
      1193. 
            1
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> c8cdb08 (Manifest_cache true)
=======
>>>>>>> b832d45 (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
=======
=======
>>>>>>> c59d1a99 (Manifest_cache true)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 4a0e3b6 (Manifest_cache true)
          
      1194. 
            
<<<<<<< HEAD
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
=======
          
      1195. 
            1
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
=======
          
      1196. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 24b58e6 (Manifest_cache true)
=======
=======
          
      1197. 
            1
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
=======
          
      1198. 
            
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 00f8b58 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
>>>>>>> 659083f (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
=======
<<<<<<< HEAD
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
=======
=======
>>>>>>> c8cdb08 (Manifest_cache true)
=======
>>>>>>> b832d45 (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 2ee03d3 (Featire specs)
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 4a0e3b6 (Manifest_cache true)
>>>>>>> 86d584a (Manifest_cache true)
=======
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 4a0e3b6 (Manifest_cache true)
>>>>>>> 0b43b18 (Manifest_cache true)
          
      1199. 
            
<<<<<<< HEAD
>>>>>>> b9cc4e9 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
=======
          
      1200. 
            1
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
          
      1201. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 24b58e6 (Manifest_cache true)
=======
=======
          
      1202. 
            1
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 715fac2 (Featire specs)
<<<<<<< HEAD
>>>>>>> fb61c5a (Featire specs)
<<<<<<< HEAD
>>>>>>> 73f364d8 (Featire specs)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
>>>>>>> afa56d1 (Featire specs)
>>>>>>> e1ecabbe (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 490b01d6 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 75fa7e1b (Rebased)
=======
=======
>>>>>>> bdc24a1a (Rebased)
=======
>>>>>>> 53db2224 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> aa7b40c (Manifest_cache true)
          
      1203. 
            
=======
          
      1204. 
            1
>>>>>>> 08edf50 (Featire specs)
=======
          
      1205. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
      1206. 
            1
>>>>>>> 7a02bbe (Featire specs)
=======
          
      1207. 
            
>>>>>>> fd6db03 (Manifest_cache true)
=======
          
      1208. 
            1
>>>>>>> 4552227 (Featire specs)
=======
          
      1209. 
            
>>>>>>> 998f08d (Manifest_cache true)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e59c273d (Manifest_cache true)
=======
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 393eff3b (Featire specs)
=======
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
>>>>>>> d9d85ca6 (Fix)
=======
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
>>>>>>> 11792758 (Rebased)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> aa7b40c (Manifest_cache true)
          
      1210. 
            
=======
          
      1211. 
            1
>>>>>>> 08edf50 (Featire specs)
=======
          
      1212. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
      1213. 
            1
>>>>>>> 7a02bbe (Featire specs)
=======
          
      1214. 
            
>>>>>>> fd6db03 (Manifest_cache true)
=======
          
      1215. 
            1
>>>>>>> 4552227 (Featire specs)
=======
          
      1216. 
            
>>>>>>> 998f08d (Manifest_cache true)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4367ccb1 (Manifest_cache true)
=======
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b904d7ae (Featire specs)
=======
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
>>>>>>> ef483b6d (Fix)
=======
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5e31aeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 53db2224 (Featire specs)
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> 8181d13 (Featire specs)
>>>>>>> 4a2f2ad8 (Featire specs)
              options = ::Selenium::WebDriver::Chrome::Options.new
=======
              client.read_timeout = 150
>>>>>>> d0dc1f1 (Featire specs)
=======
              client.read_timeout = 150
>>>>>>> 752f0c0 (Featire specs)
=======
              client.read_timeout = 150
>>>>>>> 4e81ea2 (Featire specs)
=======
              client.read_timeout = 150
>>>>>>> 08edf50 (Featire specs)
          
        1217. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 490b01d6 (Manifest_cache true)
=======
>>>>>>> 6e923b9d (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 75fa7e1b (Rebased)
=======
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e59c273d (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a1a479e2 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 393eff3b (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 7afa007b (Manifest_cache true)
=======
>>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d9d85ca6 (Fix)
=======
>>>>>>> ebcdce06 (Featire specs)
=======
>>>>>>> c59d1a99 (Manifest_cache true)
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 11792758 (Rebased)
=======
>>>>>>> 31d15e66 (Fix)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 4367ccb1 (Manifest_cache true)
=======
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
>>>>>>> b904d7ae (Featire specs)
=======
>>>>>>> 4fac471d (Manifest_cache true)
=======
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
=======
>>>>>>> ef483b6d (Fix)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> cc390719 (Manifest_cache true)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> bdc24a1a (Rebased)
=======
>>>>>>> 8887ba5b (Fix)
=======
>>>>>>> 1b8f36d8 (Manifest_cache true)
=======
>>>>>>> 7b22ad7e (Featire specs)
=======
>>>>>>> 56531f25 (Manifest_cache true)
=======
>>>>>>> b97bb382 (Featire specs)
=======
>>>>>>> 86229876 (Manifest_cache true)
=======
>>>>>>> 4a2f2ad8 (Featire specs)
=======
>>>>>>> 16ebb0ff (Manifest_cache true)
          
      1217. 
            1
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 98beee2 (Manifest_cache true)
=======
>>>>>>> 7bc7f9f (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 490b01d6 (Manifest_cache true)
=======
=======
>>>>>>> adc21e0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> 84d0df6 (Manifest_cache true)
=======
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4d90e3d (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> 450f4e3 (Manifest_cache true)
=======
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 74240509 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 8cbdfeb (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e59c273d (Manifest_cache true)
=======
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a1a479e2 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 393eff3b (Featire specs)
=======
=======
>>>>>>> 64dceec (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 7afa007b (Manifest_cache true)
=======
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
>>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price)
=======
>>>>>>> ebcdce06 (Featire specs)
=======
>>>>>>> c59d1a99 (Manifest_cache true)
=======
=======
>>>>>>> adc21e0 (Featire specs)
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4d90e3d (Featire specs)
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 8cbdfeb (Manifest_cache true)
>>>>>>> 4367ccb1 (Manifest_cache true)
=======
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 36356d3 (Featire specs)
>>>>>>> b904d7ae (Featire specs)
=======
=======
>>>>>>> 64dceec (Manifest_cache true)
>>>>>>> 4fac471d (Manifest_cache true)
=======
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
          
      1218. 
            
=======
<<<<<<< HEAD
          
      1219. 
            1
=======
          
      1220. 
            
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
=======
          
      1221. 
            1
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
=======
          
      1222. 
            
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
      1223. 
            1
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      1224. 
            
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
      1225. 
            1
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 9bfbd88 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 0ed7f7c (Featire specs)
=======
=======
          
      1226. 
            
<<<<<<< HEAD
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
      1227. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bb5c652 (Fix book_spec decrease quantity and price)
=======
=======
          
      1228. 
            1
>>>>>>> c033601 (Rebased)
>>>>>>> 9a49b7b (Rebased)
=======
          
      1229. 
            1
>>>>>>> 70fcacc (Featire specs)
=======
          
      1230. 
            
>>>>>>> 78717cc (Manifest_cache true)
=======
>>>>>>> 98beee2 (Manifest_cache true)
=======
=======
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 0ed7f7c (Featire specs)
=======
          
      1231. 
            1
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ae409ca (Featire specs)
=======
=======
          
      1232. 
            
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 385b8df (Manifest_cache true)
=======
=======
          
      1233. 
            1
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 379a979 (Featire specs)
=======
=======
          
      1234. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
          
      1235. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 11792758 (Rebased)
=======
          
      1236. 
            
>>>>>>> aa3618b (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 75fa7e1b (Rebased)
=======
=======
>>>>>>> 31d15e66 (Fix)
=======
          
      1237. 
            1
>>>>>>> 160fb15 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
=======
>>>>>>> 84003439 (Featire specs)
=======
          
      1238. 
            1
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
=======
=======
>>>>>>> c8cdb08 (Manifest_cache true)
=======
>>>>>>> b832d45 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 4a0e3b6 (Manifest_cache true)
>>>>>>> 86d584a (Manifest_cache true)
          
      1239. 
            
<<<<<<< HEAD
>>>>>>> b9cc4e9 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
=======
=======
          
      1240. 
            1
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
=======
          
      1241. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 24b58e6 (Manifest_cache true)
=======
=======
          
      1242. 
            1
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
>>>>>>> ebcdce06 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 11792758 (Rebased)
=======
>>>>>>> 31d15e66 (Fix)
=======
>>>>>>> 84003439 (Featire specs)
=======
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
=======
=======
>>>>>>> c8cdb08 (Manifest_cache true)
=======
>>>>>>> b832d45 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 4a0e3b6 (Manifest_cache true)
>>>>>>> 86d584a (Manifest_cache true)
          
      1243. 
            
<<<<<<< HEAD
>>>>>>> b9cc4e9 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
=======
=======
          
      1244. 
            1
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
=======
          
      1245. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 24b58e6 (Manifest_cache true)
=======
=======
          
      1246. 
            1
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
          
      1247. 
            1
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> b3f2049 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
>>>>>>> ecb02dbf (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
              options = ::Selenium::WebDriver::Chrome::Options.new
          
        1248. 
        
        
      
        
        
<<<<<<< HEAD
          
      1248. 
            
=======
          
      1249. 
            1
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      1250. 
            
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
          
      1251. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
          
      1252. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
      1253. 
            1
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 34509eee (Featire specs)
=======
>>>>>>> c59d1a99 (Manifest_cache true)
=======
>>>>>>> 610b6138 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 490b01d6 (Manifest_cache true)
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 34509eee (Featire specs)
=======
>>>>>>> 75fa7e1b (Rebased)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
=======
=======
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> bf05825 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
              options = ::Selenium::WebDriver::Chrome::Options.new
=======
              client.read_timeout = 150
>>>>>>> d0dc1f1 (Featire specs)
=======
              client.read_timeout = 150
>>>>>>> 752f0c0 (Featire specs)
=======
              client.read_timeout = 150
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
              client.read_timeout = 150
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
              client.read_timeout = 150
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 824bb2b (Featire specs)
=======
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
=======
=======
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> bf05825 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
              options = ::Selenium::WebDriver::Chrome::Options.new
=======
              client.read_timeout = 150
>>>>>>> d0dc1f1 (Featire specs)
=======
              client.read_timeout = 150
>>>>>>> 752f0c0 (Featire specs)
=======
              client.read_timeout = 150
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
              client.read_timeout = 150
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
              client.read_timeout = 150
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
          
        1254. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> aa7b40c (Manifest_cache true)
          
      1254. 
            
=======
          
      1255. 
            1
>>>>>>> 08edf50 (Featire specs)
=======
          
      1256. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
=======
=======
          
      1257. 
            1
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
            

            

<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
              options = ::Selenium::WebDriver::Chrome::Options.new
          
        1258. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      1258. 
            
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> 659083f (Featire specs)
=======
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> e055dd0 (Rebased)
=======
>>>>>>> 0c57e4e (Fix)
=======
>>>>>>> 3be4d14 (Manifest_cache true)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 551c6ab (Manifest_cache true)
=======
>>>>>>> 973ba8c (Featire specs)
=======
>>>>>>> fd310ed (Manifest_cache true)
=======
>>>>>>> 8181d13 (Featire specs)
=======
>>>>>>> 42e9c2e (Manifest_cache true)
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      1259. 
            
=======
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0e864a5 (Manifest_cache true)
          
      1260. 
            1
<<<<<<< HEAD
=======
=======
<<<<<<< HEAD
          
      1261. 
            1
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
          
      1262. 
            1
>>>>>>> e3e66f3 (Featire specs)
=======
          
      1263. 
            
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
=======
          
      1264. 
            1
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
=======
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d782a28 (Manifest_cache true)
=======
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd310ed (Manifest_cache true)
=======
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> add330c (Manifest_cache true)
=======
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 35d17b9 (Manifest_cache true)
<<<<<<< HEAD
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 51bc18c (Featire specs)
=======
=======
>>>>>>> d782a28 (Manifest_cache true)
>>>>>>> 551c6ab (Manifest_cache true)
=======
>>>>>>> 973ba8c (Featire specs)
=======
>>>>>>> fd310ed (Manifest_cache true)
          
      1265. 
            
<<<<<<< HEAD
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
      1266. 
            1
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
          
      1267. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
          
      1268. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e055dd0 (Rebased)
=======
          
      1269. 
            
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0c57e4e (Fix)
=======
          
      1270. 
            1
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 3be4d14 (Manifest_cache true)
=======
          
      1271. 
            
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8181d13 (Featire specs)
=======
=======
          
      1272. 
            1
<<<<<<< HEAD
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      1273. 
            1
>>>>>>> 5b7749a (Fix)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
>>>>>>> e055dd0 (Rebased)
=======
>>>>>>> 0c57e4e (Fix)
=======
>>>>>>> 3be4d14 (Manifest_cache true)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
=======
=======
=======
          
      1274. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> add330c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 42e9c2e (Manifest_cache true)
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
>>>>>>> 5506bd0 (Featire specs)
=======
=======
          
      1275. 
            1
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
=======
=======
=======
          
      1276. 
            
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 15bff2e (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> c0159bf (Manifest_cache true)
=======
=======
=======
          
      1277. 
            1
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
=======
=======
=======
          
      1278. 
            
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> 6c71f00 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> ca274ec (Manifest_cache true)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e055dd0 (Rebased)
=======
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> 8181d13 (Featire specs)
=======
>>>>>>> 72b9cab (Featire specs)
=======
>>>>>>> 15c51b7 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
>>>>>>> b3f2049 (Featire specs)
=======
          
      1279. 
            1
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
            

            

<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 5507b42 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
=======
=======
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
=======
=======
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
              options = ::Selenium::WebDriver::Chrome::Options.new
          
        1280. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      1280. 
            1
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      1281. 
            1
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
          
      1282. 
            
=======
          
      1283. 
            1
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      1284. 
            
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 86d584a (Manifest_cache true)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      1285. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      1286. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      1287. 
            1
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 5507b42 (Featire specs)
=======
          
      1288. 
            
>>>>>>> e9f3851 (Manifest_cache true)
=======
=======
>>>>>>> 35d17b9 (Manifest_cache true)
          
      1289. 
            
=======
<<<<<<< HEAD
          
      1290. 
            1
=======
          
      1291. 
            
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
=======
=======
          
      1292. 
            1
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
          
      1293. 
            
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
=======
=======
          
      1294. 
            1
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
=======
=======
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
=======
=======
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
              options = ::Selenium::WebDriver::Chrome::Options.new
          
        1295. 
        
        
      
        
        
<<<<<<< HEAD
          
      1295. 
            
=======
          
      1296. 
            1
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      1297. 
            
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
=======
=======
          
      1298. 
            1
>>>>>>> 08edf50 (Featire specs)
=======
          
      1299. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
      1300. 
            1
>>>>>>> 7a02bbe (Featire specs)
=======
          
      1301. 
            
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
=======
          
      1302. 
            1
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      1303. 
            
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> 64dceec (Manifest_cache true)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 4552227 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 5b7749a (Fix)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 6da9530 (Featire specs)
=======
=======
>>>>>>> 3be4d14 (Manifest_cache true)
=======
>>>>>>> a71befd (Manifest_cache true)
=======
>>>>>>> fd310ed (Manifest_cache true)
=======
>>>>>>> 8181d13 (Featire specs)
=======
>>>>>>> 42e9c2e (Manifest_cache true)
=======
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 72b9cab (Featire specs)
=======
>>>>>>> c0159bf (Manifest_cache true)
=======
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 15c51b7 (Featire specs)
=======
>>>>>>> ca274ec (Manifest_cache true)
=======
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9e081dc (Fix)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 1cce66c (Manifest_cache true)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
          
      1304. 
            1
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      1305. 
            1
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      1306. 
            
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 86d584a (Manifest_cache true)
=======
=======
          
      1307. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
=======
          
      1308. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
      1309. 
            1
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 5507b42 (Featire specs)
=======
          
      1310. 
            
>>>>>>> e9f3851 (Manifest_cache true)
=======
=======
>>>>>>> 35d17b9 (Manifest_cache true)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> add330c (Manifest_cache true)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 15bff2e (Manifest_cache true)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> 6c71f00 (Manifest_cache true)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0b43b18 (Manifest_cache true)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
          
      1311. 
            
=======
<<<<<<< HEAD
          
      1312. 
            1
=======
          
      1313. 
            
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
=======
=======
          
      1314. 
            1
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
          
      1315. 
            
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
=======
=======
          
      1316. 
            1
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
          
      1317. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
          
      1318. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
          
      1319. 
            1
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
          
      1320. 
            1
>>>>>>> 1d59aaa (Fix)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0ed7f7c (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 659083f (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> e055dd0 (Rebased)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5e31aeb (Featire specs)
=======
=======
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
              options = ::Selenium::WebDriver::Chrome::Options.new
          
        1321. 
        
        
      
        
        
<<<<<<< HEAD
          
      1321. 
            
=======
          
      1322. 
            1
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      1323. 
            
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
      1324. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
=======
          
      1325. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
      1326. 
            1
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
=======
          
      1327. 
=======
>>>>>>> 5506bd0 (Featire specs)
            
>>>>>>> fd6db03 (Manifest_cache true)
=======
          
      1328. 
            1
>>>>>>> 4552227 (Featire specs)
=======
          
      1329. 
            
<<<<<<< HEAD
>>>>>>> 998f08d (Manifest_cache true)
=======
          
      1330. 
            1
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
=======
          
      1331. 
            1
=======

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 0b43b18 (Manifest_cache true)
=======
>>>>>>> 2ee03d3 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 2ee03d3 (Featire specs)
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 51bc18c (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 973ba8c (Featire specs)
=======
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
=======
=======
=======
>>>>>>> 4552227 (Featire specs)
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
=======
=======
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
              options = ::Selenium::WebDriver::Chrome::Options.new
          
        1332. 
        
        
      
        
        
          
      1332. 
            1
            

            

>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
=======
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
              options.headless!
>>>>>>> 84003439 (Featire specs)
          
        1333. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> aa7b40c (Manifest_cache true)
          
      1333. 
            
=======
          
      1334. 
            1
>>>>>>> 08edf50 (Featire specs)
=======
          
      1335. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
=======
=======
          
      1336. 
            1
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
            

            

<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
              options = ::Selenium::WebDriver::Chrome::Options.new
          
        1337. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      1337. 
            
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
          
      1338. 
            1
<<<<<<< HEAD
=======
=======
<<<<<<< HEAD
          
      1339. 
            1
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
          
      1340. 
            1
>>>>>>> e3e66f3 (Featire specs)
=======
          
      1341. 
            
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
=======
          
      1342. 
            1
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> d782a28 (Manifest_cache true)
=======
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 35d17b9 (Manifest_cache true)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
          
      1343. 
            
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
      1344. 
            1
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      1345. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
          
      1346. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      1347. 
            
>>>>>>> 49e8a6c (Rebased)
=======
          
      1348. 
            1
>>>>>>> 872e675 (Fix)
=======
          
      1349. 
            
>>>>>>> e9f3851 (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      1350. 
            1
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      1351. 
            1
>>>>>>> 5b7749a (Fix)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
=======
          
      1352. 
            1
>>>>>>> b28889f (Fix)
=======
>>>>>>> 563720e (Featire specs)
            

            

<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
              options = ::Selenium::WebDriver::Chrome::Options.new
          
        1353. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      1353. 
            1
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      1354. 
            1
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
          
      1355. 
            
=======
          
      1356. 
            1
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      1357. 
            
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 86d584a (Manifest_cache true)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      1358. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      1359. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      1360. 
            1
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 5507b42 (Featire specs)
=======
          
      1361. 
            
>>>>>>> e9f3851 (Manifest_cache true)
=======
=======
>>>>>>> 35d17b9 (Manifest_cache true)
          
      1362. 
            
=======
<<<<<<< HEAD
          
      1363. 
            1
=======
          
      1364. 
            
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
=======
=======
          
      1365. 
            1
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
          
      1366. 
            
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
=======
=======
          
      1367. 
            1
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> 13fca83d (Rebased)
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376a (Featire specs)
=======
=======
=======
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
              options = ::Selenium::WebDriver::Chrome::Options.new
          
        1368. 
        
        
      
        
        
<<<<<<< HEAD
          
      1368. 
            
=======
          
      1369. 
            1
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      1370. 
            
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
=======
=======
          
      1371. 
            1
>>>>>>> 08edf50 (Featire specs)
=======
          
      1372. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
      1373. 
            1
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
=======
          
      1374. 
            
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
=======
          
      1375. 
            1
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      1376. 
            
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> 64dceec (Manifest_cache true)
=======
          
      1377. 
            1
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> 37e48018 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0ea (Featire specs)
=======
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888bf (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
>>>>>>> 4552227 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 393eff3b (Featire specs)
=======
=======
>>>>>>> 5b7749a (Fix)
>>>>>>> d9d85ca6 (Fix)
=======
=======
<<<<<<< HEAD
>>>>>>> 37e48018 (Featire specs)
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 11792758 (Rebased)
              options.headless!
          
        1378. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 1cce66c (Manifest_cache true)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> fb61c5a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 11792758 (Rebased)
=======
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 490b01d6 (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
=======
>>>>>>> c51bf93 (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> e5890c2 (Manifest_cache true)
=======
>>>>>>> 9440753 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> e9f3851 (Manifest_cache true)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> d782a28 (Manifest_cache true)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 35d17b9 (Manifest_cache true)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> e9f3851 (Manifest_cache true)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> d782a28 (Manifest_cache true)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 35d17b9 (Manifest_cache true)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> add330c (Manifest_cache true)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 15bff2e (Manifest_cache true)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> 6c71f00 (Manifest_cache true)
=======
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> 0b43b18 (Manifest_cache true)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e5890c2 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 251144b4 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888bf (Featire specs)
=======
=======
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 35d17b9 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 255dd8d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 304cd28a (Manifest_cache true)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e59c273d (Manifest_cache true)
=======
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 393eff3b (Featire specs)
=======
=======
=======
>>>>>>> b15044a (Manifest_cache true)
>>>>>>> 64dceec (Manifest_cache true)
>>>>>>> 7afa007b (Manifest_cache true)
=======
>>>>>>> ebcdce06 (Featire specs)
=======
>>>>>>> c59d1a99 (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
=======
>>>>>>> c51bf93 (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> e5890c2 (Manifest_cache true)
=======
>>>>>>> 9440753 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> e9f3851 (Manifest_cache true)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> d782a28 (Manifest_cache true)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 35d17b9 (Manifest_cache true)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e5890c2 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> c12b71de (Featire specs)
=======
=======
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
>>>>>>> 35d17b9 (Manifest_cache true)
>>>>>>> 255dd8d (Manifest_cache true)
>>>>>>> d4235040 (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4367ccb1 (Manifest_cache true)
=======
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b904d7ae (Featire specs)
=======
=======
=======
>>>>>>> b15044a (Manifest_cache true)
>>>>>>> 64dceec (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4fac471d (Manifest_cache true)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
>>>>>>> f92a45b (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> 0e864a5 (Manifest_cache true)
=======
>>>>>>> 416166f (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0e864a5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> cc390719 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
>>>>>>> 35d17b9 (Manifest_cache true)
>>>>>>> fd310ed (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 86229876 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> add330c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 42e9c2e (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 16ebb0ff (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 15bff2e (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> c0159bf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1d0f5cbf (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 392646b5 (Featire specs)
=======
=======
=======
=======
>>>>>>> b15044a (Manifest_cache true)
>>>>>>> 6c71f00 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> ca274ec (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a56ba36d (Manifest_cache true)
=======
=======
=======
>>>>>>> 715fac2 (Featire specs)
<<<<<<< HEAD
>>>>>>> fb61c5a (Featire specs)
<<<<<<< HEAD
>>>>>>> 73f364d8 (Featire specs)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 0b43b18 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1cce66c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d365be68 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      1378. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      1379. 
=======
          
      1380. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
      1381. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
      1382. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> fb61c5a (Featire specs)
=======
>>>>>>> 1cce66c (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 86d584a (Manifest_cache true)
>>>>>>> 0e864a5 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 490b01d6 (Manifest_cache true)
=======
=======
>>>>>>> 251144b4 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84809242 (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 1d6a89b5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 86d584a (Manifest_cache true)
>>>>>>> e5890c2 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 35d17b9 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 86229876 (Manifest_cache true)
=======
>>>>>>> 73f364d8 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> ebcdce06 (Featire specs)
=======
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> c12b71de (Featire specs)
=======
>>>>>>> d4235040 (Manifest_cache true)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
>>>>>>> fd310ed (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 86229876 (Manifest_cache true)
=======
=======
>>>>>>> 715fac2 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> fb61c5a (Featire specs)
<<<<<<< HEAD
>>>>>>> 73f364d8 (Featire specs)
=======
=======
>>>>>>> 0b43b18 (Manifest_cache true)
=======
>>>>>>> 1cce66c (Manifest_cache true)
>>>>>>> d365be68 (Manifest_cache true)
          
      1383. 
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
      1384. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9440753 (Featire specs)
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> 4a2f2ad8 (Featire specs)
=======
>>>>>>> 73f364d8 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
>>>>>>> fb61c5a (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
=======
>>>>>>> add330c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 42e9c2e (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 16ebb0ff (Manifest_cache true)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
>>>>>>> afa56d1 (Featire specs)
>>>>>>> e1ecabbe (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 4f4ea3f9 (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 7a08014b (Featire specs)
=======
>>>>>>> e6fc67c7 (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> f92a45b (Featire specs)
=======
          
      1385. 
>>>>>>> c033601 (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
=======
>>>>>>> 216fe41 (Featire specs)
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
<<<<<<< HEAD
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> c8cdb08 (Manifest_cache true)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> b3f2049 (Featire specs)
>>>>>>> 3cf8dd4 (Featire specs)
>>>>>>> aa4361fd (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
>>>>>>> 448bef30 (Featire specs)
>>>>>>> b3f2049 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
=======
=======
=======
>>>>>>> 3be4d14 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 3be4d14 (Manifest_cache true)
=======
>>>>>>> 1b8f36d8 (Manifest_cache true)
>>>>>>> c8cdb08 (Manifest_cache true)
=======
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 1b8f36d8 (Manifest_cache true)
=======
>>>>>>> 7b22ad7e (Featire specs)
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b719333 (Manifest_cache true)
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
=======
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
>>>>>>> d782a28 (Manifest_cache true)
>>>>>>> a304bcf (Manifest_cache true)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
=======
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> c8cdb08 (Manifest_cache true)
=======
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b719333 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d34a0770 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> bd30d038 (Manifest_cache true)
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
>>>>>>> d782a28 (Manifest_cache true)
>>>>>>> a304bcf (Manifest_cache true)
>>>>>>> bd30d038 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> b3f2049 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
>>>>>>> e9f3851 (Manifest_cache true)
>>>>>>> 3be4d14 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1b8f36d8 (Manifest_cache true)
=======
=======
>>>>>>> e9f3851 (Manifest_cache true)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
>>>>>>> d782a28 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 551c6ab (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 56531f25 (Manifest_cache true)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
>>>>>>> 3cf8dd4 (Featire specs)
>>>>>>> aa4361fd (Featire specs)
          
      1386. 
=======
          
      1387. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
>>>>>>> a636fda (Featire specs)
>>>>>>> 3be4d14 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d34a0770 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
>>>>>>> b719333 (Manifest_cache true)
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> d34a0770 (Manifest_cache true)
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
=======
          
      1388. 
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
=======
>>>>>>> 3e9f99d (Featire specs)
>>>>>>> 3cf8dd4 (Featire specs)
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
=======
          
      1389. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 56531f25 (Manifest_cache true)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> bd30d038 (Manifest_cache true)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
>>>>>>> 551c6ab (Manifest_cache true)
>>>>>>> 56531f25 (Manifest_cache true)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
=======
=======
          
      1390. 
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> c8cdb08 (Manifest_cache true)
=======
>>>>>>> b832d45 (Featire specs)
=======
=======
          
      1391. 
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 490b01d6 (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
=======
          
      1392. 
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 24b58e6 (Manifest_cache true)
=======
=======
          
      1393. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e59c273d (Manifest_cache true)
=======
>>>>>>> 4367ccb1 (Manifest_cache true)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
=======
          
      1394. 
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 00f8b58 (Manifest_cache true)
=======
          
      1395. 
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
>>>>>>> 75fa7e1b (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
=======
=======
>>>>>>> bd30d038 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
>>>>>>> a304bcf (Manifest_cache true)
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> b832d45 (Featire specs)
=======
=======
          
      1396. 
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e5890c2 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 251144b4 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
=======
          
      1397. 
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 24b58e6 (Manifest_cache true)
=======
=======
          
      1398. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 15bff2e (Manifest_cache true)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
=======
=======
          
      1399. 
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 00f8b58 (Manifest_cache true)
=======
          
      1400. 
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> 13fca83d (Rebased)
=======
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
          
      1401. 
=======
          
      1402. 
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376a (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      1403. 
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b719333 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0341d6de (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      1404. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0ea (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      1405. 
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a304bcf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d245196f (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888bf (Featire specs)
=======
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      1406. 
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 35d17b9 (Manifest_cache true)
>>>>>>> 255dd8d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 304cd28a (Manifest_cache true)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
=======
          
      1407. 
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
=======
=======
          
      1408. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
=======
          
      1409. 
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e59c273d (Manifest_cache true)
=======
=======
=======
=======
          
      1410. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 393eff3b (Featire specs)
=======
=======
=======
=======
          
      1411. 
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 64dceec (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 7afa007b (Manifest_cache true)
=======
=======
=======
          
      1412. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
>>>>>>> d9d85ca6 (Fix)
=======
          
      1413. 
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> ebcdce06 (Featire specs)
=======
>>>>>>> c59d1a99 (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 11792758 (Rebased)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> b832d45 (Featire specs)
=======
=======
          
      1414. 
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e5890c2 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
=======
          
      1415. 
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 24b58e6 (Manifest_cache true)
=======
=======
          
      1416. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
=======
          
      1417. 
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 00f8b58 (Manifest_cache true)
=======
          
      1418. 
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> bc6bc8d2 (Rebased)
=======
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
          
      1419. 
=======
          
      1420. 
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> d52f9efe (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      1421. 
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b719333 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d34a0770 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      1422. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      1423. 
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a304bcf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> bd30d038 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> c12b71de (Featire specs)
=======
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      1424. 
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 35d17b9 (Manifest_cache true)
>>>>>>> 255dd8d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d4235040 (Manifest_cache true)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
=======
          
      1425. 
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
=======
=======
          
      1426. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
=======
          
      1427. 
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4367ccb1 (Manifest_cache true)
=======
=======
=======
=======
          
      1428. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b904d7ae (Featire specs)
=======
=======
=======
=======
          
      1429. 
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 64dceec (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4fac471d (Manifest_cache true)
=======
=======
=======
          
      1430. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
>>>>>>> ef483b6d (Fix)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> b3f2049 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> df37394 (Featire specs)
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> b832d45 (Featire specs)
=======
=======
          
      1431. 
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0e864a5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> cc390719 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
=======
=======
          
      1432. 
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 24b58e6 (Manifest_cache true)
=======
=======
          
      1433. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
=======
=======
          
      1434. 
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 00f8b58 (Manifest_cache true)
=======
          
      1435. 
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
=======
=======
          
      1436. 
=======
          
      1437. 
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5e31aeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 53db2224 (Featire specs)
=======
=======
=======
=======
=======
          
      1438. 
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 3be4d14 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1b8f36d8 (Manifest_cache true)
=======
=======
=======
=======
=======
          
      1439. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
=======
=======
          
      1440. 
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 551c6ab (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 56531f25 (Manifest_cache true)
=======
=======
=======
<<<<<<< HEAD
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
=======
=======
>>>>>>> b832d45 (Featire specs)
>>>>>>> 0b43b18 (Manifest_cache true)
=======
=======
          
      1441. 
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 35d17b9 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> fd310ed (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 86229876 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
=======
=======
=======
          
      1442. 
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> add330c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 42e9c2e (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 16ebb0ff (Manifest_cache true)
=======
=======
=======
=======
=======
          
      1443. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
=======
=======
=======
          
      1444. 
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 15bff2e (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> c0159bf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1d0f5cbf (Manifest_cache true)
=======
=======
=======
=======
=======
          
      1445. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 392646b5 (Featire specs)
=======
=======
=======
=======
=======
          
      1446. 
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 6c71f00 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> ca274ec (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a56ba36d (Manifest_cache true)
=======
=======
=======
=======
          
      1447. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 715fac2 (Featire specs)
<<<<<<< HEAD
>>>>>>> fb61c5a (Featire specs)
<<<<<<< HEAD
>>>>>>> 73f364d8 (Featire specs)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
>>>>>>> 0b43b18 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1cce66c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d365be68 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            
            

            

            
          
        1448. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ebcdce06 (Featire specs)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> e6fc67c7 (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 73f364d8 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> d365be68 (Manifest_cache true)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
          
      1448. 
            1
=======
>>>>>>> f92a45b (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> fb61c5a (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> 1cce66c (Manifest_cache true)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 0b43b18 (Manifest_cache true)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> ebcdce06 (Featire specs)
=======
>>>>>>> c59d1a99 (Manifest_cache true)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 11792758 (Rebased)
=======
>>>>>>> 31d15e66 (Fix)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 4f4ea3f9 (Featire specs)
=======
>>>>>>> 365d41ed (Featire specs)
=======
>>>>>>> c05ee511 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> 0e864a5 (Manifest_cache true)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
>>>>>>> e055dd0 (Rebased)
=======
>>>>>>> 0c57e4e (Fix)
=======
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> 3be4d14 (Manifest_cache true)
=======
>>>>>>> a71befd (Manifest_cache true)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 551c6ab (Manifest_cache true)
=======
>>>>>>> 973ba8c (Featire specs)
=======
>>>>>>> fd310ed (Manifest_cache true)
=======
>>>>>>> 8181d13 (Featire specs)
=======
>>>>>>> 42e9c2e (Manifest_cache true)
=======
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 72b9cab (Featire specs)
=======
>>>>>>> c0159bf (Manifest_cache true)
=======
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 15c51b7 (Featire specs)
=======
>>>>>>> ca274ec (Manifest_cache true)
=======
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9e081dc (Fix)
>>>>>>> b3f2049 (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
=======
>>>>>>> 74240509 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e59c273d (Manifest_cache true)
=======
>>>>>>> a1a479e2 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 393eff3b (Featire specs)
=======
>>>>>>> 7afa007b (Manifest_cache true)
=======
>>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d9d85ca6 (Fix)
=======
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4367ccb1 (Manifest_cache true)
=======
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
>>>>>>> b904d7ae (Featire specs)
=======
>>>>>>> 4fac471d (Manifest_cache true)
=======
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
=======
>>>>>>> ef483b6d (Fix)
>>>>>>> b28889f (Fix)
>>>>>>> 5a2009f1 (Fix)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> e9f3851 (Manifest_cache true)
=======
>>>>>>> 307f31f (Manifest_cache true)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> d782a28 (Manifest_cache true)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 35d17b9 (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 64dceec (Manifest_cache true)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> e9f3851 (Manifest_cache true)
=======
>>>>>>> 307f31f (Manifest_cache true)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> d782a28 (Manifest_cache true)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 35d17b9 (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 64dceec (Manifest_cache true)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
=======
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 75fa7e1b (Rebased)
=======
>>>>>>> b28889f (Fix)
>>>>>>> fdab719f (Fix)
=======
>>>>>>> b28889f (Fix)
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> e9f3851 (Manifest_cache true)
=======
>>>>>>> 307f31f (Manifest_cache true)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> d782a28 (Manifest_cache true)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 35d17b9 (Manifest_cache true)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> add330c (Manifest_cache true)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 15bff2e (Manifest_cache true)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> 6c71f00 (Manifest_cache true)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1d59aaa (Fix)
=======
<<<<<<< HEAD
=======
=======
>>>>>>> 715fac2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 490b01d6 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5a2009f1 (Fix)
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> 99dad91f (Fix)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 73f364d8 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 7a08014b (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> f92a45b (Featire specs)
>>>>>>> e6fc67c7 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
>>>>>>> e6fc67c7 (Featire specs)
=======
>>>>>>> 73f364d8 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> ebcdce06 (Featire specs)
=======
>>>>>>> 7a08014b (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
=======
>>>>>>> 715fac2 (Featire specs)
>>>>>>> fb61c5a (Featire specs)
>>>>>>> 73f364d8 (Featire specs)
          
      1449. 
            
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 659083f (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
>>>>>>> ecb02dbf (Featire specs)
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> cc390719 (Manifest_cache true)
=======
=======
>>>>>>> 3cf8dd4 (Featire specs)
>>>>>>> aa4361fd (Featire specs)
=======
=======
>>>>>>> e5890c2 (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> e5890c2 (Manifest_cache true)
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 0e864a5 (Manifest_cache true)
>>>>>>> cc390719 (Manifest_cache true)
>>>>>>> c8cdb08 (Manifest_cache true)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> cc390719 (Manifest_cache true)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> d365be68 (Manifest_cache true)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> c59d1a99 (Manifest_cache true)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 6fa625b (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 490b01d6 (Manifest_cache true)
=======
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
>>>>>>> e5890c2 (Manifest_cache true)
=======
=======
>>>>>>> 1cce66c (Manifest_cache true)
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 86d584a (Manifest_cache true)
=======
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
=======
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ae07231a (Featire specs)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a304bcf (Manifest_cache true)
=======
=======
>>>>>>> c4adab0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> bf05825 (Featire specs)
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 35d17b9 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 255dd8d (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> bd30d038 (Manifest_cache true)
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
=======
>>>>>>> c12b71de (Featire specs)
>>>>>>> d782a28 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a304bcf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> bd30d038 (Manifest_cache true)
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
=======
=======
>>>>>>> d4235040 (Manifest_cache true)
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> c12b71de (Featire specs)
=======
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> 35d17b9 (Manifest_cache true)
>>>>>>> 255dd8d (Manifest_cache true)
>>>>>>> d4235040 (Manifest_cache true)
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 551c6ab (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 56531f25 (Manifest_cache true)
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> 35d17b9 (Manifest_cache true)
>>>>>>> fd310ed (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 86229876 (Manifest_cache true)
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> add330c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 42e9c2e (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 16ebb0ff (Manifest_cache true)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0f24a043 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 3b03895 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 15bff2e (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> c0159bf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1d0f5cbf (Manifest_cache true)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> b8c2784f (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 94841b5 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 392646b5 (Featire specs)
=======
=======
=======
>>>>>>> b15044a (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 6c71f00 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> ca274ec (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a56ba36d (Manifest_cache true)
=======
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 0b43b18 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1cce66c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d365be68 (Manifest_cache true)
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 6fa625b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376a (Featire specs)
=======
=======
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b719333 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0341d6de (Manifest_cache true)
=======
=======
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
=======
>>>>>>> 3b03895 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 94841b5 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> b15044a (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 64dceec (Manifest_cache true)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 6fa625b (Manifest_cache true)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
>>>>>>> bf137e4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 21793167 (Manifest_cache true)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> ebcdce06 (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
>>>>>>> e5890c2 (Manifest_cache true)
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
=======
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 6fa625b (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> d52f9efe (Featire specs)
=======
=======
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b719333 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d34a0770 (Manifest_cache true)
=======
=======
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
=======
>>>>>>> 3b03895 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 94841b5 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> b15044a (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 64dceec (Manifest_cache true)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 6fa625b (Manifest_cache true)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
>>>>>>> bf137e4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 824ea7c9 (Manifest_cache true)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
>>>>>>> 0e864a5 (Manifest_cache true)
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> 51bc18c (Featire specs)
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 6fa625b (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5e31aeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 53db2224 (Featire specs)
=======
=======
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 3be4d14 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1b8f36d8 (Manifest_cache true)
=======
=======
=======
=======
=======
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 307f31f (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a71befd (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8a3779d4 (Manifest_cache true)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
>>>>>>> 216fe41 (Featire specs)
>>>>>>> f3d746cb (Featire specs)
          
      1450. 
            1
=======
          
      1451. 
            
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
=======
=======
=======
>>>>>>> d34a0770 (Manifest_cache true)
<<<<<<< HEAD
=======
=======
>>>>>>> 3be4d14 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 1b8f36d8 (Manifest_cache true)
=======
>>>>>>> 8a3779d4 (Manifest_cache true)
>>>>>>> b719333 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0341d6de (Manifest_cache true)
=======
=======
>>>>>>> b719333 (Manifest_cache true)
>>>>>>> 824ea7c9 (Manifest_cache true)
=======
=======
>>>>>>> 307f31f (Manifest_cache true)
>>>>>>> bf137e4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 21793167 (Manifest_cache true)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> ebcdce06 (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> b719333 (Manifest_cache true)
>>>>>>> d34a0770 (Manifest_cache true)
=======
>>>>>>> 824ea7c9 (Manifest_cache true)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 3be4d14 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1b8f36d8 (Manifest_cache true)
=======
=======
=======
>>>>>>> 307f31f (Manifest_cache true)
>>>>>>> a71befd (Manifest_cache true)
>>>>>>> 8a3779d4 (Manifest_cache true)
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
=======
          
      1452. 
            1
>>>>>>> 752f0c0 (Featire specs)
=======
          
      1453. 
            
>>>>>>> bd8bda4 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
>>>>>>> d4235040 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> cc390719 (Manifest_cache true)
=======
>>>>>>> 86229876 (Manifest_cache true)
=======
>>>>>>> 73f364d8 (Featire specs)
=======
>>>>>>> d365be68 (Manifest_cache true)
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> e5890c2 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 255dd8d (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> ebcdce06 (Featire specs)
=======
>>>>>>> c59d1a99 (Manifest_cache true)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
=======
>>>>>>> 255dd8d (Manifest_cache true)
>>>>>>> d4235040 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0e864a5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> cc390719 (Manifest_cache true)
=======
=======
>>>>>>> fd310ed (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 86229876 (Manifest_cache true)
=======
=======
=======
>>>>>>> 715fac2 (Featire specs)
>>>>>>> fb61c5a (Featire specs)
<<<<<<< HEAD
>>>>>>> 73f364d8 (Featire specs)
=======
=======
=======
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> 0b43b18 (Manifest_cache true)
>>>>>>> 1cce66c (Manifest_cache true)
>>>>>>> d365be68 (Manifest_cache true)
          
      1454. 
            1
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      1455. 
            
>>>>>>> aa7b40c (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
>>>>>>> fb61c5a (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> add330c (Manifest_cache true)
>>>>>>> 42e9c2e (Manifest_cache true)
>>>>>>> 16ebb0ff (Manifest_cache true)
          
      1456. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> f92a45b (Featire specs)
>>>>>>> e6fc67c7 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 9bfbd88 (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
>>>>>>> 9bfbd88 (Featire specs)
<<<<<<< HEAD
=======
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 6da9530 (Featire specs)
=======
=======
          
      1457. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
      1458. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> 74240509 (Fix book_spec decrease quantity and price)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 74240509 (Fix book_spec decrease quantity and price)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0f24a043 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bb5c652 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 824bb2b (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
          
      1459. 
            1
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
>>>>>>> 9a49b7b (Rebased)
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> e18eb87 (Fix)
=======
=======
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> b9cc4e9 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 78717cc (Manifest_cache true)
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> b9cc4e9 (Manifest_cache true)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> b9cc4e9 (Manifest_cache true)
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> 99dad91f (Fix)
>>>>>>> 02a399d (Manifest_cache true)
=======
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6fa625b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 98beee2 (Manifest_cache true)
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
          
      1460. 
            
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8cdb08 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 385b8df (Manifest_cache true)
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 551c6ab (Manifest_cache true)
>>>>>>> 6fa625b (Manifest_cache true)
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
          
      1461. 
            
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> c8cdb08 (Manifest_cache true)
>>>>>>> e18eb87 (Fix)
=======
          
      1462. 
            
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
=======
>>>>>>> 251144b4 (Manifest_cache true)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> cc390719 (Manifest_cache true)
=======
>>>>>>> d365be68 (Manifest_cache true)
>>>>>>> 7bc7f9f (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 490b01d6 (Manifest_cache true)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> e5890c2 (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> 0e864a5 (Manifest_cache true)
=======
>>>>>>> 1cce66c (Manifest_cache true)
=======
          
      1463. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 24b58e6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84d0df6 (Manifest_cache true)
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> c8da2e3 (Fix)
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3b03895 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> e18eb87 (Fix)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> 72b9cab (Featire specs)
          
      1464. 
            1
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
=======
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> 1d0f5cbf (Manifest_cache true)
=======
>>>>>>> 8cbdfeb (Manifest_cache true)
>>>>>>> e59c273d (Manifest_cache true)
=======
=======
>>>>>>> 8cbdfeb (Manifest_cache true)
>>>>>>> 4367ccb1 (Manifest_cache true)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
>>>>>>> 4d90e3d (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
=======
=======
>>>>>>> da3a9a3 (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
=======
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
>>>>>>> c0159bf (Manifest_cache true)
          
      1465. 
            
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 00f8b58 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 450f4e3 (Manifest_cache true)
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
      1466. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49e8a6c (Rebased)
>>>>>>> 311e9fa (Rebased)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> c0159bf (Manifest_cache true)
=======
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
>>>>>>> 00f8b58 (Manifest_cache true)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
      1467. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e18eb87 (Fix)
=======
<<<<<<< HEAD
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
=======
>>>>>>> 49e8a6c (Rebased)
>>>>>>> e055dd0 (Rebased)
=======
          
      1468. 
            
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> aa3618b (Rebased)
<<<<<<< HEAD
>>>>>>> 75fa7e1b (Rebased)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 311e9fa (Rebased)
=======
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> e055dd0 (Rebased)
=======
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 0c57e4e (Fix)
=======
          
      1469. 
            1
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 160fb15 (Fix)
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> b719333 (Manifest_cache true)
=======
>>>>>>> 0c57e4e (Fix)
=======
>>>>>>> 3be4d14 (Manifest_cache true)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5890c2 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 251144b4 (Manifest_cache true)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> 13fca83d (Rebased)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> ae884b47 (Fix)
=======
=======
=======
>>>>>>> 3be4d14 (Manifest_cache true)
=======
=======
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b719333 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0341d6de (Manifest_cache true)
=======
=======
=======
=======
=======
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> e9f3851 (Manifest_cache true)
=======
=======
>>>>>>> a71befd (Manifest_cache true)
>>>>>>> 02a399d (Manifest_cache true)
=======
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> bf137e4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 21793167 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a304bcf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d245196f (Manifest_cache true)
=======
=======
=======
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
>>>>>>> e3e66f3 (Featire specs)
=======
          
      1470. 
            
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 35d17b9 (Manifest_cache true)
>>>>>>> 255dd8d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 304cd28a (Manifest_cache true)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      1471. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 74240509 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e59c273d (Manifest_cache true)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a1a479e2 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
      1472. 
            1
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 393eff3b (Featire specs)
=======
=======
=======
=======
>>>>>>> fdab719f (Fix)
=======
          
      1473. 
            
<<<<<<< HEAD
>>>>>>> 998f08d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 64dceec (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 7afa007b (Manifest_cache true)
=======
=======
=======
=======
          
      1474. 
            1
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
      1475. 
            1
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
>>>>>>> d9d85ca6 (Fix)
=======
          
      1476. 
            1
>>>>>>> c7a726c5 (Rebased)
=======
          
      1477. 
            1
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 9bfbd88 (Featire specs)
>>>>>>> ebcdce06 (Featire specs)
=======
>>>>>>> bd8bda4 (Manifest_cache true)
=======
>>>>>>> bd30d038 (Manifest_cache true)
>>>>>>> c8cdb08 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 385b8df (Manifest_cache true)
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      1478. 
            
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fdab719f (Fix)
=======
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 7bc7f9f (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> c59d1a99 (Manifest_cache true)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> e5890c2 (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      1479. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 24b58e6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84d0df6 (Manifest_cache true)
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> c8da2e3 (Fix)
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
          
      1480. 
            1
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fdab719f (Fix)
>>>>>>> 4d90e3d (Featire specs)
<<<<<<< HEAD
>>>>>>> 37e48018 (Featire specs)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
          
      1481. 
            
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 00f8b58 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 450f4e3 (Manifest_cache true)
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
      1482. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49e8a6c (Rebased)
>>>>>>> 311e9fa (Rebased)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      1483. 
            
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> aa3618b (Rebased)
<<<<<<< HEAD
>>>>>>> 11792758 (Rebased)
=======
=======
=======
>>>>>>> c8da2e3 (Fix)
=======
>>>>>>> 311e9fa (Rebased)
=======
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      1484. 
            1
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 160fb15 (Fix)
<<<<<<< HEAD
>>>>>>> 31d15e66 (Fix)
=======
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
=======
>>>>>>> 557c1b8 (Fix)
=======
>>>>>>> b719333 (Manifest_cache true)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> fdab719f (Fix)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e5890c2 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> bc6bc8d2 (Rebased)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> 8288136d (Fix)
=======
=======
=======
=======
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b719333 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d34a0770 (Manifest_cache true)
=======
=======
=======
=======
=======
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 02a399d (Manifest_cache true)
=======
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> bf137e4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 824ea7c9 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a304bcf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> bd30d038 (Manifest_cache true)
=======
=======
=======
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
>>>>>>> e3e66f3 (Featire specs)
=======
          
      1485. 
            
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 35d17b9 (Manifest_cache true)
>>>>>>> 255dd8d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d4235040 (Manifest_cache true)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      1486. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4367ccb1 (Manifest_cache true)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
      1487. 
            1
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b904d7ae (Featire specs)
=======
=======
=======
=======
          
      1488. 
            
>>>>>>> 998f08d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 64dceec (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4fac471d (Manifest_cache true)
=======
=======
=======
=======
          
      1489. 
            1
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
      1490. 
            1
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
>>>>>>> ef483b6d (Fix)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> b28889f (Fix)
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
>>>>>>> 0e864a5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> cc390719 (Manifest_cache true)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 49e8a6c (Rebased)
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 0c57e4e (Fix)
<<<<<<< HEAD
>>>>>>> 8887ba5b (Fix)
=======
=======
>>>>>>> e9f3851 (Manifest_cache true)
>>>>>>> 3be4d14 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1b8f36d8 (Manifest_cache true)
=======
=======
>>>>>>> 307f31f (Manifest_cache true)
>>>>>>> a71befd (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8a3779d4 (Manifest_cache true)
=======
=======
>>>>>>> 307f31f (Manifest_cache true)
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 551c6ab (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 56531f25 (Manifest_cache true)
=======
=======
=======
=======
          
      1491. 
            
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 35d17b9 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> fd310ed (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 86229876 (Manifest_cache true)
=======
=======
=======
=======
          
      1492. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> add330c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 42e9c2e (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 16ebb0ff (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0f24a043 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 15bff2e (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> c0159bf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1d0f5cbf (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> b8c2784f (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
=======
          
      1493. 
            1
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 392646b5 (Featire specs)
=======
=======
=======
=======
=======
          
      1494. 
            
>>>>>>> 998f08d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 6c71f00 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> ca274ec (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a56ba36d (Manifest_cache true)
=======
=======
=======
=======
=======
          
      1495. 
            1
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
      1496. 
            1
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
=======
          
      1497. 
            1
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 715fac2 (Featire specs)
<<<<<<< HEAD
>>>>>>> fb61c5a (Featire specs)
<<<<<<< HEAD
>>>>>>> 73f364d8 (Featire specs)
=======
=======
=======
>>>>>>> 0b43b18 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1cce66c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d365be68 (Manifest_cache true)
=======
=======
=======
          
      1498. 
            1
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            

            

              options.add_argument('--no-sandbox')
          
        1499. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ebcdce06 (Featire specs)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> e6fc67c7 (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> cc390719 (Manifest_cache true)
=======
>>>>>>> 73f364d8 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> d365be68 (Manifest_cache true)
=======
>>>>>>> 2612be03 (Featire specs)
          
      1499. 
            1
=======
>>>>>>> f92a45b (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
>>>>>>> 0e864a5 (Manifest_cache true)
=======
>>>>>>> fb61c5a (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 1cce66c (Manifest_cache true)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 0b43b18 (Manifest_cache true)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
>>>>>>> e055dd0 (Rebased)
=======
>>>>>>> 0c57e4e (Fix)
=======
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> 3be4d14 (Manifest_cache true)
=======
>>>>>>> a71befd (Manifest_cache true)
=======
>>>>>>> 551c6ab (Manifest_cache true)
=======
>>>>>>> fd310ed (Manifest_cache true)
=======
>>>>>>> 42e9c2e (Manifest_cache true)
=======
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 72b9cab (Featire specs)
=======
>>>>>>> c0159bf (Manifest_cache true)
=======
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 15c51b7 (Featire specs)
=======
>>>>>>> ca274ec (Manifest_cache true)
=======
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9e081dc (Fix)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> c59d1a99 (Manifest_cache true)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 4f4ea3f9 (Featire specs)
=======
>>>>>>> 365d41ed (Featire specs)
=======
>>>>>>> 251144b4 (Manifest_cache true)
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
>>>>>>> 5a2009f1 (Fix)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> e9f3851 (Manifest_cache true)
=======
>>>>>>> 307f31f (Manifest_cache true)
=======
>>>>>>> d782a28 (Manifest_cache true)
=======
>>>>>>> 35d17b9 (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 64dceec (Manifest_cache true)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> e9f3851 (Manifest_cache true)
=======
>>>>>>> 307f31f (Manifest_cache true)
=======
>>>>>>> d782a28 (Manifest_cache true)
=======
>>>>>>> 35d17b9 (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 64dceec (Manifest_cache true)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
=======
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> e9f3851 (Manifest_cache true)
=======
>>>>>>> 307f31f (Manifest_cache true)
=======
>>>>>>> d782a28 (Manifest_cache true)
=======
>>>>>>> 35d17b9 (Manifest_cache true)
=======
>>>>>>> add330c (Manifest_cache true)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 15bff2e (Manifest_cache true)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> 6c71f00 (Manifest_cache true)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1d59aaa (Fix)
=======
<<<<<<< HEAD
=======
=======
>>>>>>> 715fac2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 75fa7e1b (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 490b01d6 (Manifest_cache true)
=======
>>>>>>> ebcdce06 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 73f364d8 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
          
      1500. 
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
>>>>>>> 7a08014b (Featire specs)
=======
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> e6fc67c7 (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
>>>>>>> 715fac2 (Featire specs)
>>>>>>> fb61c5a (Featire specs)
>>>>>>> 73f364d8 (Featire specs)
          
      1501. 
            
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
>>>>>>> b719333 (Manifest_cache true)
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> e5890c2 (Manifest_cache true)
=======
=======
>>>>>>> c8cdb08 (Manifest_cache true)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> 37e48018 (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 6fa625b (Manifest_cache true)
>>>>>>> c59d1a99 (Manifest_cache true)
          
      1502. 
            1
=======
          
      1503. 
            
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
=======
          
      1504. 
            1
>>>>>>> 752f0c0 (Featire specs)
=======
          
      1505. 
            
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
      1506. 
            1
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      1507. 
            
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
      1508. 
            1
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 9bfbd88 (Featire specs)
>>>>>>> ebcdce06 (Featire specs)
            
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
>>>>>>> 216fe41 (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 3be4d14 (Manifest_cache true)
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
>>>>>>> b719333 (Manifest_cache true)
=======
>>>>>>> e9f3851 (Manifest_cache true)
>>>>>>> 3be4d14 (Manifest_cache true)
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> e5890c2 (Manifest_cache true)
=======
=======
>>>>>>> c8cdb08 (Manifest_cache true)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
<<<<<<< HEAD
>>>>>>> 251144b4 (Manifest_cache true)
=======
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> da3a9a3 (Featire specs)
>>>>>>> b5ac3004 (Featire specs)
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> d8abfed3 (Featire specs)
=======
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> e5890c2 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 251144b4 (Manifest_cache true)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 56531f25 (Manifest_cache true)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a304bcf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d245196f (Manifest_cache true)
=======
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> 35d17b9 (Manifest_cache true)
>>>>>>> 255dd8d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 304cd28a (Manifest_cache true)
=======
=======
>>>>>>> bd30d038 (Manifest_cache true)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a304bcf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> bd30d038 (Manifest_cache true)
=======
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> 35d17b9 (Manifest_cache true)
>>>>>>> 255dd8d (Manifest_cache true)
>>>>>>> d4235040 (Manifest_cache true)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 551c6ab (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 56531f25 (Manifest_cache true)
=======
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 35d17b9 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> fd310ed (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 86229876 (Manifest_cache true)
=======
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> add330c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 42e9c2e (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 16ebb0ff (Manifest_cache true)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0f24a043 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 3b03895 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 15bff2e (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> c0159bf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1d0f5cbf (Manifest_cache true)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> b8c2784f (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 94841b5 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 392646b5 (Featire specs)
=======
=======
=======
>>>>>>> b15044a (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 6c71f00 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> ca274ec (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a56ba36d (Manifest_cache true)
=======
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
>>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 6fa625b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 490b01d6 (Manifest_cache true)
=======
=======
>>>>>>> 251144b4 (Manifest_cache true)
=======
>>>>>>> f136376a (Featire specs)
=======
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> 53db2224 (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
>>>>>>> e5890c2 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 251144b4 (Manifest_cache true)
=======
=======
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> a636fda (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> 0e864a5 (Manifest_cache true)
=======
=======
>>>>>>> c8cdb08 (Manifest_cache true)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
=======
>>>>>>> 3b03895 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 94841b5 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> b15044a (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 64dceec (Manifest_cache true)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0e864a5 (Manifest_cache true)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 6fa625b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
>>>>>>> 5e31aeb (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> a636fda (Featire specs)
=======
=======
>>>>>>> c8cdb08 (Manifest_cache true)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
=======
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
=======
>>>>>>> 3b03895 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 94841b5 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> b15044a (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 64dceec (Manifest_cache true)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> e5890c2 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 6fa625b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376a (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
=======
>>>>>>> a71befd (Manifest_cache true)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> bf137e4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 21793167 (Manifest_cache true)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
=======
=======
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> a636fda (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
>>>>>>> e5890c2 (Manifest_cache true)
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> d52f9efe (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
>>>>>>> bf137e4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 824ea7c9 (Manifest_cache true)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> a636fda (Featire specs)
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
>>>>>>> 0e864a5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> cc390719 (Manifest_cache true)
=======
=======
>>>>>>> 5507b42 (Featire specs)
>>>>>>> 5e31aeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 53db2224 (Featire specs)
=======
=======
>>>>>>> 307f31f (Manifest_cache true)
>>>>>>> a71befd (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8a3779d4 (Manifest_cache true)
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
=======
>>>>>>> c8cdb08 (Manifest_cache true)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
<<<<<<< HEAD
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 6fa625b (Manifest_cache true)
>>>>>>> 0b43b18 (Manifest_cache true)
>>>>>>> 1cce66c (Manifest_cache true)
>>>>>>> d365be68 (Manifest_cache true)
          
      1509. 
            1
=======
          
      1510. 
            
<<<<<<< HEAD
>>>>>>> ae2a012 (Manifest_cache true)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> bf137e4 (Manifest_cache true)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> a71befd (Manifest_cache true)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bf137e4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 21793167 (Manifest_cache true)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1ca9c0ea (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> bf137e4 (Manifest_cache true)
=======
>>>>>>> 77d62af (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> bf137e4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 824ea7c9 (Manifest_cache true)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
>>>>>>> 77d62af (Featire specs)
>>>>>>> ae07231a (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
>>>>>>> a71befd (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8a3779d4 (Manifest_cache true)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
>>>>>>> 3cf8dd4 (Featire specs)
>>>>>>> aa4361fd (Featire specs)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
=======
          
      1511. 
            1
>>>>>>> 752f0c0 (Featire specs)
=======
          
      1512. 
            
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
      1513. 
            1
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      1514. 
            
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
      1515. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
>>>>>>> fb61c5a (Featire specs)
>>>>>>> 73f364d8 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 9bfbd88 (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
>>>>>>> 9bfbd88 (Featire specs)
<<<<<<< HEAD
=======
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 6da9530 (Featire specs)
=======
=======
          
      1516. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
      1517. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 21873de0 (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bb5c652 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 824bb2b (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
          
      1518. 
            1
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
>>>>>>> 9a49b7b (Rebased)
=======
=======
>>>>>>> 6fa625b (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 98beee2 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 6fa625b (Manifest_cache true)
>>>>>>> 009401d (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
>>>>>>> 6fa625b (Manifest_cache true)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 6fa625b (Manifest_cache true)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
          
      1519. 
            1
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> ae409ca (Featire specs)
=======
=======
=======
          
      1520. 
            1
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 379a979 (Featire specs)
=======
=======
=======
          
      1521. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> adc21e0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
      1522. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 37e48018 (Featire specs)
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
=======
=======
=======
          
      1523. 
            1
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 4d90e3d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
=======
=======
          
      1524. 
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
            
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 00f8b58 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 450f4e3 (Manifest_cache true)
=======
=======
=======
          
      1525. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
      1526. 
            
<<<<<<< HEAD
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
>>>>>>> aa3618b (Rebased)
<<<<<<< HEAD
>>>>>>> 75fa7e1b (Rebased)
=======
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 00f8b58 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 450f4e3 (Manifest_cache true)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
=======
          
      1527. 
            1
<<<<<<< HEAD
>>>>>>> a5d032d (Fix)
>>>>>>> 160fb15 (Fix)
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
=======
=======
=======
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 11792758 (Rebased)
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
=======
=======
          
      1528. 
            
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
>>>>>>> aa3618b (Rebased)
=======
=======
          
      1529. 
            1
>>>>>>> a5d032d (Fix)
>>>>>>> 160fb15 (Fix)
=======
>>>>>>> 824bb2b (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
=======
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
=======
          
      1530. 
            1
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> e3e66f3 (Featire specs)
          
      1531. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
      1532. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> e3e66f3 (Featire specs)
          
      1533. 
            1
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 8cbdfeb (Manifest_cache true)
>>>>>>> 9c0d812 (Featire specs)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
          
      1534. 
            
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 00f8b58 (Manifest_cache true)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
      1535. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      1536. 
            
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      1537. 
            1
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
=======
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> bf137e4 (Manifest_cache true)
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
=======
          
      1538. 
            1
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
=======
          
      1539. 
            
>>>>>>> 998f08d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 64dceec (Manifest_cache true)
=======
=======
=======
          
      1540. 
            1
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
=======
          
      1541. 
            1
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
=======
>>>>>>> 6da9530 (Featire specs)
=======
=======
=======
>>>>>>> 6fa625b (Manifest_cache true)
=======
=======
<<<<<<< HEAD
>>>>>>> 59d75f9 (Featire specs)
=======
          
      1542. 
            1
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0ed7f7c (Featire specs)
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
=======
          
      1543. 
            1
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
          
      1544. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
      1545. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
=======
          
      1546. 
            1
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
          
      1547. 
            
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 00f8b58 (Manifest_cache true)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
      1548. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 49e8a6c (Rebased)
=======
          
      1549. 
            
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
          
      1550. 
            1
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> e18eb87 (Fix)
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> f92a45b (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> e055dd0 (Rebased)
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 0c57e4e (Fix)
=======
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a71befd (Manifest_cache true)
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 51bc18c (Featire specs)
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 973ba8c (Featire specs)
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
=======
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 15bff2e (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> c0159bf (Manifest_cache true)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
      1551. 
            1
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
=======
=======
=======
=======
          
      1552. 
            
>>>>>>> 998f08d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 6c71f00 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> ca274ec (Manifest_cache true)
=======
=======
=======
=======
          
      1553. 
            1
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
      1554. 
            1
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 715fac2 (Featire specs)
<<<<<<< HEAD
>>>>>>> fb61c5a (Featire specs)
=======
=======
          
      1555. 
            1
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
=======
=======
>>>>>>> b832d45 (Featire specs)
=======
=======
          
      1556. 
            1
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
=======
=======
=======
=======
          
      1557. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
          
      1558. 
            1
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
=======
=======
>>>>>>> 37e48018 (Featire specs)
<<<<<<< HEAD
              options.add_argument('--disable-dev-shm-usage')
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
=======
          
      1559. 
            1
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> e3e66f3 (Featire specs)
          
      1560. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
      1561. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> e3e66f3 (Featire specs)
          
      1562. 
            1
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 8cbdfeb (Manifest_cache true)
>>>>>>> 9c0d812 (Featire specs)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
          
      1563. 
            
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 00f8b58 (Manifest_cache true)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
      1564. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      1565. 
            
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      1566. 
            1
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> 13fca83d (Rebased)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> ae884b47 (Fix)
=======
=======
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> bf137e4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 21793167 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0ea (Featire specs)
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888bf (Featire specs)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 74240509 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e59c273d (Manifest_cache true)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a1a479e2 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
      1567. 
            1
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 393eff3b (Featire specs)
=======
=======
=======
=======
          
      1568. 
            
>>>>>>> 998f08d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 64dceec (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 7afa007b (Manifest_cache true)
=======
=======
=======
=======
          
      1569. 
            1
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
      1570. 
            1
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
>>>>>>> d9d85ca6 (Fix)
=======
          
      1571. 
            1
>>>>>>> c7a726c5 (Rebased)
=======

              options.add_argument('--disable-dev-shm-usage')
=======
=======
              options.add_argument('--no-sandbox')
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 610b6138 (Featire specs)
=======
=======
              options.add_argument('--disable-dev-shm-usage')
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 37e48018 (Featire specs)
=======
              options.add_argument('--disable-dev-shm-usage')
>>>>>>> 11792758 (Rebased)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> c12b71de (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> b904d7ae (Featire specs)
=======
>>>>>>> ef483b6d (Fix)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> bdc24a1a (Rebased)
=======
>>>>>>> 53db2224 (Featire specs)
=======
>>>>>>> 7b22ad7e (Featire specs)
=======
>>>>>>> b97bb382 (Featire specs)
=======
>>>>>>> 4a2f2ad8 (Featire specs)
=======
>>>>>>> 21873de0 (Featire specs)
=======
>>>>>>> 392646b5 (Featire specs)
=======
>>>>>>> 1049b80c (Fix)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> e055dd0 (Rebased)
=======
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 973ba8c (Featire specs)
=======
>>>>>>> 8181d13 (Featire specs)
=======
>>>>>>> 72b9cab (Featire specs)
=======
>>>>>>> 15c51b7 (Featire specs)
=======
>>>>>>> 9e081dc (Fix)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> 53db2224 (Featire specs)
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> d52f9efe (Featire specs)
=======
=======
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
>>>>>>> 7b22ad7e (Featire specs)
=======
>>>>>>> b97bb382 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c12b71de (Featire specs)
=======
=======
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 392646b5 (Featire specs)
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
              options.add_argument('--disable-dev-shm-usage')
=======
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> 5507b42 (Featire specs)
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> 973ba8c (Featire specs)
              options.add_argument('--disable-dev-shm-usage')
=======
              options.add_argument('--no-sandbox')
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
=======
              options.add_argument('--no-sandbox')
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
              options.add_argument('--no-sandbox')
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 973ba8c (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
=======
              options.add_argument('--no-sandbox')
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
=======
              options.add_argument('--no-sandbox')
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
              options.add_argument('--no-sandbox')
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 4e81ea2 (Featire specs)
=======
              options.add_argument('--no-sandbox')
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
              options.add_argument('--disable-dev-shm-usage')
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
              options.add_argument('--disable-dev-shm-usage')
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> bc6bc8d2 (Rebased)
=======
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> d52f9efe (Featire specs)
=======
=======
=======
=======
              options.add_argument('--no-sandbox')
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
=======
              options.add_argument('--no-sandbox')
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> c12b71de (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
=======
              options.add_argument('--disable-dev-shm-usage')
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
              options.add_argument('--disable-dev-shm-usage')
>>>>>>> 4552227 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b904d7ae (Featire specs)
=======
=======
              options.add_argument('--disable-dev-shm-usage')
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
>>>>>>> ef483b6d (Fix)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
              options.add_argument('--no-sandbox')
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 0676508 (Featire specs)
=======
              options.add_argument('--no-sandbox')
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
=======
              options.add_argument('--no-sandbox')
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
              options.add_argument('--no-sandbox')
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
=======
              options.add_argument('--disable-dev-shm-usage')
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
              options.add_argument('--disable-dev-shm-usage')
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5e31aeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 53db2224 (Featire specs)
=======
=======
=======
=======
              options.add_argument('--no-sandbox')
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
              options.add_argument('--no-sandbox')
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
=======
=======
              options.add_argument('--no-sandbox')
>>>>>>> 08edf50 (Featire specs)
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
=======
=======
              options.add_argument('--disable-dev-shm-usage')
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
=======
=======
              options.add_argument('--disable-dev-shm-usage')
>>>>>>> 4552227 (Featire specs)
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 392646b5 (Featire specs)
=======
=======
=======
              options.add_argument('--disable-dev-shm-usage')
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
              options.add_argument('--no-sandbox')
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
=======
              options.add_argument('--no-sandbox')
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
=======
              options.add_argument('--disable-dev-shm-usage')
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
        1572. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      1572. 
            1
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 7a08014b (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4367ccb1 (Manifest_cache true)
=======
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
>>>>>>> b904d7ae (Featire specs)
=======
>>>>>>> 4fac471d (Manifest_cache true)
=======
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> fb61c5a (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
>>>>>>> e055dd0 (Rebased)
=======
>>>>>>> 0c57e4e (Fix)
=======
>>>>>>> a71befd (Manifest_cache true)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 973ba8c (Featire specs)
=======
>>>>>>> 8181d13 (Featire specs)
=======
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 72b9cab (Featire specs)
=======
>>>>>>> c0159bf (Manifest_cache true)
=======
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 15c51b7 (Featire specs)
=======
>>>>>>> ca274ec (Manifest_cache true)
=======
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9e081dc (Fix)
>>>>>>> b3f2049 (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 31d15e66 (Fix)
=======
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
>>>>>>> fdab719f (Fix)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 307f31f (Manifest_cache true)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 15bff2e (Manifest_cache true)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> 6c71f00 (Manifest_cache true)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1d59aaa (Fix)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 307f31f (Manifest_cache true)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 64dceec (Manifest_cache true)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
=======
>>>>>>> 6da9530 (Featire specs)
=======
=======
>>>>>>> f92a45b (Featire specs)
=======
>>>>>>> df37394 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 11792758 (Rebased)
=======
>>>>>>> b28889f (Fix)
>>>>>>> 99dad91f (Fix)
=======
=======
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
=======
=======
=======
>>>>>>> 715fac2 (Featire specs)
>>>>>>> fb61c5a (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 37e48018 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 610b6138 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> 99dad91f (Fix)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 73f364d8 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f92a45b (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
>>>>>>> 0f8241bb (Featire specs)
          
      1573. 
            
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      1574. 
            1
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
          
      1575. 
            
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
=======
          
      1576. 
            1
>>>>>>> 752f0c0 (Featire specs)
=======
          
      1577. 
            
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
      1578. 
            1
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      1579. 
            
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
      1580. 
            1
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 9bfbd88 (Featire specs)
>>>>>>> ebcdce06 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 365d41ed (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
>>>>>>> 13fca83d (Rebased)
=======
>>>>>>> f136376a (Featire specs)
=======
>>>>>>> 1ca9c0ea (Featire specs)
=======
>>>>>>> 4bf888bf (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 393eff3b (Featire specs)
=======
>>>>>>> d9d85ca6 (Fix)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376a (Featire specs)
=======
=======
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0ea (Featire specs)
=======
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> 4bf888bf (Featire specs)
              options.add_argument('--disable-dev-shm-usage')
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
              options.add_argument('--disable-dev-shm-usage')
=======
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
>>>>>>> 36356d3 (Featire specs)
>>>>>>> 393eff3b (Featire specs)
              options.add_argument('--disable-dev-shm-usage')
=======
              options.add_argument('--no-sandbox')
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
              options.add_argument('--no-sandbox')
>>>>>>> 752f0c0 (Featire specs)
=======
              options.add_argument('--no-sandbox')
>>>>>>> 4e81ea2 (Featire specs)
=======
              options.add_argument('--no-sandbox')
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
              options.add_argument('--disable-dev-shm-usage')
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 34509eee (Featire specs)
=======
              options.add_argument('--disable-dev-shm-usage')
>>>>>>> 75fa7e1b (Rebased)
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 365d41ed (Featire specs)
=======
>>>>>>> c05ee511 (Featire specs)
=======
>>>>>>> f136376a (Featire specs)
=======
>>>>>>> 1ca9c0ea (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
>>>>>>> 824bb2b (Featire specs)
=======
=======
              options.add_argument('--no-sandbox')
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> e6fc67c7 (Featire specs)
=======
>>>>>>> 73f364d8 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
              options.add_argument('--no-sandbox')
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
=======
              options.add_argument('--no-sandbox')
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
=======
              options.add_argument('--no-sandbox')
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
              options.add_argument('--no-sandbox')
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 4e81ea2 (Featire specs)
=======
              options.add_argument('--no-sandbox')
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
              options.add_argument('--disable-dev-shm-usage')
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
              options.add_argument('--disable-dev-shm-usage')
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> 13fca83d (Rebased)
=======
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376a (Featire specs)
=======
=======
=======
=======
              options.add_argument('--no-sandbox')
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0ea (Featire specs)
=======
=======
=======
              options.add_argument('--no-sandbox')
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888bf (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
=======
              options.add_argument('--disable-dev-shm-usage')
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
              options.add_argument('--disable-dev-shm-usage')
>>>>>>> 4552227 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 393eff3b (Featire specs)
=======
=======
              options.add_argument('--disable-dev-shm-usage')
>>>>>>> 5b7749a (Fix)
>>>>>>> d9d85ca6 (Fix)
          
        1581. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      1581. 
            1
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 4f4ea3f9 (Featire specs)
=======
>>>>>>> c05ee511 (Featire specs)
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> 74240509 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e59c273d (Manifest_cache true)
=======
>>>>>>> a1a479e2 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 393eff3b (Featire specs)
=======
>>>>>>> 7afa007b (Manifest_cache true)
=======
>>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
>>>>>>> d8dd3b4a (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
>>>>>>> b28889f (Fix)
>>>>>>> 5a2009f1 (Fix)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 307f31f (Manifest_cache true)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 64dceec (Manifest_cache true)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 75fa7e1b (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5a2009f1 (Fix)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
=======
=======
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
=======
>>>>>>> 715fac2 (Featire specs)
>>>>>>> fb61c5a (Featire specs)
>>>>>>> 73f364d8 (Featire specs)
          
      1582. 
            
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 84809242 (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
<<<<<<< HEAD
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 6fa625b (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
>>>>>>> 6fa625b (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 3cf8dd4 (Featire specs)
>>>>>>> b3f2049 (Featire specs)
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> bf137e4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 21793167 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0ea (Featire specs)
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4bf888bf (Featire specs)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 74240509 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e59c273d (Manifest_cache true)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a1a479e2 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 393eff3b (Featire specs)
=======
=======
=======
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 64dceec (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 7afa007b (Manifest_cache true)
=======
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
>>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 6fa625b (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> bf137e4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 824ea7c9 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
>>>>>>> c12b71de (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4367ccb1 (Manifest_cache true)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b904d7ae (Featire specs)
=======
=======
=======
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 64dceec (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4fac471d (Manifest_cache true)
=======
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> b3f2049 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> b3f2049 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a71befd (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8a3779d4 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0f24a043 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 15bff2e (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> c0159bf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1d0f5cbf (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> b8c2784f (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 392646b5 (Featire specs)
=======
=======
=======
=======
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 6c71f00 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> ca274ec (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a56ba36d (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      1583. 
            1
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> d34a0770 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 1b8f36d8 (Manifest_cache true)
=======
          
      1584. 
            1
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
=======
=======
=======
>>>>>>> d34a0770 (Manifest_cache true)
<<<<<<< HEAD
=======
=======
>>>>>>> 3be4d14 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 1b8f36d8 (Manifest_cache true)
=======
>>>>>>> 8a3779d4 (Manifest_cache true)
>>>>>>> b719333 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0341d6de (Manifest_cache true)
=======
=======
>>>>>>> b719333 (Manifest_cache true)
>>>>>>> 824ea7c9 (Manifest_cache true)
=======
=======
>>>>>>> 307f31f (Manifest_cache true)
>>>>>>> bf137e4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 21793167 (Manifest_cache true)
=======
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> b719333 (Manifest_cache true)
>>>>>>> d34a0770 (Manifest_cache true)
=======
>>>>>>> 824ea7c9 (Manifest_cache true)
=======
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
          
      1585. 
            1
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 3be4d14 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1b8f36d8 (Manifest_cache true)
=======
=======
=======
>>>>>>> 307f31f (Manifest_cache true)
>>>>>>> a71befd (Manifest_cache true)
>>>>>>> 8a3779d4 (Manifest_cache true)
          
      1586. 
            
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
=======
          
      1587. 
            1
>>>>>>> 752f0c0 (Featire specs)
=======
          
      1588. 
            
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
      1589. 
            1
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      1590. 
            
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
      1591. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> f92a45b (Featire specs)
>>>>>>> e6fc67c7 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 9bfbd88 (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
>>>>>>> 9bfbd88 (Featire specs)
<<<<<<< HEAD
=======
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 6da9530 (Featire specs)
=======
=======
          
      1592. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
      1593. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 72b9cab (Featire specs)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
>>>>>>> bb5c652 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
          
      1594. 
            1
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
>>>>>>> 9a49b7b (Rebased)
=======
>>>>>>> 009401d (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
          
      1595. 
            
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> b9cc4e9 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
>>>>>>> 78717cc (Manifest_cache true)
=======
=======
>>>>>>> 009401d (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
          
      1596. 
            
>>>>>>> 02a399d (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a71befd (Manifest_cache true)
          
      1597. 
            
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
<<<<<<< HEAD
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
>>>>>>> a71befd (Manifest_cache true)
          
      1598. 
=======
          
      1599. 
            1
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
          
      1600. 
            
=======
<<<<<<< HEAD
          
      1601. 
            1
=======
          
      1602. 
>>>>>>> ebcdce06 (Featire specs)
            
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824ea7c9 (Manifest_cache true)
=======
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 8a3779d4 (Manifest_cache true)
=======
>>>>>>> 7b22ad7e (Featire specs)
=======
>>>>>>> 73f364d8 (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
>>>>>>> 6fa625b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 98beee2 (Manifest_cache true)
=======
=======
>>>>>>> 009401d (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
          
      1603. 
            1
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> ae409ca (Featire specs)
=======
=======
=======
          
      1604. 
            
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> c8cdb08 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 385b8df (Manifest_cache true)
=======
=======
=======
          
      1605. 
            1
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 379a979 (Featire specs)
=======
=======
=======
          
      1606. 
            
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 7bc7f9f (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 490b01d6 (Manifest_cache true)
=======
=======
=======
=======
          
      1607. 
            1
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 3723aad (Featire specs)
>>>>>>> adc21e0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
=======
=======
          
      1608. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 24b58e6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 84d0df6 (Manifest_cache true)
=======
=======
=======
          
      1609. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
=======
=======
=======
          
      1610. 
            1
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 4d90e3d (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
=======
=======
          
      1611. 
            
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 00f8b58 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 450f4e3 (Manifest_cache true)
=======
=======
=======
          
      1612. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
>>>>>>> 11792758 (Rebased)
=======
=======
          
      1613. 
            
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> aa3618b (Rebased)
<<<<<<< HEAD
>>>>>>> 75fa7e1b (Rebased)
=======
=======
>>>>>>> aa3618b (Rebased)
>>>>>>> 31d15e66 (Fix)
=======
=======
          
      1614. 
            1
>>>>>>> a5d032d (Fix)
>>>>>>> 160fb15 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
=======
=======
>>>>>>> d782a28 (Manifest_cache true)
>>>>>>> a304bcf (Manifest_cache true)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
          
      1615. 
            
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8cdb08 (Manifest_cache true)
=======
=======
>>>>>>> c4adab0 (Featire specs)
=======
          
      1616. 
            1
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
          
      1617. 
            
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 35d17b9 (Manifest_cache true)
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
          
      1618. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
=======
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
          
      1619. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 24b58e6 (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
      1620. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> e3e66f3 (Featire specs)
          
      1621. 
            1
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 8cbdfeb (Manifest_cache true)
>>>>>>> 9c0d812 (Featire specs)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
          
      1622. 
            
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 00f8b58 (Manifest_cache true)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
      1623. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      1624. 
            
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      1625. 
            1
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e5890c2 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 251144b4 (Manifest_cache true)
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> 13fca83d (Rebased)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> ae884b47 (Fix)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      1626. 
            
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b719333 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0341d6de (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> bf137e4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 21793167 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0ea (Featire specs)
=======
=======
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a304bcf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d245196f (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888bf (Featire specs)
=======
=======
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
>>>>>>> 35d17b9 (Manifest_cache true)
>>>>>>> 255dd8d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 304cd28a (Manifest_cache true)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 74240509 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e59c273d (Manifest_cache true)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a1a479e2 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
      1627. 
            1
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 393eff3b (Featire specs)
=======
=======
=======
=======
          
      1628. 
            
>>>>>>> 998f08d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 64dceec (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 7afa007b (Manifest_cache true)
=======
=======
=======
=======
          
      1629. 
            1
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
      1630. 
            1
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
>>>>>>> d9d85ca6 (Fix)
=======
=======
>>>>>>> 6da9530 (Featire specs)
=======
=======
>>>>>>> a71befd (Manifest_cache true)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> fb61c5a (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
>>>>>>> 6fa625b (Manifest_cache true)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
          
      1631. 
            1
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> d782a28 (Manifest_cache true)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0ed7f7c (Featire specs)
=======
=======
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
          
      1632. 
            
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8cdb08 (Manifest_cache true)
=======
=======
>>>>>>> c4adab0 (Featire specs)
=======
          
      1633. 
            1
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
          
      1634. 
            
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 35d17b9 (Manifest_cache true)
=======
>>>>>>> ee5242b (Featire specs)
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
          
      1635. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
          
      1636. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 24b58e6 (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
      1637. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
=======
          
      1638. 
            1
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
          
      1639. 
            
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 00f8b58 (Manifest_cache true)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
      1640. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 49e8a6c (Rebased)
=======
          
      1641. 
            
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
          
      1642. 
            1
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> e18eb87 (Fix)
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> f92a45b (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
=======
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0e864a5 (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> e055dd0 (Rebased)
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 0c57e4e (Fix)
=======
=======
=======
          
      1643. 
            
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 3be4d14 (Manifest_cache true)
=======
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a71befd (Manifest_cache true)
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 51bc18c (Featire specs)
=======
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 551c6ab (Manifest_cache true)
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 973ba8c (Featire specs)
=======
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 35d17b9 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> fd310ed (Manifest_cache true)
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
=======
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> add330c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 42e9c2e (Manifest_cache true)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
=======
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 15bff2e (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> c0159bf (Manifest_cache true)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
      1644. 
            1
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
=======
=======
=======
=======
          
      1645. 
            
>>>>>>> 998f08d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 6c71f00 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> ca274ec (Manifest_cache true)
=======
=======
=======
=======
          
      1646. 
            1
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
      1647. 
            1
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
=======
=======
=======
=======
          
      1648. 
            1
>>>>>>> 752f0c0 (Featire specs)
=======
          
      1649. 
            
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
      1650. 
            1
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      1651. 
            
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
      1652. 
            1
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 715fac2 (Featire specs)
<<<<<<< HEAD
>>>>>>> fb61c5a (Featire specs)
=======
=======
>>>>>>> 6fa625b (Manifest_cache true)
=======
=======
          
      1653. 
            1
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
=======
=======
>>>>>>> b832d45 (Featire specs)
=======
=======
          
      1654. 
            
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0b43b18 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1cce66c (Manifest_cache true)
=======
=======
=======
=======
          
      1655. 
            1
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
=======
=======
=======
=======
          
      1656. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 24b58e6 (Manifest_cache true)
=======
=======
          
      1657. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
          
      1658. 
            1
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> bdc24a1a (Rebased)
=======
>>>>>>> 53db2224 (Featire specs)
=======
>>>>>>> 7b22ad7e (Featire specs)
=======
>>>>>>> b97bb382 (Featire specs)
=======
>>>>>>> 4a2f2ad8 (Featire specs)
=======
>>>>>>> 21873de0 (Featire specs)
=======
>>>>>>> 392646b5 (Featire specs)
=======
>>>>>>> 1049b80c (Fix)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 0676508 (Featire specs)
>>>>>>> 448bef30 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
          
      1659. 
            1
>>>>>>> c7a726c5 (Rebased)
=======
=======
=======
          
      1660. 
            1
>>>>>>> 752f0c0 (Featire specs)
=======
          
      1661. 
            
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
      1662. 
            1
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      1663. 
            
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
      1664. 
            1
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 9bfbd88 (Featire specs)
>>>>>>> ebcdce06 (Featire specs)
=======
=======
>>>>>>> 610b6138 (Featire specs)
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 7bc7f9f (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> c59d1a99 (Manifest_cache true)
=======
=======
=======
=======
          
      1665. 
            1
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 3723aad (Featire specs)
>>>>>>> adc21e0 (Featire specs)
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> 37e48018 (Featire specs)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
      1666. 
            1
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 4d90e3d (Featire specs)
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
>>>>>>> aa3618b (Rebased)
>>>>>>> 11792758 (Rebased)
=======
>>>>>>> 31d15e66 (Fix)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
=======
=======
>>>>>>> d782a28 (Manifest_cache true)
>>>>>>> a304bcf (Manifest_cache true)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
          
      1667. 
            
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8cdb08 (Manifest_cache true)
=======
=======
>>>>>>> c4adab0 (Featire specs)
=======
          
      1668. 
            1
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
          
      1669. 
            
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> e055dd0 (Rebased)
=======
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 973ba8c (Featire specs)
=======
>>>>>>> 8181d13 (Featire specs)
=======
>>>>>>> 72b9cab (Featire specs)
=======
>>>>>>> 15c51b7 (Featire specs)
=======
>>>>>>> 9e081dc (Fix)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 448bef30 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 904663c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 35d17b9 (Manifest_cache true)
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 53db2224 (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
              options.add_argument('--window-size=1400,1400')
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
          
      1670. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
=======
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
          
      1671. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 24b58e6 (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
      1672. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> e3e66f3 (Featire specs)
          
      1673. 
            1
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 8cbdfeb (Manifest_cache true)
>>>>>>> 9c0d812 (Featire specs)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
          
      1674. 
            
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 00f8b58 (Manifest_cache true)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
      1675. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      1676. 
            
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      1677. 
            1
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> fdab719f (Fix)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e5890c2 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> bc6bc8d2 (Rebased)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> 8288136d (Fix)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      1678. 
            
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b719333 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d34a0770 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> bf137e4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 824ea7c9 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a304bcf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> bd30d038 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> c12b71de (Featire specs)
=======
=======
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
>>>>>>> 35d17b9 (Manifest_cache true)
>>>>>>> 255dd8d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d4235040 (Manifest_cache true)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4367ccb1 (Manifest_cache true)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
      1679. 
            1
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b904d7ae (Featire specs)
=======
=======
=======
=======
          
      1680. 
            
>>>>>>> 998f08d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 64dceec (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4fac471d (Manifest_cache true)
=======
=======
=======
=======
          
      1681. 
            1
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
      1682. 
            1
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
>>>>>>> ef483b6d (Fix)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 365d41ed (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
>>>>>>> 13fca83d (Rebased)
=======
>>>>>>> f136376a (Featire specs)
=======
>>>>>>> 1ca9c0ea (Featire specs)
=======
>>>>>>> 4bf888bf (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 393eff3b (Featire specs)
=======
>>>>>>> d9d85ca6 (Fix)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> c12b71de (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> b904d7ae (Featire specs)
=======
>>>>>>> ef483b6d (Fix)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f136376a (Featire specs)
=======
=======
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1ca9c0ea (Featire specs)
=======
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> 4bf888bf (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> efd6af09 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 5507b42 (Featire specs)
>>>>>>> d52f9efe (Featire specs)
=======
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> ae07231a (Featire specs)
=======
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> c12b71de (Featire specs)
              options.add_argument('--window-size=1400,1400')
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
              options.add_argument('--window-size=1400,1400')
=======
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
>>>>>>> 36356d3 (Featire specs)
>>>>>>> 393eff3b (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> 37e48018 (Featire specs)
=======
              options.add_argument('--window-size=1400,1400')
=======
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 36356d3 (Featire specs)
>>>>>>> b904d7ae (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
>>>>>>> 5507b42 (Featire specs)
>>>>>>> 5e31aeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 53db2224 (Featire specs)
=======
=======
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> 973ba8c (Featire specs)
>>>>>>> b97bb382 (Featire specs)
              options.add_argument('--window-size=1400,1400')
=======
              options.add_argument('--disable-dev-shm-usage')
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
              options.add_argument('--disable-dev-shm-usage')
>>>>>>> 752f0c0 (Featire specs)
=======
              options.add_argument('--disable-dev-shm-usage')
>>>>>>> 4e81ea2 (Featire specs)
=======
              options.add_argument('--disable-dev-shm-usage')
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
              options.add_argument('--window-size=1400,1400')
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 34509eee (Featire specs)
=======
              options.add_argument('--window-size=1400,1400')
>>>>>>> 75fa7e1b (Rebased)
=======
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 53db2224 (Featire specs)
=======
>>>>>>> 7b22ad7e (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 365d41ed (Featire specs)
=======
>>>>>>> c05ee511 (Featire specs)
=======
>>>>>>> f136376a (Featire specs)
=======
>>>>>>> 1ca9c0ea (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
              options.add_argument('--disable-dev-shm-usage')
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
              options.add_argument('--disable-dev-shm-usage')
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 973ba8c (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
=======
              options.add_argument('--disable-dev-shm-usage')
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
=======
              options.add_argument('--disable-dev-shm-usage')
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
              options.add_argument('--disable-dev-shm-usage')
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 4e81ea2 (Featire specs)
=======
              options.add_argument('--disable-dev-shm-usage')
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
              options.add_argument('--window-size=1400,1400')
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
              options.add_argument('--window-size=1400,1400')
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> 13fca83d (Rebased)
=======
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376a (Featire specs)
=======
=======
=======
=======
              options.add_argument('--disable-dev-shm-usage')
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0ea (Featire specs)
=======
=======
=======
              options.add_argument('--disable-dev-shm-usage')
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888bf (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
=======
              options.add_argument('--window-size=1400,1400')
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
>>>>>>> b904d7ae (Featire specs)
=======
=======
              options.add_argument('--window-size=1400,1400')
>>>>>>> 4552227 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 393eff3b (Featire specs)
=======
=======
              options.add_argument('--window-size=1400,1400')
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
>>>>>>> d9d85ca6 (Fix)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
              options.add_argument('--window-size=1400,1400')
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 37e48018 (Featire specs)
=======
              options.add_argument('--window-size=1400,1400')
>>>>>>> 11792758 (Rebased)
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
              options.add_argument('--disable-dev-shm-usage')
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
=======
              options.add_argument('--disable-dev-shm-usage')
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
=======
              options.add_argument('--disable-dev-shm-usage')
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
              options.add_argument('--disable-dev-shm-usage')
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 4e81ea2 (Featire specs)
=======
              options.add_argument('--disable-dev-shm-usage')
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
              options.add_argument('--window-size=1400,1400')
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
              options.add_argument('--window-size=1400,1400')
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> bc6bc8d2 (Rebased)
=======
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> d52f9efe (Featire specs)
=======
=======
=======
=======
              options.add_argument('--disable-dev-shm-usage')
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
=======
              options.add_argument('--disable-dev-shm-usage')
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> c12b71de (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
=======
              options.add_argument('--window-size=1400,1400')
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> b904d7ae (Featire specs)
=======
=======
              options.add_argument('--window-size=1400,1400')
>>>>>>> 5b7749a (Fix)
>>>>>>> ef483b6d (Fix)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
              options.add_argument('--disable-dev-shm-usage')
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 0676508 (Featire specs)
=======
              options.add_argument('--disable-dev-shm-usage')
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
=======
              options.add_argument('--disable-dev-shm-usage')
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
              options.add_argument('--disable-dev-shm-usage')
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
=======
              options.add_argument('--window-size=1400,1400')
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
              options.add_argument('--window-size=1400,1400')
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5e31aeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 53db2224 (Featire specs)
=======
=======
=======
=======
              options.add_argument('--disable-dev-shm-usage')
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
              options.add_argument('--disable-dev-shm-usage')
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
=======
=======
              options.add_argument('--disable-dev-shm-usage')
>>>>>>> 08edf50 (Featire specs)
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
=======
=======
              options.add_argument('--window-size=1400,1400')
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
=======
=======
              options.add_argument('--window-size=1400,1400')
>>>>>>> 4552227 (Featire specs)
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 392646b5 (Featire specs)
=======
=======
=======
              options.add_argument('--window-size=1400,1400')
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
              options.add_argument('--disable-dev-shm-usage')
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
=======
              options.add_argument('--disable-dev-shm-usage')
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
=======
              options.add_argument('--window-size=1400,1400')
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
        1683. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> e6fc67c7 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 73f364d8 (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> d365be68 (Manifest_cache true)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
          
      1683. 
            1
=======
>>>>>>> f92a45b (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> fb61c5a (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> 1cce66c (Manifest_cache true)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5506bd0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 7a08014b (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
>>>>>>> b3f2049 (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 11792758 (Rebased)
=======
<<<<<<< HEAD
>>>>>>> 31d15e66 (Fix)
=======
=======
>>>>>>> fdab719f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 4f4ea3f9 (Featire specs)
=======
>>>>>>> c05ee511 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
>>>>>>> 0e864a5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> cc390719 (Manifest_cache true)
=======
=======
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
>>>>>>> 0c57e4e (Fix)
<<<<<<< HEAD
>>>>>>> 8887ba5b (Fix)
=======
=======
>>>>>>> 3be4d14 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1b8f36d8 (Manifest_cache true)
=======
=======
>>>>>>> a71befd (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8a3779d4 (Manifest_cache true)
=======
=======
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
>>>>>>> 551c6ab (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 56531f25 (Manifest_cache true)
=======
=======
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
>>>>>>> fd310ed (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 86229876 (Manifest_cache true)
=======
=======
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
>>>>>>> 42e9c2e (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 16ebb0ff (Manifest_cache true)
=======
=======
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0f24a043 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
>>>>>>> c0159bf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1d0f5cbf (Manifest_cache true)
=======
=======
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> b8c2784f (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 15c51b7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 392646b5 (Featire specs)
=======
=======
>>>>>>> ca274ec (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a56ba36d (Manifest_cache true)
=======
=======
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 9e081dc (Fix)
>>>>>>> 1049b80c (Fix)
>>>>>>> b3f2049 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
=======
>>>>>>> 74240509 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e59c273d (Manifest_cache true)
=======
>>>>>>> a1a479e2 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 393eff3b (Featire specs)
=======
>>>>>>> 7afa007b (Manifest_cache true)
=======
>>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d9d85ca6 (Fix)
=======
>>>>>>> 4367ccb1 (Manifest_cache true)
=======
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
>>>>>>> b904d7ae (Featire specs)
=======
>>>>>>> 4fac471d (Manifest_cache true)
=======
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
=======
>>>>>>> ef483b6d (Fix)
>>>>>>> b28889f (Fix)
>>>>>>> 5a2009f1 (Fix)
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 49e8a6c (Rebased)
=======
<<<<<<< HEAD
>>>>>>> 872e675 (Fix)
=======
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 35d17b9 (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 64dceec (Manifest_cache true)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
>>>>>>> b28889f (Fix)
>>>>>>> fdab719f (Fix)
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 49e8a6c (Rebased)
=======
<<<<<<< HEAD
>>>>>>> 872e675 (Fix)
=======
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 35d17b9 (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 64dceec (Manifest_cache true)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
=======
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 75fa7e1b (Rebased)
=======
>>>>>>> b28889f (Fix)
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 49e8a6c (Rebased)
=======
<<<<<<< HEAD
>>>>>>> 872e675 (Fix)
=======
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 35d17b9 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> add330c (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 15bff2e (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 6c71f00 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 1d59aaa (Fix)
=======
<<<<<<< HEAD
=======
=======
>>>>>>> 715fac2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 490b01d6 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5a2009f1 (Fix)
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> 99dad91f (Fix)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 73f364d8 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 7a08014b (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> f92a45b (Featire specs)
>>>>>>> e6fc67c7 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
>>>>>>> e6fc67c7 (Featire specs)
=======
>>>>>>> 73f364d8 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 7a08014b (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
=======
>>>>>>> 715fac2 (Featire specs)
>>>>>>> fb61c5a (Featire specs)
>>>>>>> 73f364d8 (Featire specs)
          
      1684. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 7b22ad7e (Featire specs)
=======
>>>>>>> 56531f25 (Manifest_cache true)
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 86229876 (Manifest_cache true)
=======
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
>>>>>>> b8c2784f (Fix book_spec decrease quantity and price)
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b904d7ae (Featire specs)
=======
>>>>>>> 392646b5 (Featire specs)
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4fac471d (Manifest_cache true)
=======
>>>>>>> a56ba36d (Manifest_cache true)
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price)
>>>>>>> 64dceec (Manifest_cache true)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ae07231a (Featire specs)
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> bd30d038 (Manifest_cache true)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> c12b71de (Featire specs)
=======
>>>>>>> d4235040 (Manifest_cache true)
=======
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 8cbdfeb (Manifest_cache true)
>>>>>>> 4367ccb1 (Manifest_cache true)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
>>>>>>> b904d7ae (Featire specs)
=======
>>>>>>> 64dceec (Manifest_cache true)
>>>>>>> 4fac471d (Manifest_cache true)
=======
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> fd310ed (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 86229876 (Manifest_cache true)
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
>>>>>>> 42e9c2e (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 16ebb0ff (Manifest_cache true)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0f24a043 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
>>>>>>> c0159bf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1d0f5cbf (Manifest_cache true)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> b8c2784f (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> 15c51b7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 392646b5 (Featire specs)
=======
=======
=======
>>>>>>> b15044a (Manifest_cache true)
>>>>>>> ca274ec (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a56ba36d (Manifest_cache true)
=======
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
>>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price)
          
      1685. 
>>>>>>> 59d75f9 (Featire specs)
=======
          
      1686. 
>>>>>>> 6da9530 (Featire specs)
=======
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 551c6ab (Manifest_cache true)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 973ba8c (Featire specs)
          
      1687. 
>>>>>>> 59d75f9 (Featire specs)
>>>>>>> 51bc18c (Featire specs)
            
=======
<<<<<<< HEAD
          
      1688. 
            1
=======
          
      1689. 
            
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
=======
>>>>>>> 715fac2 (Featire specs)
>>>>>>> fb61c5a (Featire specs)
=======
=======
          
      1690. 
            1
>>>>>>> 752f0c0 (Featire specs)
=======
          
      1691. 
            
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
      1692. 
            1
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      1693. 
            
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
      1694. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
>>>>>>> fb61c5a (Featire specs)
>>>>>>> 73f364d8 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 9bfbd88 (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
>>>>>>> 9bfbd88 (Featire specs)
<<<<<<< HEAD
=======
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 6da9530 (Featire specs)
=======
=======
          
      1695. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
      1696. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 72b9cab (Featire specs)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
>>>>>>> bb5c652 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
          
      1697. 
            1
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
>>>>>>> 9a49b7b (Rebased)
=======
>>>>>>> 009401d (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
          
      1698. 
            
>>>>>>> b9cc4e9 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
>>>>>>> 78717cc (Manifest_cache true)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> e5890c2 (Manifest_cache true)
<<<<<<< HEAD
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> c8cdb08 (Manifest_cache true)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
>>>>>>> e5890c2 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 251144b4 (Manifest_cache true)
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> c59d1a99 (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
>>>>>>> e5890c2 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
          
      1699. 
            
=======
          
      1700. 
            
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> c8cdb08 (Manifest_cache true)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 86d584a (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 0b43b18 (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
          
      1701. 
            
=======
<<<<<<< HEAD
>>>>>>> 0ed7f7c (Featire specs)
=======
          
      1702. 
            
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
>>>>>>> a71befd (Manifest_cache true)
<<<<<<< HEAD
          
      1703. 
            1
=======
          
      1704. 
=======
          
      1705. 
            1
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
          
      1706. 
            
=======
<<<<<<< HEAD
          
      1707. 
            1
=======
          
      1708. 
>>>>>>> ebcdce06 (Featire specs)
            
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824ea7c9 (Manifest_cache true)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 8a3779d4 (Manifest_cache true)
=======
>>>>>>> aa4361fd (Featire specs)
>>>>>>> 6fa625b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 98beee2 (Manifest_cache true)
=======
=======
>>>>>>> 009401d (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
          
      1709. 
            1
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> ae409ca (Featire specs)
=======
=======
=======
          
      1710. 
            
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> c8cdb08 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 385b8df (Manifest_cache true)
=======
=======
=======
          
      1711. 
            1
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 379a979 (Featire specs)
=======
=======
=======
          
      1712. 
            
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 7bc7f9f (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 490b01d6 (Manifest_cache true)
=======
=======
=======
=======
          
      1713. 
            1
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 3723aad (Featire specs)
>>>>>>> adc21e0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
=======
=======
          
      1714. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 24b58e6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 84d0df6 (Manifest_cache true)
=======
=======
=======
          
      1715. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
=======
=======
=======
          
      1716. 
            1
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 4d90e3d (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
=======
=======
          
      1717. 
            
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 00f8b58 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 450f4e3 (Manifest_cache true)
=======
=======
=======
          
      1718. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
>>>>>>> 11792758 (Rebased)
=======
=======
          
      1719. 
            
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> aa3618b (Rebased)
<<<<<<< HEAD
>>>>>>> 75fa7e1b (Rebased)
=======
=======
>>>>>>> aa3618b (Rebased)
>>>>>>> 31d15e66 (Fix)
=======
=======
          
      1720. 
            1
>>>>>>> a5d032d (Fix)
>>>>>>> 160fb15 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
=======
=======
>>>>>>> d782a28 (Manifest_cache true)
>>>>>>> a304bcf (Manifest_cache true)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
          
      1721. 
            
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8cdb08 (Manifest_cache true)
=======
=======
>>>>>>> c4adab0 (Featire specs)
=======
          
      1722. 
            1
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
          
      1723. 
            
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 35d17b9 (Manifest_cache true)
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
          
      1724. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
=======
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
          
      1725. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 24b58e6 (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
      1726. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> e3e66f3 (Featire specs)
          
      1727. 
            1
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 8cbdfeb (Manifest_cache true)
>>>>>>> 9c0d812 (Featire specs)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
          
      1728. 
            
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 00f8b58 (Manifest_cache true)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
      1729. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      1730. 
            
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      1731. 
            1
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e5890c2 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 251144b4 (Manifest_cache true)
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> 13fca83d (Rebased)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> ae884b47 (Fix)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      1732. 
            
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b719333 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0341d6de (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> bf137e4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 21793167 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0ea (Featire specs)
=======
=======
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a304bcf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d245196f (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888bf (Featire specs)
=======
=======
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
>>>>>>> 35d17b9 (Manifest_cache true)
>>>>>>> 255dd8d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 304cd28a (Manifest_cache true)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 74240509 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e59c273d (Manifest_cache true)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a1a479e2 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
      1733. 
            1
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 393eff3b (Featire specs)
=======
=======
=======
=======
          
      1734. 
            
>>>>>>> 998f08d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 64dceec (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 7afa007b (Manifest_cache true)
=======
=======
=======
=======
          
      1735. 
            1
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
      1736. 
            1
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
>>>>>>> d9d85ca6 (Fix)
=======
=======
>>>>>>> 6da9530 (Featire specs)
=======
=======
>>>>>>> a71befd (Manifest_cache true)
=======
>>>>>>> 3cf8dd4 (Featire specs)
>>>>>>> 6fa625b (Manifest_cache true)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
          
      1737. 
            1
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> d782a28 (Manifest_cache true)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0ed7f7c (Featire specs)
=======
=======
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
          
      1738. 
            
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8cdb08 (Manifest_cache true)
=======
=======
>>>>>>> c4adab0 (Featire specs)
=======
          
      1739. 
            1
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
          
      1740. 
            
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 35d17b9 (Manifest_cache true)
=======
>>>>>>> ee5242b (Featire specs)
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
          
      1741. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
          
      1742. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 24b58e6 (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
      1743. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
=======
          
      1744. 
            1
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
          
      1745. 
            
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 00f8b58 (Manifest_cache true)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
      1746. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 49e8a6c (Rebased)
=======
          
      1747. 
            
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
          
      1748. 
            1
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> e18eb87 (Fix)
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> f92a45b (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
=======
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0e864a5 (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> e055dd0 (Rebased)
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 0c57e4e (Fix)
=======
=======
=======
          
      1749. 
            
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 3be4d14 (Manifest_cache true)
=======
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a71befd (Manifest_cache true)
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 51bc18c (Featire specs)
=======
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 551c6ab (Manifest_cache true)
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 973ba8c (Featire specs)
=======
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 35d17b9 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> fd310ed (Manifest_cache true)
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
=======
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> add330c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 42e9c2e (Manifest_cache true)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
=======
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 15bff2e (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> c0159bf (Manifest_cache true)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
      1750. 
            1
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
=======
=======
=======
=======
          
      1751. 
            
>>>>>>> 998f08d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 6c71f00 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> ca274ec (Manifest_cache true)
=======
=======
=======
=======
          
      1752. 
            1
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
      1753. 
            1
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 715fac2 (Featire specs)
<<<<<<< HEAD
>>>>>>> fb61c5a (Featire specs)
=======
=======
>>>>>>> 6fa625b (Manifest_cache true)
=======
=======
          
      1754. 
            1
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
=======
=======
=======
=======
          
      1755. 
            
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> c8cdb08 (Manifest_cache true)
=======
=======
          
      1756. 
            1
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
=======
          
      1757. 
            
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0b43b18 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1cce66c (Manifest_cache true)
=======
=======
=======
=======
          
      1758. 
            1
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
=======
=======
=======
=======
          
      1759. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 24b58e6 (Manifest_cache true)
=======
=======
          
      1760. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
          
      1761. 
            1
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> bdc24a1a (Rebased)
=======
>>>>>>> 53db2224 (Featire specs)
=======
>>>>>>> 7b22ad7e (Featire specs)
=======
>>>>>>> b97bb382 (Featire specs)
=======
>>>>>>> 4a2f2ad8 (Featire specs)
=======
>>>>>>> 21873de0 (Featire specs)
=======
>>>>>>> 392646b5 (Featire specs)
=======
>>>>>>> 1049b80c (Fix)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 0676508 (Featire specs)
>>>>>>> 448bef30 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
          
      1762. 
            1
>>>>>>> c7a726c5 (Rebased)
=======
=======
=======
          
      1763. 
            1
>>>>>>> 752f0c0 (Featire specs)
=======
          
      1764. 
            
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
      1765. 
            1
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      1766. 
            
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
      1767. 
            1
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 9bfbd88 (Featire specs)
>>>>>>> ebcdce06 (Featire specs)
=======
=======
>>>>>>> 610b6138 (Featire specs)
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 7bc7f9f (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> c59d1a99 (Manifest_cache true)
=======
=======
=======
=======
          
      1768. 
            1
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 3723aad (Featire specs)
>>>>>>> adc21e0 (Featire specs)
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> 37e48018 (Featire specs)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
      1769. 
            1
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 4d90e3d (Featire specs)
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
>>>>>>> aa3618b (Rebased)
>>>>>>> 11792758 (Rebased)
=======
>>>>>>> 31d15e66 (Fix)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
=======
=======
>>>>>>> d782a28 (Manifest_cache true)
>>>>>>> a304bcf (Manifest_cache true)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
          
      1770. 
            
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8cdb08 (Manifest_cache true)
=======
=======
>>>>>>> c4adab0 (Featire specs)
=======
          
      1771. 
            1
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
          
      1772. 
            
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> e055dd0 (Rebased)
=======
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 973ba8c (Featire specs)
=======
>>>>>>> 8181d13 (Featire specs)
=======
>>>>>>> 72b9cab (Featire specs)
=======
>>>>>>> 15c51b7 (Featire specs)
=======
>>>>>>> 9e081dc (Fix)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 448bef30 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 904663c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 35d17b9 (Manifest_cache true)
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 53db2224 (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
              options.add_argument('--allow-insecure-localhost')
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
          
      1773. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
=======
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
          
      1774. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 24b58e6 (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
      1775. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> e3e66f3 (Featire specs)
          
      1776. 
            1
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 8cbdfeb (Manifest_cache true)
>>>>>>> 9c0d812 (Featire specs)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
          
      1777. 
            
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 00f8b58 (Manifest_cache true)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
      1778. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      1779. 
            
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      1780. 
            1
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> fdab719f (Fix)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e5890c2 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> bc6bc8d2 (Rebased)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> 8288136d (Fix)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      1781. 
            
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b719333 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d34a0770 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> bf137e4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 824ea7c9 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a304bcf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> bd30d038 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> c12b71de (Featire specs)
=======
=======
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
>>>>>>> 35d17b9 (Manifest_cache true)
>>>>>>> 255dd8d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d4235040 (Manifest_cache true)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4367ccb1 (Manifest_cache true)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
      1782. 
            1
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b904d7ae (Featire specs)
=======
=======
=======
=======
          
      1783. 
            
>>>>>>> 998f08d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 64dceec (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4fac471d (Manifest_cache true)
=======
=======
=======
=======
          
      1784. 
            1
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
      1785. 
            1
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
>>>>>>> ef483b6d (Fix)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 365d41ed (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
>>>>>>> 13fca83d (Rebased)
=======
>>>>>>> f136376a (Featire specs)
=======
>>>>>>> 1ca9c0ea (Featire specs)
=======
>>>>>>> 4bf888bf (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 393eff3b (Featire specs)
=======
>>>>>>> d9d85ca6 (Fix)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> c12b71de (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> b904d7ae (Featire specs)
=======
>>>>>>> ef483b6d (Fix)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f136376a (Featire specs)
=======
=======
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1ca9c0ea (Featire specs)
=======
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> 4bf888bf (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> efd6af09 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 5507b42 (Featire specs)
>>>>>>> d52f9efe (Featire specs)
=======
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> ae07231a (Featire specs)
=======
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> c12b71de (Featire specs)
              options.add_argument('--allow-insecure-localhost')
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
              options.add_argument('--allow-insecure-localhost')
=======
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
>>>>>>> 36356d3 (Featire specs)
>>>>>>> 393eff3b (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> 37e48018 (Featire specs)
=======
              options.add_argument('--allow-insecure-localhost')
=======
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 36356d3 (Featire specs)
>>>>>>> b904d7ae (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
>>>>>>> 5507b42 (Featire specs)
>>>>>>> 5e31aeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 53db2224 (Featire specs)
=======
=======
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> 973ba8c (Featire specs)
>>>>>>> b97bb382 (Featire specs)
              options.add_argument('--allow-insecure-localhost')
=======
              options.add_argument('--window-size=1400,1400')
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
              options.add_argument('--window-size=1400,1400')
>>>>>>> 752f0c0 (Featire specs)
=======
              options.add_argument('--window-size=1400,1400')
>>>>>>> 4e81ea2 (Featire specs)
=======
              options.add_argument('--window-size=1400,1400')
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
              options.add_argument('--allow-insecure-localhost')
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 34509eee (Featire specs)
=======
              options.add_argument('--allow-insecure-localhost')
>>>>>>> 75fa7e1b (Rebased)
=======
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 53db2224 (Featire specs)
=======
>>>>>>> 7b22ad7e (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 365d41ed (Featire specs)
=======
>>>>>>> c05ee511 (Featire specs)
=======
>>>>>>> f136376a (Featire specs)
=======
>>>>>>> 1ca9c0ea (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
              options.add_argument('--window-size=1400,1400')
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
              options.add_argument('--window-size=1400,1400')
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 973ba8c (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
=======
              options.add_argument('--window-size=1400,1400')
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
=======
              options.add_argument('--window-size=1400,1400')
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
              options.add_argument('--window-size=1400,1400')
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 4e81ea2 (Featire specs)
=======
              options.add_argument('--window-size=1400,1400')
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
              options.add_argument('--allow-insecure-localhost')
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
              options.add_argument('--allow-insecure-localhost')
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> 13fca83d (Rebased)
=======
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376a (Featire specs)
=======
=======
=======
=======
              options.add_argument('--window-size=1400,1400')
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0ea (Featire specs)
=======
=======
=======
              options.add_argument('--window-size=1400,1400')
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888bf (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
=======
              options.add_argument('--allow-insecure-localhost')
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
>>>>>>> b904d7ae (Featire specs)
=======
=======
              options.add_argument('--allow-insecure-localhost')
>>>>>>> 4552227 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 393eff3b (Featire specs)
=======
=======
              options.add_argument('--allow-insecure-localhost')
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
>>>>>>> d9d85ca6 (Fix)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
              options.add_argument('--allow-insecure-localhost')
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 37e48018 (Featire specs)
=======
              options.add_argument('--allow-insecure-localhost')
>>>>>>> 11792758 (Rebased)
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
              options.add_argument('--window-size=1400,1400')
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
=======
              options.add_argument('--window-size=1400,1400')
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
=======
              options.add_argument('--window-size=1400,1400')
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
              options.add_argument('--window-size=1400,1400')
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 4e81ea2 (Featire specs)
=======
              options.add_argument('--window-size=1400,1400')
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
              options.add_argument('--allow-insecure-localhost')
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
              options.add_argument('--allow-insecure-localhost')
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> bc6bc8d2 (Rebased)
=======
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> d52f9efe (Featire specs)
=======
=======
=======
=======
              options.add_argument('--window-size=1400,1400')
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
=======
              options.add_argument('--window-size=1400,1400')
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> c12b71de (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
=======
              options.add_argument('--allow-insecure-localhost')
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> b904d7ae (Featire specs)
=======
=======
              options.add_argument('--allow-insecure-localhost')
>>>>>>> 5b7749a (Fix)
>>>>>>> ef483b6d (Fix)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
              options.add_argument('--window-size=1400,1400')
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 0676508 (Featire specs)
=======
              options.add_argument('--window-size=1400,1400')
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
=======
              options.add_argument('--window-size=1400,1400')
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
              options.add_argument('--window-size=1400,1400')
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
=======
              options.add_argument('--allow-insecure-localhost')
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
              options.add_argument('--allow-insecure-localhost')
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5e31aeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 53db2224 (Featire specs)
=======
=======
=======
=======
              options.add_argument('--window-size=1400,1400')
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
              options.add_argument('--window-size=1400,1400')
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
=======
=======
              options.add_argument('--window-size=1400,1400')
>>>>>>> 08edf50 (Featire specs)
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
=======
=======
              options.add_argument('--allow-insecure-localhost')
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
=======
=======
              options.add_argument('--allow-insecure-localhost')
>>>>>>> 4552227 (Featire specs)
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 392646b5 (Featire specs)
=======
=======
=======
              options.add_argument('--allow-insecure-localhost')
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
              options.add_argument('--window-size=1400,1400')
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
=======
              options.add_argument('--window-size=1400,1400')
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
=======
              options.add_argument('--allow-insecure-localhost')
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
        1786. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> e6fc67c7 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 73f364d8 (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> d365be68 (Manifest_cache true)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
          
      1786. 
            1
=======
>>>>>>> f92a45b (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> fb61c5a (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> 1cce66c (Manifest_cache true)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5506bd0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 7a08014b (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
>>>>>>> b3f2049 (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 11792758 (Rebased)
=======
<<<<<<< HEAD
>>>>>>> 31d15e66 (Fix)
=======
=======
>>>>>>> fdab719f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 4f4ea3f9 (Featire specs)
=======
>>>>>>> c05ee511 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
>>>>>>> 0e864a5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> cc390719 (Manifest_cache true)
=======
=======
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
>>>>>>> 0c57e4e (Fix)
<<<<<<< HEAD
>>>>>>> 8887ba5b (Fix)
=======
=======
>>>>>>> 3be4d14 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1b8f36d8 (Manifest_cache true)
=======
=======
>>>>>>> a71befd (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8a3779d4 (Manifest_cache true)
=======
=======
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
>>>>>>> 551c6ab (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 56531f25 (Manifest_cache true)
=======
=======
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
>>>>>>> fd310ed (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 86229876 (Manifest_cache true)
=======
=======
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
>>>>>>> 42e9c2e (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 16ebb0ff (Manifest_cache true)
=======
=======
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0f24a043 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
>>>>>>> c0159bf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1d0f5cbf (Manifest_cache true)
=======
=======
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> b8c2784f (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 15c51b7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 392646b5 (Featire specs)
=======
=======
>>>>>>> ca274ec (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a56ba36d (Manifest_cache true)
=======
=======
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 9e081dc (Fix)
>>>>>>> 1049b80c (Fix)
>>>>>>> b3f2049 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
=======
>>>>>>> 74240509 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e59c273d (Manifest_cache true)
=======
>>>>>>> a1a479e2 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 393eff3b (Featire specs)
=======
>>>>>>> 7afa007b (Manifest_cache true)
=======
>>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d9d85ca6 (Fix)
=======
>>>>>>> 4367ccb1 (Manifest_cache true)
=======
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
>>>>>>> b904d7ae (Featire specs)
=======
>>>>>>> 4fac471d (Manifest_cache true)
=======
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
=======
>>>>>>> ef483b6d (Fix)
>>>>>>> b28889f (Fix)
>>>>>>> 5a2009f1 (Fix)
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 49e8a6c (Rebased)
=======
<<<<<<< HEAD
>>>>>>> 872e675 (Fix)
=======
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 35d17b9 (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 64dceec (Manifest_cache true)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
>>>>>>> b28889f (Fix)
>>>>>>> fdab719f (Fix)
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 49e8a6c (Rebased)
=======
<<<<<<< HEAD
>>>>>>> 872e675 (Fix)
=======
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 35d17b9 (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 64dceec (Manifest_cache true)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
=======
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 75fa7e1b (Rebased)
=======
>>>>>>> b28889f (Fix)
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 49e8a6c (Rebased)
=======
<<<<<<< HEAD
>>>>>>> 872e675 (Fix)
=======
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 35d17b9 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> add330c (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 15bff2e (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 6c71f00 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 1d59aaa (Fix)
=======
<<<<<<< HEAD
=======
=======
>>>>>>> 715fac2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 490b01d6 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5a2009f1 (Fix)
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> 99dad91f (Fix)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 73f364d8 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 7a08014b (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> f92a45b (Featire specs)
>>>>>>> e6fc67c7 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
>>>>>>> e6fc67c7 (Featire specs)
=======
>>>>>>> 73f364d8 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 7a08014b (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
=======
>>>>>>> 715fac2 (Featire specs)
>>>>>>> fb61c5a (Featire specs)
>>>>>>> 73f364d8 (Featire specs)
          
      1787. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 7b22ad7e (Featire specs)
=======
>>>>>>> 56531f25 (Manifest_cache true)
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 86229876 (Manifest_cache true)
=======
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
>>>>>>> b8c2784f (Fix book_spec decrease quantity and price)
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b904d7ae (Featire specs)
=======
>>>>>>> 392646b5 (Featire specs)
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4fac471d (Manifest_cache true)
=======
>>>>>>> a56ba36d (Manifest_cache true)
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price)
>>>>>>> 64dceec (Manifest_cache true)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ae07231a (Featire specs)
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> bd30d038 (Manifest_cache true)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> c12b71de (Featire specs)
=======
>>>>>>> d4235040 (Manifest_cache true)
=======
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 8cbdfeb (Manifest_cache true)
>>>>>>> 4367ccb1 (Manifest_cache true)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
>>>>>>> b904d7ae (Featire specs)
=======
>>>>>>> 64dceec (Manifest_cache true)
>>>>>>> 4fac471d (Manifest_cache true)
=======
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> fd310ed (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 86229876 (Manifest_cache true)
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
>>>>>>> 42e9c2e (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 16ebb0ff (Manifest_cache true)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0f24a043 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
>>>>>>> c0159bf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1d0f5cbf (Manifest_cache true)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> b8c2784f (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> 15c51b7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 392646b5 (Featire specs)
=======
=======
=======
>>>>>>> b15044a (Manifest_cache true)
>>>>>>> ca274ec (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a56ba36d (Manifest_cache true)
=======
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
>>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price)
          
      1788. 
>>>>>>> 59d75f9 (Featire specs)
=======
          
      1789. 
>>>>>>> 6da9530 (Featire specs)
=======
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 551c6ab (Manifest_cache true)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 973ba8c (Featire specs)
          
      1790. 
>>>>>>> 59d75f9 (Featire specs)
>>>>>>> 51bc18c (Featire specs)
            
=======
<<<<<<< HEAD
          
      1791. 
            1
=======
          
      1792. 
            
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
=======
>>>>>>> 715fac2 (Featire specs)
>>>>>>> fb61c5a (Featire specs)
=======
=======
          
      1793. 
            1
>>>>>>> 752f0c0 (Featire specs)
=======
          
      1794. 
            
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
      1795. 
            1
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      1796. 
            
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
      1797. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
>>>>>>> fb61c5a (Featire specs)
>>>>>>> 73f364d8 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 9bfbd88 (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
>>>>>>> 9bfbd88 (Featire specs)
<<<<<<< HEAD
=======
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 6da9530 (Featire specs)
=======
=======
          
      1798. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
      1799. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 72b9cab (Featire specs)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
>>>>>>> bb5c652 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
          
      1800. 
            1
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
>>>>>>> 9a49b7b (Rebased)
=======
>>>>>>> 009401d (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
          
      1801. 
            
>>>>>>> b9cc4e9 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
>>>>>>> 78717cc (Manifest_cache true)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> e5890c2 (Manifest_cache true)
<<<<<<< HEAD
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> c8cdb08 (Manifest_cache true)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
>>>>>>> e5890c2 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 251144b4 (Manifest_cache true)
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
=======
=======
=======
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
          
      1802. 
            
=======
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
          
      1803. 
            
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> c8cdb08 (Manifest_cache true)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 86d584a (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 0b43b18 (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
          
      1804. 
            
=======
<<<<<<< HEAD
>>>>>>> 0ed7f7c (Featire specs)
=======
          
      1805. 
            
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
>>>>>>> a71befd (Manifest_cache true)
<<<<<<< HEAD
          
      1806. 
            1
=======
          
      1807. 
            
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6fa625b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 98beee2 (Manifest_cache true)
=======
=======
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
          
      1808. 
            1
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ae409ca (Featire specs)
=======
=======
=======
          
      1809. 
            
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> c8cdb08 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 385b8df (Manifest_cache true)
=======
=======
=======
          
      1810. 
            1
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 379a979 (Featire specs)
=======
=======
=======
          
      1811. 
            
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 7bc7f9f (Manifest_cache true)
=======
=======
=======
          
      1812. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> adc21e0 (Featire specs)
=======
=======
=======
          
      1813. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 24b58e6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 84d0df6 (Manifest_cache true)
=======
=======
=======
          
      1814. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
=======
=======
=======
          
      1815. 
            1
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d90e3d (Featire specs)
=======
=======
=======
          
      1816. 
            
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 00f8b58 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 450f4e3 (Manifest_cache true)
=======
=======
=======
          
      1817. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
=======
=======
          
      1818. 
            
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
>>>>>>> aa3618b (Rebased)
=======
=======
          
      1819. 
            1
>>>>>>> a5d032d (Fix)
>>>>>>> 160fb15 (Fix)
=======
>>>>>>> 824bb2b (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
=======
=======
>>>>>>> d782a28 (Manifest_cache true)
>>>>>>> a304bcf (Manifest_cache true)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
>>>>>>> 824ea7c9 (Manifest_cache true)
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
          
      1820. 
            
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8cdb08 (Manifest_cache true)
=======
=======
>>>>>>> c4adab0 (Featire specs)
=======
          
      1821. 
            1
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
          
      1822. 
            
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 35d17b9 (Manifest_cache true)
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
          
      1823. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
=======
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
          
      1824. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 24b58e6 (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
      1825. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> e3e66f3 (Featire specs)
          
      1826. 
            1
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 8cbdfeb (Manifest_cache true)
>>>>>>> 9c0d812 (Featire specs)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
          
      1827. 
            
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bd30d038 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 4367ccb1 (Manifest_cache true)
>>>>>>> 00f8b58 (Manifest_cache true)
=======
=======
<<<<<<< HEAD
>>>>>>> 00f8b58 (Manifest_cache true)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
      1828. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> b904d7ae (Featire specs)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 49e8a6c (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      1829. 
            
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      1830. 
            1
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> c59d1a99 (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
>>>>>>> e5890c2 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
          
      1831. 
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> bc6bc8d2 (Rebased)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> 8288136d (Fix)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      1832. 
            
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b719333 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d34a0770 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> bf137e4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 824ea7c9 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a304bcf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> bd30d038 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> c12b71de (Featire specs)
=======
=======
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
>>>>>>> 35d17b9 (Manifest_cache true)
>>>>>>> 255dd8d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d4235040 (Manifest_cache true)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4367ccb1 (Manifest_cache true)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
      1833. 
            1
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b904d7ae (Featire specs)
=======
=======
=======
=======
          
      1834. 
            
>>>>>>> 998f08d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 64dceec (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4fac471d (Manifest_cache true)
=======
=======
=======
=======
          
      1835. 
            1
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
            
=======
          
      1836. 
            
<<<<<<< HEAD
>>>>>>> 1c3ace6 (Manifest_cache true)
=======

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
              options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess')
>>>>>>> bc6bc8d2 (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
          
      1837. 
            1
=======
          
      1838. 
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 36356d3 (Featire specs)
              options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess')
>>>>>>> f7852d17 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
>>>>>>> d52f9efe (Featire specs)
=======
=======
              options.add_argument('--allow-insecure-localhost')
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
              options.add_argument('--allow-insecure-localhost')
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
=======
=======
=======
              options.add_argument('--allow-insecure-localhost')
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
=======
              options.add_argument('--allow-insecure-localhost')
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
              options.add_argument('--allow-insecure-localhost')
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 4e81ea2 (Featire specs)
=======
              options.add_argument('--allow-insecure-localhost')
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
=======
              options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess')
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
=======
=======
              options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess')
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
=======
=======
=======
              options.add_argument('--allow-insecure-localhost')
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
=======
=======
              options.add_argument('--allow-insecure-localhost')
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
              options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess')
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
              options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess')
>>>>>>> 4552227 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
          
        1839. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bc6bc8d2 (Rebased)
=======
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
          
      1839. 
            1
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 49e8a6c (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> 872e675 (Fix)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8288136d (Fix)
=======
>>>>>>> e9f3851 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 824ea7c9 (Manifest_cache true)
=======
>>>>>>> af057e3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> d782a28 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bd30d038 (Manifest_cache true)
=======
>>>>>>> 96394f1 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c12b71de (Featire specs)
=======
>>>>>>> 35d17b9 (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 64dceec (Manifest_cache true)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> d4235040 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
=======
=======
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
          
      1840. 
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 64dceec (Manifest_cache true)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      1841. 
>>>>>>> 59d75f9 (Featire specs)
            
=======
<<<<<<< HEAD
          
      1842. 
            1
=======
          
      1843. 
>>>>>>> ebcdce06 (Featire specs)
            
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6fa625b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9d98d9ab (Featire specs)
>>>>>>> 98beee2 (Manifest_cache true)
=======
=======
>>>>>>> 009401d (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
          
      1844. 
            1
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9d98d9ab (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ae409ca (Featire specs)
=======
=======
=======
          
      1845. 
            
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> c8cdb08 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 385b8df (Manifest_cache true)
=======
=======
=======
          
      1846. 
            1
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 379a979 (Featire specs)
=======
=======
=======
          
      1847. 
            
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 7bc7f9f (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 490b01d6 (Manifest_cache true)
=======
=======
=======
=======
          
      1848. 
            1
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 3723aad (Featire specs)
>>>>>>> adc21e0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
=======
=======
          
      1849. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 24b58e6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 84d0df6 (Manifest_cache true)
=======
=======
=======
          
      1850. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
=======
=======
=======
          
      1851. 
            1
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 4d90e3d (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
=======
=======
          
      1852. 
            
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 00f8b58 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 450f4e3 (Manifest_cache true)
=======
=======
=======
          
      1853. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
>>>>>>> 11792758 (Rebased)
=======
=======
          
      1854. 
            
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> aa3618b (Rebased)
<<<<<<< HEAD
>>>>>>> 75fa7e1b (Rebased)
=======
=======
>>>>>>> aa3618b (Rebased)
>>>>>>> 31d15e66 (Fix)
=======
=======
          
      1855. 
            1
>>>>>>> a5d032d (Fix)
>>>>>>> 160fb15 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
=======
=======
>>>>>>> d782a28 (Manifest_cache true)
>>>>>>> a304bcf (Manifest_cache true)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
          
      1856. 
            
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8cdb08 (Manifest_cache true)
=======
=======
>>>>>>> c4adab0 (Featire specs)
=======
          
      1857. 
            1
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
          
      1858. 
            
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 35d17b9 (Manifest_cache true)
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
          
      1859. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
=======
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
          
      1860. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 24b58e6 (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
      1861. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> e3e66f3 (Featire specs)
          
      1862. 
            1
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 8cbdfeb (Manifest_cache true)
>>>>>>> 9c0d812 (Featire specs)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
          
      1863. 
            
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 00f8b58 (Manifest_cache true)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
      1864. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      1865. 
            
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      1866. 
            1
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e5890c2 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 251144b4 (Manifest_cache true)
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> 13fca83d (Rebased)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> ae884b47 (Fix)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      1867. 
            
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b719333 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0341d6de (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> bf137e4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 21793167 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0ea (Featire specs)
=======
=======
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a304bcf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d245196f (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888bf (Featire specs)
=======
=======
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
>>>>>>> 35d17b9 (Manifest_cache true)
>>>>>>> 255dd8d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 304cd28a (Manifest_cache true)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 74240509 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e59c273d (Manifest_cache true)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a1a479e2 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
      1868. 
            1
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 393eff3b (Featire specs)
=======
=======
=======
=======
          
      1869. 
            
>>>>>>> 998f08d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 64dceec (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 7afa007b (Manifest_cache true)
=======
=======
=======
=======
          
      1870. 
            1
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> ef483b6d (Fix)
=======
=======
          
      1871. 
            1
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d9d85ca6 (Fix)
=======
          
      1872. 
            1
>>>>>>> c7a726c5 (Rebased)
=======
=======
=======
          
      1873. 
            1
>>>>>>> 752f0c0 (Featire specs)
=======
          
      1874. 
            
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
      1875. 
            1
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      1876. 
            
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
      1877. 
            1
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 9bfbd88 (Featire specs)
>>>>>>> ebcdce06 (Featire specs)
=======
=======
>>>>>>> 610b6138 (Featire specs)
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 7bc7f9f (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> c59d1a99 (Manifest_cache true)
=======
=======
=======
=======
          
      1878. 
            1
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 3723aad (Featire specs)
>>>>>>> adc21e0 (Featire specs)
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> 37e48018 (Featire specs)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
      1879. 
            1
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 4d90e3d (Featire specs)
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
>>>>>>> aa3618b (Rebased)
>>>>>>> 11792758 (Rebased)
=======
>>>>>>> 31d15e66 (Fix)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
=======
=======
          
      1880. 
            
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> c8cdb08 (Manifest_cache true)
=======
=======
          
      1881. 
            1
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
=======
          
      1882. 
            
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
=======
          
      1883. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
=======
=======
          
      1884. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 24b58e6 (Manifest_cache true)
=======
=======
          
      1885. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
          
      1886. 
            1
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
=======
=======
          
      1887. 
            
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 00f8b58 (Manifest_cache true)
=======
=======
          
      1888. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
          
      1889. 
            
>>>>>>> bf554f4 (Rebased)
=======
          
      1890. 
            1
>>>>>>> a5d032d (Fix)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> fdab719f (Fix)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e5890c2 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> ef483b6d (Fix)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
>>>>>>> a71befd (Manifest_cache true)
=======
>>>>>>> 3cf8dd4 (Featire specs)
>>>>>>> 6fa625b (Manifest_cache true)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
          
      1891. 
            1
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> d782a28 (Manifest_cache true)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
          
      1892. 
            
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8cdb08 (Manifest_cache true)
=======
=======
>>>>>>> c4adab0 (Featire specs)
=======
          
      1893. 
            1
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
          
      1894. 
            
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 35d17b9 (Manifest_cache true)
=======
>>>>>>> ee5242b (Featire specs)
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
          
      1895. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
          
      1896. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 24b58e6 (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
      1897. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
=======
          
      1898. 
            1
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
          
      1899. 
            
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 00f8b58 (Manifest_cache true)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
      1900. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 49e8a6c (Rebased)
=======
          
      1901. 
            
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
          
      1902. 
            1
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0e864a5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> cc390719 (Manifest_cache true)
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 0c57e4e (Fix)
<<<<<<< HEAD
>>>>>>> 8887ba5b (Fix)
=======
=======
=======
=======
          
      1903. 
            
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 3be4d14 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1b8f36d8 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a71befd (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8a3779d4 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 551c6ab (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 56531f25 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 35d17b9 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> fd310ed (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 86229876 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> add330c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 42e9c2e (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 16ebb0ff (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0f24a043 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 15bff2e (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> c0159bf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1d0f5cbf (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> b8c2784f (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
=======
          
      1904. 
            1
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 392646b5 (Featire specs)
=======
=======
=======
=======
=======
          
      1905. 
            
>>>>>>> 998f08d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 6c71f00 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> ca274ec (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a56ba36d (Manifest_cache true)
=======
=======
=======
=======
=======
          
      1906. 
            1
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
      1907. 
            1
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 715fac2 (Featire specs)
<<<<<<< HEAD
>>>>>>> fb61c5a (Featire specs)
<<<<<<< HEAD
>>>>>>> 73f364d8 (Featire specs)
=======
=======
=======
>>>>>>> 6fa625b (Manifest_cache true)
=======
=======
          
      1908. 
            1
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
=======
=======
          
      1909. 
            
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> c8cdb08 (Manifest_cache true)
=======
=======
          
      1910. 
            1
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
=======
          
      1911. 
            
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0b43b18 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1cce66c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d365be68 (Manifest_cache true)
=======
=======
=======
=======
=======
          
      1912. 
            1
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
=======
=======
          
      1913. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 24b58e6 (Manifest_cache true)
=======
=======
          
      1914. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
          
      1915. 
            1
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 365d41ed (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
>>>>>>> 13fca83d (Rebased)
=======
>>>>>>> f136376a (Featire specs)
=======
>>>>>>> 1ca9c0ea (Featire specs)
=======
>>>>>>> 4bf888bf (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 393eff3b (Featire specs)
=======
>>>>>>> d9d85ca6 (Fix)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> ef483b6d (Fix)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> bdc24a1a (Rebased)
=======
>>>>>>> 53db2224 (Featire specs)
=======
>>>>>>> 7b22ad7e (Featire specs)
=======
>>>>>>> b97bb382 (Featire specs)
=======
>>>>>>> 4a2f2ad8 (Featire specs)
=======
>>>>>>> 21873de0 (Featire specs)
=======
>>>>>>> 392646b5 (Featire specs)
=======
>>>>>>> 1049b80c (Fix)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> e055dd0 (Rebased)
=======
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 973ba8c (Featire specs)
=======
>>>>>>> 8181d13 (Featire specs)
=======
>>>>>>> 72b9cab (Featire specs)
=======
>>>>>>> 15c51b7 (Featire specs)
=======
>>>>>>> 9e081dc (Fix)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> 53db2224 (Featire specs)
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376a (Featire specs)
=======
=======
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1ca9c0ea (Featire specs)
=======
=======
>>>>>>> 7b22ad7e (Featire specs)
=======
>>>>>>> b97bb382 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888bf (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> efd6af09 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 392646b5 (Featire specs)
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
              options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess')
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
              options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess')
=======
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 393eff3b (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> 37e48018 (Featire specs)
=======
              options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess')
=======
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
>>>>>>> 5507b42 (Featire specs)
>>>>>>> 5e31aeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 53db2224 (Featire specs)
=======
=======
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> 973ba8c (Featire specs)
>>>>>>> b97bb382 (Featire specs)
              options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess')
=======
              options.add_argument('--allow-insecure-localhost')
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
              options.add_argument('--allow-insecure-localhost')
>>>>>>> 752f0c0 (Featire specs)
=======
              options.add_argument('--allow-insecure-localhost')
>>>>>>> 4e81ea2 (Featire specs)
=======
              options.add_argument('--allow-insecure-localhost')
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
              options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess')
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 34509eee (Featire specs)
=======
              options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess')
>>>>>>> 75fa7e1b (Rebased)
=======
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 53db2224 (Featire specs)
=======
>>>>>>> 7b22ad7e (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 365d41ed (Featire specs)
=======
>>>>>>> c05ee511 (Featire specs)
=======
>>>>>>> f136376a (Featire specs)
=======
>>>>>>> 1ca9c0ea (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
              options.add_argument('--allow-insecure-localhost')
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
              options.add_argument('--allow-insecure-localhost')
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 973ba8c (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
=======
              options.add_argument('--allow-insecure-localhost')
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
=======
              options.add_argument('--allow-insecure-localhost')
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
              options.add_argument('--allow-insecure-localhost')
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 4e81ea2 (Featire specs)
=======
              options.add_argument('--allow-insecure-localhost')
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
              options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess')
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
              options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess')
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> 13fca83d (Rebased)
=======
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376a (Featire specs)
=======
=======
=======
=======
              options.add_argument('--allow-insecure-localhost')
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0ea (Featire specs)
=======
=======
=======
              options.add_argument('--allow-insecure-localhost')
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888bf (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
=======
              options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess')
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
              options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess')
>>>>>>> 4552227 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 393eff3b (Featire specs)
=======
=======
              options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess')
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
>>>>>>> d9d85ca6 (Fix)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
              options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess')
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 37e48018 (Featire specs)
=======
              options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess')
>>>>>>> 11792758 (Rebased)
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
              options.add_argument('--allow-insecure-localhost')
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
=======
              options.add_argument('--allow-insecure-localhost')
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
              options.add_argument('--allow-insecure-localhost')
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
              options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess')
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
              options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess')
>>>>>>> 5b7749a (Fix)
>>>>>>> ef483b6d (Fix)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
              options.add_argument('--allow-insecure-localhost')
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 0676508 (Featire specs)
=======
              options.add_argument('--allow-insecure-localhost')
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
=======
              options.add_argument('--allow-insecure-localhost')
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
              options.add_argument('--allow-insecure-localhost')
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
=======
              options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess')
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
              options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess')
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5e31aeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 53db2224 (Featire specs)
=======
=======
=======
=======
              options.add_argument('--allow-insecure-localhost')
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
              options.add_argument('--allow-insecure-localhost')
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
=======
=======
              options.add_argument('--allow-insecure-localhost')
>>>>>>> 08edf50 (Featire specs)
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
=======
=======
              options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess')
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
=======
=======
              options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess')
>>>>>>> 4552227 (Featire specs)
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 392646b5 (Featire specs)
=======
=======
=======
              options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess')
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
              options.add_argument('--allow-insecure-localhost')
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
=======
              options.add_argument('--allow-insecure-localhost')
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
>>>>>>> afa56d1 (Featire specs)
>>>>>>> e1ecabbe (Featire specs)
          
        1916. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> e6fc67c7 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 73f364d8 (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> d365be68 (Manifest_cache true)
=======
>>>>>>> e1ecabbe (Featire specs)
          
      1916. 
            1
=======
>>>>>>> f92a45b (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> fb61c5a (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> 1cce66c (Manifest_cache true)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 7a08014b (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
>>>>>>> b3f2049 (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 11792758 (Rebased)
=======
<<<<<<< HEAD
>>>>>>> 31d15e66 (Fix)
=======
=======
>>>>>>> fdab719f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 4f4ea3f9 (Featire specs)
=======
>>>>>>> c05ee511 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
>>>>>>> 0e864a5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> cc390719 (Manifest_cache true)
=======
=======
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
>>>>>>> 0c57e4e (Fix)
<<<<<<< HEAD
>>>>>>> 8887ba5b (Fix)
=======
=======
>>>>>>> 3be4d14 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1b8f36d8 (Manifest_cache true)
=======
=======
>>>>>>> a71befd (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8a3779d4 (Manifest_cache true)
=======
=======
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
>>>>>>> 551c6ab (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 56531f25 (Manifest_cache true)
=======
=======
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
>>>>>>> fd310ed (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 86229876 (Manifest_cache true)
=======
=======
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
>>>>>>> 42e9c2e (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 16ebb0ff (Manifest_cache true)
=======
=======
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0f24a043 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
>>>>>>> c0159bf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1d0f5cbf (Manifest_cache true)
=======
=======
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> b8c2784f (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 15c51b7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 392646b5 (Featire specs)
=======
=======
>>>>>>> ca274ec (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a56ba36d (Manifest_cache true)
=======
=======
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 9e081dc (Fix)
>>>>>>> 1049b80c (Fix)
>>>>>>> b3f2049 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
=======
>>>>>>> 74240509 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e59c273d (Manifest_cache true)
=======
>>>>>>> a1a479e2 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 393eff3b (Featire specs)
=======
>>>>>>> 7afa007b (Manifest_cache true)
=======
>>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d9d85ca6 (Fix)
=======
>>>>>>> ef483b6d (Fix)
>>>>>>> b28889f (Fix)
>>>>>>> 5a2009f1 (Fix)
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 49e8a6c (Rebased)
=======
<<<<<<< HEAD
>>>>>>> 872e675 (Fix)
=======
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 35d17b9 (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 64dceec (Manifest_cache true)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
=======
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
>>>>>>> fdab719f (Fix)
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
=======
>>>>>>> d34a0770 (Manifest_cache true)
=======
>>>>>>> ef483b6d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 75fa7e1b (Rebased)
=======
>>>>>>> b28889f (Fix)
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 49e8a6c (Rebased)
=======
<<<<<<< HEAD
>>>>>>> 872e675 (Fix)
=======
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 35d17b9 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> add330c (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 15bff2e (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 6c71f00 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 1d59aaa (Fix)
=======
<<<<<<< HEAD
=======
=======
>>>>>>> 715fac2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 490b01d6 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5a2009f1 (Fix)
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> 99dad91f (Fix)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 73f364d8 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> f92a45b (Featire specs)
>>>>>>> e6fc67c7 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
>>>>>>> e6fc67c7 (Featire specs)
=======
>>>>>>> 73f364d8 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 7a08014b (Featire specs)
=======
=======
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
=======
>>>>>>> 715fac2 (Featire specs)
>>>>>>> fb61c5a (Featire specs)
>>>>>>> 73f364d8 (Featire specs)
          
      1917. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 64dceec (Manifest_cache true)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
>>>>>>> 551c6ab (Manifest_cache true)
=======
>>>>>>> 973ba8c (Featire specs)
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
>>>>>>> fd310ed (Manifest_cache true)
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> 8181d13 (Featire specs)
=======
>>>>>>> 42e9c2e (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> 72b9cab (Featire specs)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
>>>>>>> c0159bf (Manifest_cache true)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> 15c51b7 (Featire specs)
=======
=======
>>>>>>> b15044a (Manifest_cache true)
>>>>>>> ca274ec (Manifest_cache true)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
          
      1918. 
>>>>>>> 59d75f9 (Featire specs)
=======
          
      1919. 
>>>>>>> 6da9530 (Featire specs)
=======
          
      1920. 
>>>>>>> 59d75f9 (Featire specs)
>>>>>>> 51bc18c (Featire specs)
            
=======
<<<<<<< HEAD
          
      1921. 
            1
=======
          
      1922. 
            
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
=======
>>>>>>> 715fac2 (Featire specs)
>>>>>>> fb61c5a (Featire specs)
=======
=======
          
      1923. 
            1
>>>>>>> 752f0c0 (Featire specs)
=======
          
      1924. 
            
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
      1925. 
            1
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      1926. 
            
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
      1927. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
>>>>>>> fb61c5a (Featire specs)
>>>>>>> 73f364d8 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 9bfbd88 (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
>>>>>>> 9bfbd88 (Featire specs)
<<<<<<< HEAD
=======
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 6da9530 (Featire specs)
=======
=======
          
      1928. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
      1929. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> bb5c652 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
          
      1930. 
            1
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
>>>>>>> 9a49b7b (Rebased)
=======
>>>>>>> 009401d (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
          
      1931. 
            
>>>>>>> b9cc4e9 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
>>>>>>> 78717cc (Manifest_cache true)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> e5890c2 (Manifest_cache true)
<<<<<<< HEAD
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> c8cdb08 (Manifest_cache true)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
>>>>>>> e5890c2 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 251144b4 (Manifest_cache true)
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> c59d1a99 (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
>>>>>>> e5890c2 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
          
      1932. 
            
=======
          
      1933. 
            
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> c8cdb08 (Manifest_cache true)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 86d584a (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 0b43b18 (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
          
      1934. 
            
=======
<<<<<<< HEAD
>>>>>>> 0ed7f7c (Featire specs)
=======
          
      1935. 
            
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
>>>>>>> a71befd (Manifest_cache true)
<<<<<<< HEAD
          
      1936. 
            1
=======
          
      1937. 
            
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6fa625b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 98beee2 (Manifest_cache true)
=======
=======
>>>>>>> 009401d (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
          
      1938. 
            1
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> ae409ca (Featire specs)
=======
=======
=======
          
      1939. 
            
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> c8cdb08 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 385b8df (Manifest_cache true)
=======
=======
=======
          
      1940. 
            1
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 379a979 (Featire specs)
=======
=======
=======
          
      1941. 
            
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 7bc7f9f (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 490b01d6 (Manifest_cache true)
=======
=======
=======
=======
          
      1942. 
            1
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 3723aad (Featire specs)
>>>>>>> adc21e0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
=======
=======
          
      1943. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 24b58e6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 84d0df6 (Manifest_cache true)
=======
=======
=======
          
      1944. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
=======
=======
=======
          
      1945. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 11792758 (Rebased)
=======
=======
          
      1946. 
            
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> aa3618b (Rebased)
<<<<<<< HEAD
>>>>>>> 75fa7e1b (Rebased)
=======
=======
>>>>>>> aa3618b (Rebased)
>>>>>>> 31d15e66 (Fix)
=======
=======
          
      1947. 
            1
>>>>>>> a5d032d (Fix)
>>>>>>> 160fb15 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
=======
=======
>>>>>>> d782a28 (Manifest_cache true)
>>>>>>> a304bcf (Manifest_cache true)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
          
      1948. 
            
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8cdb08 (Manifest_cache true)
=======
=======
>>>>>>> c4adab0 (Featire specs)
=======
          
      1949. 
            1
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
          
      1950. 
            
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 35d17b9 (Manifest_cache true)
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
          
      1951. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
=======
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
          
      1952. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 24b58e6 (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
      1953. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
      1954. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      1955. 
            
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      1956. 
            1
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e5890c2 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 251144b4 (Manifest_cache true)
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> 13fca83d (Rebased)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> ae884b47 (Fix)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      1957. 
            
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b719333 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0341d6de (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> bf137e4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 21793167 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0ea (Featire specs)
=======
=======
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a304bcf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d245196f (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888bf (Featire specs)
=======
=======
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
>>>>>>> 35d17b9 (Manifest_cache true)
>>>>>>> 255dd8d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 304cd28a (Manifest_cache true)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 74240509 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a1a479e2 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
      1958. 
            1
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
      1959. 
            1
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
>>>>>>> d9d85ca6 (Fix)
=======
          
      1960. 
            1
>>>>>>> c7a726c5 (Rebased)
=======
=======
>>>>>>> 610b6138 (Featire specs)
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 7bc7f9f (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> c59d1a99 (Manifest_cache true)
=======
=======
=======
=======
          
      1961. 
            1
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 3723aad (Featire specs)
>>>>>>> adc21e0 (Featire specs)
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
      1962. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
>>>>>>> aa3618b (Rebased)
>>>>>>> 11792758 (Rebased)
=======
>>>>>>> 31d15e66 (Fix)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
=======
=======
>>>>>>> d782a28 (Manifest_cache true)
>>>>>>> a304bcf (Manifest_cache true)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
          
      1963. 
            
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8cdb08 (Manifest_cache true)
=======
=======
>>>>>>> c4adab0 (Featire specs)
=======
          
      1964. 
            1
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
          
      1965. 
            
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 35d17b9 (Manifest_cache true)
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
          
      1966. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
=======
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
          
      1967. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 24b58e6 (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
      1968. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
      1969. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      1970. 
            
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      1971. 
            1
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> fdab719f (Fix)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e5890c2 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> bc6bc8d2 (Rebased)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> 8288136d (Fix)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      1972. 
            
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b719333 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d34a0770 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> bf137e4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 824ea7c9 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a304bcf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> bd30d038 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> c12b71de (Featire specs)
=======
=======
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
>>>>>>> 35d17b9 (Manifest_cache true)
>>>>>>> 255dd8d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d4235040 (Manifest_cache true)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
      1973. 
            1
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
      1974. 
            1
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
>>>>>>> ef483b6d (Fix)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
>>>>>>> a71befd (Manifest_cache true)
=======
>>>>>>> 3cf8dd4 (Featire specs)
>>>>>>> 6fa625b (Manifest_cache true)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
          
      1975. 
            1
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> d782a28 (Manifest_cache true)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
          
      1976. 
            
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8cdb08 (Manifest_cache true)
=======
=======
>>>>>>> c4adab0 (Featire specs)
=======
          
      1977. 
            1
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
          
      1978. 
            
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 35d17b9 (Manifest_cache true)
=======
>>>>>>> ee5242b (Featire specs)
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
          
      1979. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
          
      1980. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 24b58e6 (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
          
      1981. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
      1982. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 49e8a6c (Rebased)
=======
          
      1983. 
            
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
          
      1984. 
            1
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0e864a5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> cc390719 (Manifest_cache true)
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 0c57e4e (Fix)
<<<<<<< HEAD
>>>>>>> 8887ba5b (Fix)
=======
=======
=======
=======
          
      1985. 
            
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 3be4d14 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1b8f36d8 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a71befd (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8a3779d4 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 551c6ab (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 56531f25 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 35d17b9 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> fd310ed (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 86229876 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> add330c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 42e9c2e (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 16ebb0ff (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0f24a043 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> b8c2784f (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
=======
          
      1986. 
            1
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
      1987. 
            1
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 715fac2 (Featire specs)
<<<<<<< HEAD
>>>>>>> fb61c5a (Featire specs)
<<<<<<< HEAD
>>>>>>> 73f364d8 (Featire specs)
=======
=======
=======
>>>>>>> 6fa625b (Manifest_cache true)
=======
=======
          
      1988. 
            1
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
>>>>>>> 3cf8dd4 (Featire specs)
>>>>>>> aa4361fd (Featire specs)
            

            

<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 311e9fa (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bf05825 (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> bf05825 (Featire specs)
=======
>>>>>>> c12b71de (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> e055dd0 (Rebased)
=======
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
>>>>>>> 5e31aeb (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 53db2224 (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
>>>>>>> 973ba8c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
>>>>>>> 8181d13 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
>>>>>>> 9e081dc (Fix)
=======
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> 53db2224 (Featire specs)
>>>>>>> 311e9fa (Rebased)
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> 7b22ad7e (Featire specs)
>>>>>>> 932dbec (Featire specs)
=======
=======
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c12b71de (Featire specs)
=======
>>>>>>> b97bb382 (Featire specs)
>>>>>>> 77d62af (Featire specs)
=======
=======
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5b7749a (Fix)
=======
<<<<<<< HEAD
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> 11792758 (Rebased)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 311e9fa (Rebased)
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> 932dbec (Featire specs)
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> c12b71de (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 5b7749a (Fix)
>>>>>>> ef483b6d (Fix)
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
>>>>>>> 49e8a6c (Rebased)
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
=======
>>>>>>> 5507b42 (Featire specs)
>>>>>>> 5e31aeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 53db2224 (Featire specs)
=======
=======
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
=======
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
=======
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
>>>>>>> 3cf8dd4 (Featire specs)
>>>>>>> aa4361fd (Featire specs)
              options.add_argument('--ignore-certificate-errors=true')
=======
              options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess')
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
              options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess')
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
              options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess')
>>>>>>> 4e81ea2 (Featire specs)
=======
              options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess')
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
=======
=======
              options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess')
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
=======
=======
=======
              options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess')
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
              options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess')
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
=======
              options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess')
=======
>>>>>>> 6b6d1c2d (Featire specs)
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
              options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess')
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
              options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess')
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
=======
              options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess')
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
              options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess')
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
              options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess')
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
=======
              options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess')
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
        1989. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c59d1a99 (Manifest_cache true)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> 7a08014b (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> e6fc67c7 (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> cc390719 (Manifest_cache true)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> 73f364d8 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> c51bf93 (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> e5890c2 (Manifest_cache true)
=======
>>>>>>> 9440753 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> c51bf93 (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> e5890c2 (Manifest_cache true)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
>>>>>>> f92a45b (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> 0e864a5 (Manifest_cache true)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> fb61c5a (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 715fac2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f92a45b (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
>>>>>>> fb61c5a (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 659083f (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> df37394 (Featire specs)
>>>>>>> 7a08014b (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 73f364d8 (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 6da9530 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 715fac2 (Featire specs)
<<<<<<< HEAD
>>>>>>> fb61c5a (Featire specs)
<<<<<<< HEAD
>>>>>>> 73f364d8 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 2a25e4c (Featire specs)
>>>>>>> 216fe41 (Featire specs)
>>>>>>> f3d746cb (Featire specs)
          
      1989. 
            
=======
<<<<<<< HEAD
          
      1990. 
            1
=======
          
      1991. 
            
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
=======
          
      1992. 
            1
>>>>>>> 752f0c0 (Featire specs)
=======
          
      1993. 
            
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
      1994. 
            1
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
=======
          
      1995. 
            
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
      1996. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> e6fc67c7 (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> fb61c5a (Featire specs)
>>>>>>> 73f364d8 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 2a25e4c (Featire specs)
>>>>>>> 216fe41 (Featire specs)
>>>>>>> f3d746cb (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
=======
          
      1997. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
      1998. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
          
      1999. 
            1
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> c8cdb08 (Manifest_cache true)
=======
>>>>>>> b832d45 (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
=======
=======
>>>>>>> c59d1a99 (Manifest_cache true)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 4a0e3b6 (Manifest_cache true)
          
      2000. 
            
<<<<<<< HEAD
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
=======
          
      2001. 
            1
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
=======
          
      2002. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 24b58e6 (Manifest_cache true)
=======
=======
          
      2003. 
            1
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
=======
          
      2004. 
            
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 00f8b58 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
>>>>>>> 659083f (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
=======
<<<<<<< HEAD
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
=======
=======
>>>>>>> c8cdb08 (Manifest_cache true)
=======
>>>>>>> b832d45 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 4a0e3b6 (Manifest_cache true)
>>>>>>> 86d584a (Manifest_cache true)
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
          
      2005. 
            
=======
<<<<<<< HEAD
          
      2006. 
            1
=======
>>>>>>> 5506bd0 (Featire specs)
          
      2007. 
            
<<<<<<< HEAD
>>>>>>> b9cc4e9 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
=======
=======
          
      2008. 
            1
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
          
      2009. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 24b58e6 (Manifest_cache true)
=======
=======
          
      2010. 
            1
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 715fac2 (Featire specs)
<<<<<<< HEAD
>>>>>>> fb61c5a (Featire specs)
<<<<<<< HEAD
>>>>>>> 73f364d8 (Featire specs)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
=======
          
      2011. 
            
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0b43b18 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1cce66c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d365be68 (Manifest_cache true)
=======
=======
=======
=======
=======
          
      2012. 
            1
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 3723aad (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
>>>>>>> afa56d1 (Featire specs)
>>>>>>> e1ecabbe (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 490b01d6 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
>>>>>>> 75fa7e1b (Rebased)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84809242 (Featire specs)
=======
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 37e48018 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
>>>>>>> 11792758 (Rebased)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
>>>>>>> bf554f4 (Rebased)
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5e31aeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 53db2224 (Featire specs)
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
>>>>>>> 51bc18c (Featire specs)
>>>>>>> 7b22ad7e (Featire specs)
              options.add_argument('--ignore-certificate-errors=true')
=======
              options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess')
>>>>>>> d0dc1f1 (Featire specs)
=======
              options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess')
>>>>>>> 752f0c0 (Featire specs)
          
        2013. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 490b01d6 (Manifest_cache true)
=======
>>>>>>> 6e923b9d (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 75fa7e1b (Rebased)
=======
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
>>>>>>> ebcdce06 (Featire specs)
=======
>>>>>>> c59d1a99 (Manifest_cache true)
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 11792758 (Rebased)
=======
>>>>>>> 31d15e66 (Fix)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> cc390719 (Manifest_cache true)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> bdc24a1a (Rebased)
=======
>>>>>>> 8887ba5b (Fix)
=======
>>>>>>> 1b8f36d8 (Manifest_cache true)
=======
>>>>>>> 7b22ad7e (Featire specs)
          
      2013. 
            1
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 98beee2 (Manifest_cache true)
=======
>>>>>>> 7bc7f9f (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 490b01d6 (Manifest_cache true)
=======
=======
>>>>>>> adc21e0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> 84d0df6 (Manifest_cache true)
=======
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4d90e3d (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> 450f4e3 (Manifest_cache true)
=======
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
>>>>>>> ebcdce06 (Featire specs)
=======
>>>>>>> c59d1a99 (Manifest_cache true)
=======
=======
>>>>>>> adc21e0 (Featire specs)
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 4d90e3d (Featire specs)
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
          
      2014. 
            
=======
<<<<<<< HEAD
          
      2015. 
            1
=======
          
      2016. 
            
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
=======
          
      2017. 
            1
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
=======
          
      2018. 
            
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
      2019. 
            1
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      2020. 
            
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
      2021. 
            1
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 9bfbd88 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 0ed7f7c (Featire specs)
=======
=======
          
      2022. 
            
<<<<<<< HEAD
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
      2023. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bb5c652 (Fix book_spec decrease quantity and price)
=======
=======
          
      2024. 
            1
>>>>>>> c033601 (Rebased)
>>>>>>> 9a49b7b (Rebased)
=======
          
      2025. 
            1
>>>>>>> 70fcacc (Featire specs)
=======
          
      2026. 
            
>>>>>>> 78717cc (Manifest_cache true)
=======
>>>>>>> 98beee2 (Manifest_cache true)
=======
=======
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 0ed7f7c (Featire specs)
=======
          
      2027. 
            1
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ae409ca (Featire specs)
=======
=======
          
      2028. 
            
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 385b8df (Manifest_cache true)
=======
=======
          
      2029. 
            1
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 379a979 (Featire specs)
=======
=======
          
      2030. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
=======
          
      2031. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 11792758 (Rebased)
=======
          
      2032. 
            
>>>>>>> aa3618b (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 75fa7e1b (Rebased)
=======
=======
>>>>>>> 31d15e66 (Fix)
=======
          
      2033. 
            1
>>>>>>> 160fb15 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
=======
>>>>>>> 84003439 (Featire specs)
=======
          
      2034. 
            1
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
=======
=======
>>>>>>> c8cdb08 (Manifest_cache true)
=======
>>>>>>> b832d45 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 4a0e3b6 (Manifest_cache true)
>>>>>>> 86d584a (Manifest_cache true)
          
      2035. 
            
<<<<<<< HEAD
>>>>>>> b9cc4e9 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
=======
=======
          
      2036. 
            1
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
=======
          
      2037. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 24b58e6 (Manifest_cache true)
=======
=======
          
      2038. 
            1
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
>>>>>>> ebcdce06 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 11792758 (Rebased)
=======
>>>>>>> 31d15e66 (Fix)
=======
>>>>>>> 84003439 (Featire specs)
=======
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
=======
=======
>>>>>>> c8cdb08 (Manifest_cache true)
=======
>>>>>>> b832d45 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 4a0e3b6 (Manifest_cache true)
>>>>>>> 86d584a (Manifest_cache true)
          
      2039. 
            
<<<<<<< HEAD
>>>>>>> b9cc4e9 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
=======
=======
          
      2040. 
            1
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
=======
          
      2041. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 24b58e6 (Manifest_cache true)
=======
=======
          
      2042. 
            1
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
          
      2043. 
            1
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> b3f2049 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
>>>>>>> ecb02dbf (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
              options.add_argument('--ignore-certificate-errors=true')
          
        2044. 
        
        
      
        
        
<<<<<<< HEAD
          
      2044. 
            
=======
          
      2045. 
            1
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      2046. 
            
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 610b6138 (Featire specs)
=======
          
      2047. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
          
      2048. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
      2049. 
            1
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
>>>>>>> c59d1a99 (Manifest_cache true)
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> 37e48018 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 490b01d6 (Manifest_cache true)
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 34509eee (Featire specs)
=======
>>>>>>> 75fa7e1b (Rebased)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
=======
=======
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> bf05825 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
              options.add_argument('--ignore-certificate-errors=true')
=======
              options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess')
>>>>>>> d0dc1f1 (Featire specs)
=======
              options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess')
>>>>>>> 752f0c0 (Featire specs)
=======
              options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess')
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
              options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess')
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
              options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess')
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 37e48018 (Featire specs)
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
>>>>>>> 11792758 (Rebased)
=======
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
=======
=======
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> bf05825 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 973ba8c (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> 8181d13 (Featire specs)
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
>>>>>>> afa56d1 (Featire specs)
              options.add_argument('--ignore-certificate-errors=true')
=======
              options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess')
>>>>>>> d0dc1f1 (Featire specs)
=======
              options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess')
>>>>>>> 752f0c0 (Featire specs)
=======
              options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess')
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
              options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess')
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
              options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess')
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 973ba8c (Featire specs)
=======
=======
              options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess')
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 8181d13 (Featire specs)
          
        2050. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> aa7b40c (Manifest_cache true)
          
      2050. 
            
=======
          
      2051. 
            1
>>>>>>> 08edf50 (Featire specs)
=======
          
      2052. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
=======
=======
          
      2053. 
            1
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      2054. 
            
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
=======
          
      2055. 
            1
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      2056. 
            
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> 64dceec (Manifest_cache true)
            

            

<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
              options.add_argument('--ignore-certificate-errors=true')
          
        2057. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      2057. 
            
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> 659083f (Featire specs)
=======
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> e055dd0 (Rebased)
=======
>>>>>>> 0c57e4e (Fix)
=======
>>>>>>> 3be4d14 (Manifest_cache true)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 551c6ab (Manifest_cache true)
=======
>>>>>>> 973ba8c (Featire specs)
=======
>>>>>>> fd310ed (Manifest_cache true)
=======
>>>>>>> 8181d13 (Featire specs)
=======
>>>>>>> 42e9c2e (Manifest_cache true)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 0b43b18 (Manifest_cache true)
>>>>>>> 1cce66c (Manifest_cache true)
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      2058. 
            
=======
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0e864a5 (Manifest_cache true)
          
      2059. 
            1
<<<<<<< HEAD
=======
=======
<<<<<<< HEAD
          
      2060. 
            1
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
          
      2061. 
            1
>>>>>>> e3e66f3 (Featire specs)
=======
          
      2062. 
            
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
=======
          
      2063. 
            1
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
=======
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d782a28 (Manifest_cache true)
=======
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd310ed (Manifest_cache true)
=======
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> add330c (Manifest_cache true)
=======
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 35d17b9 (Manifest_cache true)
<<<<<<< HEAD
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 51bc18c (Featire specs)
=======
=======
>>>>>>> d782a28 (Manifest_cache true)
>>>>>>> 551c6ab (Manifest_cache true)
=======
>>>>>>> 973ba8c (Featire specs)
=======
>>>>>>> fd310ed (Manifest_cache true)
          
      2064. 
            
<<<<<<< HEAD
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
      2065. 
            1
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
          
      2066. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
          
      2067. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e055dd0 (Rebased)
=======
          
      2068. 
            
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0c57e4e (Fix)
=======
          
      2069. 
            1
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 3be4d14 (Manifest_cache true)
=======
          
      2070. 
            
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
>>>>>>> e055dd0 (Rebased)
=======
>>>>>>> 0c57e4e (Fix)
=======
>>>>>>> 3be4d14 (Manifest_cache true)
=======
=======
=======
          
      2071. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
=======
=======
=======
          
      2072. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> add330c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 42e9c2e (Manifest_cache true)
=======
=======
=======
          
      2073. 
            1
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
=======
=======
=======
          
      2074. 
            
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 15bff2e (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> c0159bf (Manifest_cache true)
=======
=======
=======
          
      2075. 
            1
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
=======
=======
=======
          
      2076. 
            
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> 6c71f00 (Manifest_cache true)
>>>>>>> ca274ec (Manifest_cache true)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e055dd0 (Rebased)
=======
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> 8181d13 (Featire specs)
=======
>>>>>>> 72b9cab (Featire specs)
=======
>>>>>>> 15c51b7 (Featire specs)
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
>>>>>>> b3f2049 (Featire specs)
=======
          
      2077. 
            1
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> e18eb87 (Fix)
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
            

            

<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 5507b42 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
=======
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 6fba6be (Featire specs)
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
=======
=======
>>>>>>> 7c4ea7f (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
>>>>>>> 216fe41 (Featire specs)
              options.add_argument('--ignore-certificate-errors=true')
          
        2078. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      2078. 
            1
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      2079. 
            1
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
          
      2080. 
            
=======
          
      2081. 
            1
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      2082. 
            
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 86d584a (Manifest_cache true)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      2083. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      2084. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      2085. 
            1
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 5507b42 (Featire specs)
=======
          
      2086. 
            
>>>>>>> e9f3851 (Manifest_cache true)
=======
=======
>>>>>>> 35d17b9 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 64dceec (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      2087. 
            
=======
<<<<<<< HEAD
          
      2088. 
            1
=======
          
      2089. 
            
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
=======
=======
          
      2090. 
            1
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
          
      2091. 
            
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
=======
=======
          
      2092. 
            1
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      2093. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      2094. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      2095. 
            1
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      2096. 
            1
>>>>>>> 5b7749a (Fix)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> bc6bc8d2 (Rebased)
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> d52f9efe (Featire specs)
=======
=======
=======
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
              options.add_argument('--ignore-certificate-errors=true')
          
        2097. 
        
        
      
        
        
<<<<<<< HEAD
          
      2097. 
            
=======
          
      2098. 
            1
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      2099. 
            
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
=======
=======
          
      2100. 
            1
>>>>>>> 08edf50 (Featire specs)
=======
          
      2101. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
      2102. 
            1
>>>>>>> 7a02bbe (Featire specs)
=======
          
      2103. 
            
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
=======
          
      2104. 
            1
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      2105. 
            
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> 64dceec (Manifest_cache true)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> c12b71de (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
>>>>>>> 4552227 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b904d7ae (Featire specs)
=======
=======
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
>>>>>>> ef483b6d (Fix)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
>>>>>>> 3be4d14 (Manifest_cache true)
=======
>>>>>>> a71befd (Manifest_cache true)
=======
>>>>>>> fd310ed (Manifest_cache true)
=======
>>>>>>> 8181d13 (Featire specs)
=======
>>>>>>> 42e9c2e (Manifest_cache true)
=======
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 72b9cab (Featire specs)
=======
>>>>>>> c0159bf (Manifest_cache true)
=======
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 15c51b7 (Featire specs)
=======
>>>>>>> ca274ec (Manifest_cache true)
=======
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9e081dc (Fix)
=======
>>>>>>> 216fe41 (Featire specs)
          
      2106. 
            1
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      2107. 
            1
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      2108. 
            
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 86d584a (Manifest_cache true)
=======
=======
          
      2109. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
=======
          
      2110. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
      2111. 
            1
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 5507b42 (Featire specs)
=======
          
      2112. 
            
>>>>>>> e9f3851 (Manifest_cache true)
=======
=======
>>>>>>> 35d17b9 (Manifest_cache true)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> add330c (Manifest_cache true)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 15bff2e (Manifest_cache true)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> 6c71f00 (Manifest_cache true)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
          
      2113. 
            
=======
<<<<<<< HEAD
          
      2114. 
            1
=======
          
      2115. 
            
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
=======
=======
>>>>>>> 3e9f99d (Featire specs)
=======
          
      2116. 
            1
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
          
      2117. 
            
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
=======
=======
          
      2118. 
            1
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
          
      2119. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
=======
          
      2120. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
=======
          
      2121. 
            1
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
          
      2122. 
            1
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> 3e9f99d (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5e31aeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 53db2224 (Featire specs)
=======
=======
=======
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
              options.add_argument('--ignore-certificate-errors=true')
          
        2123. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
          
      2123. 
            
=======
          
      2124. 
            1
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      2125. 
            
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
      2126. 
            1
>>>>>>> 08edf50 (Featire specs)
=======
          
      2127. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
=======
<<<<<<< HEAD
          
      2128. 
=======
          
      2129. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
=======
          
      2130. 
            1
>>>>>>> c033601 (Rebased)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> c8cdb08 (Manifest_cache true)
=======
>>>>>>> b832d45 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 4a0e3b6 (Manifest_cache true)
          
      2131. 
            
<<<<<<< HEAD
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
=======
          
      2132. 
            1
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
=======
=======
=======
          
      2133. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 24b58e6 (Manifest_cache true)
=======
=======
          
      2134. 
            1
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> 7a02bbe (Featire specs)
              options.add_argument('--ignore-certificate-errors=true')
          
        2135. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5506bd0 (Featire specs)
          
      2135. 
            
=======
<<<<<<< HEAD
          
      2136. 
>>>>>>> 0b43b18 (Manifest_cache true)
            1
>>>>>>> 7a02bbe (Featire specs)
=======
          
      2137. 
            
>>>>>>> fd6db03 (Manifest_cache true)
=======
          
      2138. 
            1
<<<<<<< HEAD
>>>>>>> 4552227 (Featire specs)
=======
          
      2139. 
            
>>>>>>> 998f08d (Manifest_cache true)
=======
          
      2140. 
            1
>>>>>>> 2a25e4c (Featire specs)
=======
          
      2141. 
            1
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      2142. 
            
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0b43b18 (Manifest_cache true)
=======
=======
          
      2143. 
            1
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 2ee03d3 (Featire specs)
=======
          
      2144. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
      2145. 
            1
>>>>>>> 7a02bbe (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
=======
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
=======
=======
>>>>>>> 4552227 (Featire specs)
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 392646b5 (Featire specs)
=======
=======
=======
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
              options.add_argument('--accept-insecure-certs=true')
>>>>>>> 610b6138 (Featire specs)
          
        2146. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 1cce66c (Manifest_cache true)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> fb61c5a (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> aa7b40c (Manifest_cache true)
          
      2146. 
            
=======
          
      2147. 
            1
>>>>>>> 08edf50 (Featire specs)
=======
          
      2148. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
=======
=======
          
      2149. 
            1
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      2150. 
            
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
=======
          
      2151. 
            1
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      2152. 
            
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> 64dceec (Manifest_cache true)
            

            

<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
              options.add_argument('--ignore-certificate-errors=true')
          
        2153. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      2153. 
            
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
          
      2154. 
            1
<<<<<<< HEAD
=======
=======
<<<<<<< HEAD
          
      2155. 
            1
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
          
      2156. 
            1
>>>>>>> e3e66f3 (Featire specs)
=======
          
      2157. 
            
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
=======
          
      2158. 
            1
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> d782a28 (Manifest_cache true)
=======
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 35d17b9 (Manifest_cache true)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
          
      2159. 
            
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
      2160. 
            1
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      2161. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
=======
          
      2162. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
=======
          
      2163. 
            
>>>>>>> 49e8a6c (Rebased)
=======
          
      2164. 
            1
>>>>>>> 872e675 (Fix)
=======
          
      2165. 
            
>>>>>>> e9f3851 (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
=======
          
      2166. 
            1
>>>>>>> b28889f (Fix)
=======
>>>>>>> 563720e (Featire specs)
            

            

<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 5507b42 (Featire specs)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
              options.add_argument('--ignore-certificate-errors=true')
          
        2167. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      2167. 
            1
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      2168. 
            1
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
          
      2169. 
            
=======
          
      2170. 
            1
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      2171. 
            
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 86d584a (Manifest_cache true)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      2172. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      2173. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      2174. 
            1
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 5507b42 (Featire specs)
=======
          
      2175. 
            
>>>>>>> e9f3851 (Manifest_cache true)
=======
=======
>>>>>>> 35d17b9 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 64dceec (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
          
      2176. 
            
=======
<<<<<<< HEAD
          
      2177. 
            1
=======
          
      2178. 
            
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
=======
=======
          
      2179. 
            1
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
          
      2180. 
            
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
=======
=======
          
      2181. 
            1
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      2182. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      2183. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
=======
          
      2184. 
            1
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
          
      2185. 
            1
>>>>>>> 5b7749a (Fix)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> 13fca83d (Rebased)
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376a (Featire specs)
=======
=======
=======
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
              options.add_argument('--ignore-certificate-errors=true')
          
        2186. 
        
        
      
        
        
<<<<<<< HEAD
          
      2186. 
            
=======
          
      2187. 
            1
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      2188. 
            
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
=======
=======
          
      2189. 
            1
>>>>>>> 08edf50 (Featire specs)
=======
          
      2190. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
      2191. 
            1
>>>>>>> 7a02bbe (Featire specs)
=======
          
      2192. 
            
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
=======
          
      2193. 
            1
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      2194. 
            
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> 64dceec (Manifest_cache true)
=======
          
      2195. 
            1
>>>>>>> c7a726c5 (Rebased)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0ea (Featire specs)
=======
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888bf (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
>>>>>>> 4552227 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 393eff3b (Featire specs)
=======
=======
>>>>>>> 5b7749a (Fix)
>>>>>>> d9d85ca6 (Fix)
              options.add_argument('--accept-insecure-certs=true')
          
        2196. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> c59d1a99 (Manifest_cache true)
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 11792758 (Rebased)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> 7a08014b (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 490b01d6 (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
=======
>>>>>>> c51bf93 (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> e5890c2 (Manifest_cache true)
=======
>>>>>>> 9440753 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> e9f3851 (Manifest_cache true)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> d782a28 (Manifest_cache true)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 35d17b9 (Manifest_cache true)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> e9f3851 (Manifest_cache true)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> d782a28 (Manifest_cache true)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 35d17b9 (Manifest_cache true)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> add330c (Manifest_cache true)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 15bff2e (Manifest_cache true)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> 6c71f00 (Manifest_cache true)
=======
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> 0b43b18 (Manifest_cache true)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e5890c2 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 251144b4 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888bf (Featire specs)
=======
=======
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 35d17b9 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 255dd8d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 304cd28a (Manifest_cache true)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e59c273d (Manifest_cache true)
=======
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 393eff3b (Featire specs)
=======
=======
=======
>>>>>>> b15044a (Manifest_cache true)
>>>>>>> 64dceec (Manifest_cache true)
>>>>>>> 7afa007b (Manifest_cache true)
=======
>>>>>>> ebcdce06 (Featire specs)
=======
>>>>>>> c59d1a99 (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
=======
>>>>>>> c51bf93 (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> e5890c2 (Manifest_cache true)
=======
>>>>>>> 9440753 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> e9f3851 (Manifest_cache true)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> d782a28 (Manifest_cache true)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 35d17b9 (Manifest_cache true)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e5890c2 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> c12b71de (Featire specs)
=======
=======
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
>>>>>>> 35d17b9 (Manifest_cache true)
>>>>>>> 255dd8d (Manifest_cache true)
>>>>>>> d4235040 (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4367ccb1 (Manifest_cache true)
=======
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b904d7ae (Featire specs)
=======
=======
=======
>>>>>>> b15044a (Manifest_cache true)
>>>>>>> 64dceec (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4fac471d (Manifest_cache true)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
>>>>>>> f92a45b (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> 0e864a5 (Manifest_cache true)
=======
>>>>>>> 416166f (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0e864a5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> cc390719 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
>>>>>>> 35d17b9 (Manifest_cache true)
>>>>>>> fd310ed (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 86229876 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> add330c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 42e9c2e (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 16ebb0ff (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 15bff2e (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> c0159bf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1d0f5cbf (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 392646b5 (Featire specs)
=======
=======
=======
=======
>>>>>>> b15044a (Manifest_cache true)
>>>>>>> 6c71f00 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> ca274ec (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a56ba36d (Manifest_cache true)
=======
=======
=======
>>>>>>> 715fac2 (Featire specs)
<<<<<<< HEAD
>>>>>>> fb61c5a (Featire specs)
<<<<<<< HEAD
>>>>>>> 73f364d8 (Featire specs)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 0b43b18 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1cce66c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d365be68 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      2196. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      2197. 
=======
          
      2198. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
      2199. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
      2200. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> fb61c5a (Featire specs)
=======
>>>>>>> 1cce66c (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 86d584a (Manifest_cache true)
>>>>>>> 0e864a5 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 490b01d6 (Manifest_cache true)
=======
=======
>>>>>>> 251144b4 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84809242 (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 1d6a89b5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 86d584a (Manifest_cache true)
>>>>>>> e5890c2 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 35d17b9 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 86229876 (Manifest_cache true)
=======
>>>>>>> 73f364d8 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> ebcdce06 (Featire specs)
=======
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> c12b71de (Featire specs)
=======
>>>>>>> d4235040 (Manifest_cache true)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
>>>>>>> fd310ed (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 86229876 (Manifest_cache true)
=======
=======
>>>>>>> 715fac2 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> fb61c5a (Featire specs)
<<<<<<< HEAD
>>>>>>> 73f364d8 (Featire specs)
=======
=======
>>>>>>> 0b43b18 (Manifest_cache true)
=======
>>>>>>> 1cce66c (Manifest_cache true)
>>>>>>> d365be68 (Manifest_cache true)
          
      2201. 
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
      2202. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9440753 (Featire specs)
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> 4a2f2ad8 (Featire specs)
=======
>>>>>>> 73f364d8 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
>>>>>>> fb61c5a (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
=======
>>>>>>> add330c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 42e9c2e (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 16ebb0ff (Manifest_cache true)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
>>>>>>> afa56d1 (Featire specs)
>>>>>>> e1ecabbe (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 4f4ea3f9 (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 7a08014b (Featire specs)
=======
>>>>>>> e6fc67c7 (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> f92a45b (Featire specs)
=======
          
      2203. 
>>>>>>> c033601 (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
=======
>>>>>>> 216fe41 (Featire specs)
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
<<<<<<< HEAD
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> c8cdb08 (Manifest_cache true)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> b3f2049 (Featire specs)
>>>>>>> 3cf8dd4 (Featire specs)
>>>>>>> aa4361fd (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
>>>>>>> 448bef30 (Featire specs)
>>>>>>> b3f2049 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
=======
=======
=======
>>>>>>> 3be4d14 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 3be4d14 (Manifest_cache true)
=======
>>>>>>> 1b8f36d8 (Manifest_cache true)
>>>>>>> c8cdb08 (Manifest_cache true)
=======
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 1b8f36d8 (Manifest_cache true)
=======
>>>>>>> 7b22ad7e (Featire specs)
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b719333 (Manifest_cache true)
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
=======
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
>>>>>>> d782a28 (Manifest_cache true)
>>>>>>> a304bcf (Manifest_cache true)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
=======
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> c8cdb08 (Manifest_cache true)
=======
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b719333 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d34a0770 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> bd30d038 (Manifest_cache true)
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
>>>>>>> d782a28 (Manifest_cache true)
>>>>>>> a304bcf (Manifest_cache true)
>>>>>>> bd30d038 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> b3f2049 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
>>>>>>> e9f3851 (Manifest_cache true)
>>>>>>> 3be4d14 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1b8f36d8 (Manifest_cache true)
=======
=======
>>>>>>> e9f3851 (Manifest_cache true)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
>>>>>>> d782a28 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 551c6ab (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 56531f25 (Manifest_cache true)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
>>>>>>> 3cf8dd4 (Featire specs)
>>>>>>> aa4361fd (Featire specs)
          
      2204. 
=======
          
      2205. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
>>>>>>> a636fda (Featire specs)
>>>>>>> 3be4d14 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d34a0770 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
>>>>>>> b719333 (Manifest_cache true)
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> d34a0770 (Manifest_cache true)
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
=======
          
      2206. 
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
=======
>>>>>>> 3e9f99d (Featire specs)
>>>>>>> 3cf8dd4 (Featire specs)
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
=======
          
      2207. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 56531f25 (Manifest_cache true)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> bd30d038 (Manifest_cache true)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
>>>>>>> 551c6ab (Manifest_cache true)
>>>>>>> 56531f25 (Manifest_cache true)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
=======
=======
          
      2208. 
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> c8cdb08 (Manifest_cache true)
=======
>>>>>>> b832d45 (Featire specs)
=======
=======
          
      2209. 
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 490b01d6 (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
=======
          
      2210. 
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 24b58e6 (Manifest_cache true)
=======
=======
          
      2211. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e59c273d (Manifest_cache true)
=======
>>>>>>> 4367ccb1 (Manifest_cache true)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
=======
          
      2212. 
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 00f8b58 (Manifest_cache true)
=======
          
      2213. 
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
>>>>>>> 75fa7e1b (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
=======
=======
>>>>>>> bd30d038 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
>>>>>>> a304bcf (Manifest_cache true)
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> b832d45 (Featire specs)
=======
=======
          
      2214. 
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e5890c2 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 251144b4 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
=======
          
      2215. 
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 24b58e6 (Manifest_cache true)
=======
=======
          
      2216. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 15bff2e (Manifest_cache true)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
=======
=======
          
      2217. 
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 00f8b58 (Manifest_cache true)
=======
          
      2218. 
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> 13fca83d (Rebased)
=======
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
          
      2219. 
=======
          
      2220. 
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376a (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      2221. 
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b719333 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0341d6de (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      2222. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0ea (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      2223. 
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a304bcf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d245196f (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888bf (Featire specs)
=======
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      2224. 
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 35d17b9 (Manifest_cache true)
>>>>>>> 255dd8d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 304cd28a (Manifest_cache true)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
=======
          
      2225. 
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
=======
=======
          
      2226. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
=======
          
      2227. 
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e59c273d (Manifest_cache true)
=======
=======
=======
=======
          
      2228. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 393eff3b (Featire specs)
=======
=======
=======
=======
          
      2229. 
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 64dceec (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 7afa007b (Manifest_cache true)
=======
=======
=======
          
      2230. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
>>>>>>> d9d85ca6 (Fix)
=======
          
      2231. 
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> ebcdce06 (Featire specs)
=======
>>>>>>> c59d1a99 (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 11792758 (Rebased)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> b832d45 (Featire specs)
=======
=======
          
      2232. 
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e5890c2 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
=======
          
      2233. 
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 24b58e6 (Manifest_cache true)
=======
=======
          
      2234. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
=======
          
      2235. 
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 00f8b58 (Manifest_cache true)
=======
          
      2236. 
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> bc6bc8d2 (Rebased)
=======
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
          
      2237. 
=======
          
      2238. 
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> d52f9efe (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      2239. 
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b719333 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d34a0770 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      2240. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      2241. 
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a304bcf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> bd30d038 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> c12b71de (Featire specs)
=======
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      2242. 
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 35d17b9 (Manifest_cache true)
>>>>>>> 255dd8d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d4235040 (Manifest_cache true)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
=======
          
      2243. 
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
=======
=======
          
      2244. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
=======
          
      2245. 
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4367ccb1 (Manifest_cache true)
=======
=======
=======
=======
          
      2246. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b904d7ae (Featire specs)
=======
=======
=======
=======
          
      2247. 
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 64dceec (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4fac471d (Manifest_cache true)
=======
=======
=======
          
      2248. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
>>>>>>> ef483b6d (Fix)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> b3f2049 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> df37394 (Featire specs)
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> b832d45 (Featire specs)
=======
=======
          
      2249. 
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0e864a5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> cc390719 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
=======
=======
          
      2250. 
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 24b58e6 (Manifest_cache true)
=======
=======
          
      2251. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
=======
=======
          
      2252. 
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 00f8b58 (Manifest_cache true)
=======
          
      2253. 
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
=======
=======
          
      2254. 
=======
          
      2255. 
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5e31aeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 53db2224 (Featire specs)
=======
=======
=======
=======
=======
          
      2256. 
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 3be4d14 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1b8f36d8 (Manifest_cache true)
=======
=======
=======
=======
=======
          
      2257. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
=======
=======
          
      2258. 
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 551c6ab (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 56531f25 (Manifest_cache true)
=======
=======
=======
<<<<<<< HEAD
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
=======
=======
>>>>>>> b832d45 (Featire specs)
>>>>>>> 0b43b18 (Manifest_cache true)
=======
=======
          
      2259. 
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 35d17b9 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> fd310ed (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 86229876 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
=======
=======
=======
          
      2260. 
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> add330c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 42e9c2e (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 16ebb0ff (Manifest_cache true)
=======
=======
=======
=======
=======
          
      2261. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
=======
=======
=======
          
      2262. 
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 15bff2e (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> c0159bf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1d0f5cbf (Manifest_cache true)
=======
=======
=======
=======
=======
          
      2263. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 392646b5 (Featire specs)
=======
=======
=======
=======
=======
          
      2264. 
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 6c71f00 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> ca274ec (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a56ba36d (Manifest_cache true)
=======
=======
=======
=======
          
      2265. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 715fac2 (Featire specs)
<<<<<<< HEAD
>>>>>>> fb61c5a (Featire specs)
<<<<<<< HEAD
>>>>>>> 73f364d8 (Featire specs)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
>>>>>>> 0b43b18 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1cce66c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d365be68 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            
            

            

            
          
        2266. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ebcdce06 (Featire specs)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> e6fc67c7 (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 73f364d8 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> d365be68 (Manifest_cache true)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
          
      2266. 
            1
=======
>>>>>>> f92a45b (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> fb61c5a (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> 1cce66c (Manifest_cache true)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 0b43b18 (Manifest_cache true)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> ebcdce06 (Featire specs)
=======
>>>>>>> c59d1a99 (Manifest_cache true)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 11792758 (Rebased)
=======
>>>>>>> 31d15e66 (Fix)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 4f4ea3f9 (Featire specs)
=======
>>>>>>> 365d41ed (Featire specs)
=======
>>>>>>> c05ee511 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e18eb87 (Fix)
=======
>>>>>>> 0e864a5 (Manifest_cache true)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
>>>>>>> e055dd0 (Rebased)
=======
>>>>>>> 0c57e4e (Fix)
=======
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> 3be4d14 (Manifest_cache true)
=======
>>>>>>> a71befd (Manifest_cache true)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 551c6ab (Manifest_cache true)
=======
>>>>>>> 973ba8c (Featire specs)
=======
>>>>>>> fd310ed (Manifest_cache true)
=======
>>>>>>> 8181d13 (Featire specs)
=======
>>>>>>> 42e9c2e (Manifest_cache true)
=======
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
=======
>>>>>>> 72b9cab (Featire specs)
=======
>>>>>>> c0159bf (Manifest_cache true)
=======
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 15c51b7 (Featire specs)
=======
>>>>>>> ca274ec (Manifest_cache true)
=======
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9e081dc (Fix)
>>>>>>> b3f2049 (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
=======
>>>>>>> 74240509 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e59c273d (Manifest_cache true)
=======
>>>>>>> a1a479e2 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 393eff3b (Featire specs)
=======
>>>>>>> 7afa007b (Manifest_cache true)
=======
>>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price)
=======
>>>>>>> d9d85ca6 (Fix)
=======
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 4367ccb1 (Manifest_cache true)
=======
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
>>>>>>> b904d7ae (Featire specs)
=======
>>>>>>> 4fac471d (Manifest_cache true)
=======
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
=======
>>>>>>> ef483b6d (Fix)
>>>>>>> b28889f (Fix)
>>>>>>> 5a2009f1 (Fix)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> e9f3851 (Manifest_cache true)
=======
>>>>>>> 307f31f (Manifest_cache true)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> d782a28 (Manifest_cache true)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 35d17b9 (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 64dceec (Manifest_cache true)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> e9f3851 (Manifest_cache true)
=======
>>>>>>> 307f31f (Manifest_cache true)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> d782a28 (Manifest_cache true)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 35d17b9 (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 64dceec (Manifest_cache true)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 5b7749a (Fix)
=======
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 75fa7e1b (Rebased)
=======
>>>>>>> b28889f (Fix)
>>>>>>> fdab719f (Fix)
=======
>>>>>>> b28889f (Fix)
>>>>>>> 99dad91f (Fix)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> e9f3851 (Manifest_cache true)
=======
>>>>>>> 307f31f (Manifest_cache true)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> d782a28 (Manifest_cache true)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 35d17b9 (Manifest_cache true)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> add330c (Manifest_cache true)
=======
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 15bff2e (Manifest_cache true)
=======
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> 6c71f00 (Manifest_cache true)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 1d59aaa (Fix)
=======
<<<<<<< HEAD
=======
=======
>>>>>>> 715fac2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 490b01d6 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5a2009f1 (Fix)
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> 99dad91f (Fix)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 73f364d8 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 7a08014b (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> f92a45b (Featire specs)
>>>>>>> e6fc67c7 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
>>>>>>> e6fc67c7 (Featire specs)
=======
>>>>>>> 73f364d8 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> ebcdce06 (Featire specs)
=======
>>>>>>> 7a08014b (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
=======
>>>>>>> 715fac2 (Featire specs)
>>>>>>> fb61c5a (Featire specs)
>>>>>>> 73f364d8 (Featire specs)
          
      2267. 
            
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 659083f (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
>>>>>>> ecb02dbf (Featire specs)
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> cc390719 (Manifest_cache true)
=======
=======
>>>>>>> 3cf8dd4 (Featire specs)
>>>>>>> aa4361fd (Featire specs)
=======
=======
>>>>>>> e5890c2 (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> e5890c2 (Manifest_cache true)
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 0e864a5 (Manifest_cache true)
>>>>>>> cc390719 (Manifest_cache true)
>>>>>>> c8cdb08 (Manifest_cache true)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> cc390719 (Manifest_cache true)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> d365be68 (Manifest_cache true)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> c59d1a99 (Manifest_cache true)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> 37e48018 (Featire specs)
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 6fa625b (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 490b01d6 (Manifest_cache true)
=======
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
>>>>>>> e5890c2 (Manifest_cache true)
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
=======
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a304bcf (Manifest_cache true)
=======
=======
>>>>>>> c4adab0 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> bf05825 (Featire specs)
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> 35d17b9 (Manifest_cache true)
>>>>>>> 255dd8d (Manifest_cache true)
=======
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 6fa625b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
>>>>>>> e5890c2 (Manifest_cache true)
=======
=======
>>>>>>> 1cce66c (Manifest_cache true)
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> 86d584a (Manifest_cache true)
=======
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
=======
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a304bcf (Manifest_cache true)
=======
=======
>>>>>>> c4adab0 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> bf05825 (Featire specs)
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 35d17b9 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 255dd8d (Manifest_cache true)
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 551c6ab (Manifest_cache true)
=======
=======
>>>>>>> c4adab0 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 973ba8c (Featire specs)
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> 35d17b9 (Manifest_cache true)
>>>>>>> fd310ed (Manifest_cache true)
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> add330c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 42e9c2e (Manifest_cache true)
=======
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3b03895 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 15bff2e (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> c0159bf (Manifest_cache true)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 94841b5 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
=======
=======
>>>>>>> b15044a (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 6c71f00 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> ca274ec (Manifest_cache true)
=======
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
=======
=======
>>>>>>> 0b43b18 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1cce66c (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 6fa625b (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
=======
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b719333 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
=======
>>>>>>> 3b03895 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 94841b5 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> b15044a (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 64dceec (Manifest_cache true)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 6fa625b (Manifest_cache true)
=======
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
>>>>>>> bf137e4 (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
>>>>>>> 0e864a5 (Manifest_cache true)
=======
>>>>>>> 86d584a (Manifest_cache true)
=======
>>>>>>> 3723aad (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> 51bc18c (Featire specs)
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 6fa625b (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0ed7f7c (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 659083f (Featire specs)
=======
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 3be4d14 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> 307f31f (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a71befd (Manifest_cache true)
=======
=======
>>>>>>> 2a25e4c (Featire specs)
>>>>>>> 216fe41 (Featire specs)
          
      2268. 
>>>>>>> 84003439 (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b719333 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0341d6de (Manifest_cache true)
=======
=======
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
=======
>>>>>>> 3b03895 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
=======
>>>>>>> 94841b5 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> b15044a (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 64dceec (Manifest_cache true)
=======
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 6fa625b (Manifest_cache true)
=======
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
>>>>>>> bf137e4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 21793167 (Manifest_cache true)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> ebcdce06 (Featire specs)
          
      2269. 
            1
=======
          
      2270. 
            
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
=======
=======
=======
>>>>>>> d34a0770 (Manifest_cache true)
<<<<<<< HEAD
=======
=======
>>>>>>> 3be4d14 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 1b8f36d8 (Manifest_cache true)
=======
>>>>>>> 8a3779d4 (Manifest_cache true)
>>>>>>> b719333 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0341d6de (Manifest_cache true)
=======
=======
>>>>>>> b719333 (Manifest_cache true)
>>>>>>> 824ea7c9 (Manifest_cache true)
=======
=======
>>>>>>> 307f31f (Manifest_cache true)
>>>>>>> bf137e4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 21793167 (Manifest_cache true)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> ebcdce06 (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> b719333 (Manifest_cache true)
>>>>>>> d34a0770 (Manifest_cache true)
=======
>>>>>>> 824ea7c9 (Manifest_cache true)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 3be4d14 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1b8f36d8 (Manifest_cache true)
=======
=======
=======
>>>>>>> 307f31f (Manifest_cache true)
>>>>>>> a71befd (Manifest_cache true)
>>>>>>> 8a3779d4 (Manifest_cache true)
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
=======
=======
          
      2271. 
            1
>>>>>>> 752f0c0 (Featire specs)
=======
          
      2272. 
            
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> fb61c5a (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> a304bcf (Manifest_cache true)
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
<<<<<<< HEAD
>>>>>>> 551c6ab (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
<<<<<<< HEAD
>>>>>>> a304bcf (Manifest_cache true)
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> d245196f (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> d782a28 (Manifest_cache true)
>>>>>>> a304bcf (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
=======
>>>>>>> b832d45 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> ebcdce06 (Featire specs)
=======
>>>>>>> bd30d038 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> 56531f25 (Manifest_cache true)
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> d782a28 (Manifest_cache true)
>>>>>>> a304bcf (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
=======
>>>>>>> b832d45 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> d782a28 (Manifest_cache true)
>>>>>>> 551c6ab (Manifest_cache true)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> 715fac2 (Featire specs)
=======
          
      2273. 
            1
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fb61c5a (Featire specs)
=======
=======
>>>>>>> e5890c2 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 0e864a5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e5890c2 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 490b01d6 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 251144b4 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 86d584a (Manifest_cache true)
>>>>>>> e5890c2 (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> ebcdce06 (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
>>>>>>> c59d1a99 (Manifest_cache true)
=======
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> cc390719 (Manifest_cache true)
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 86d584a (Manifest_cache true)
>>>>>>> e5890c2 (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> 86d584a (Manifest_cache true)
>>>>>>> 0e864a5 (Manifest_cache true)
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
>>>>>>> 0b43b18 (Manifest_cache true)
=======
          
      2274. 
            
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> cc390719 (Manifest_cache true)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> 255dd8d (Manifest_cache true)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 255dd8d (Manifest_cache true)
>>>>>>> d4235040 (Manifest_cache true)
=======
=======
>>>>>>> 4a2f2ad8 (Featire specs)
=======
>>>>>>> 73f364d8 (Featire specs)
=======
>>>>>>> d365be68 (Manifest_cache true)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 255dd8d (Manifest_cache true)
=======
>>>>>>> fd310ed (Manifest_cache true)
>>>>>>> 86229876 (Manifest_cache true)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5890c2 (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 9440753 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fb61c5a (Featire specs)
=======
>>>>>>> 1cce66c (Manifest_cache true)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ebcdce06 (Featire specs)
=======
>>>>>>> c59d1a99 (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> e5890c2 (Manifest_cache true)
=======
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> 0e864a5 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> cc390719 (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 416166f (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> 8181d13 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
>>>>>>> 715fac2 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 73f364d8 (Featire specs)
=======
>>>>>>> 0b43b18 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> d365be68 (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
          
      2275. 
            1
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 73f364d8 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 9bfbd88 (Featire specs)
<<<<<<< HEAD
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
          
      2276. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
>>>>>>> 7a08014b (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
=======
>>>>>>> fb61c5a (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
>>>>>>> afa56d1 (Featire specs)
>>>>>>> e1ecabbe (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
=======
          
      2277. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 84003439 (Featire specs)
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 9620751 (Featire specs)
>>>>>>> d52f9efe (Featire specs)
          
      2278. 
=======
          
      2279. 
>>>>>>> d0dc1f1 (Featire specs)
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bb5c652 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 824bb2b (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 5c33a07 (Featire specs)
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
          
      2280. 
            
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> add330c (Manifest_cache true)
=======
=======
>>>>>>> 9620751 (Featire specs)
          
      2281. 
=======
          
      2282. 
>>>>>>> d0dc1f1 (Featire specs)
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 358c90c (Fix book_spec decrease quantity and price)
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
          
      2283. 
            1
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
>>>>>>> 9a49b7b (Rebased)
=======
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
=======
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> b9cc4e9 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 78717cc (Manifest_cache true)
=======
=======
>>>>>>> 009401d (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> b9cc4e9 (Manifest_cache true)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> b9cc4e9 (Manifest_cache true)
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
>>>>>>> 02a399d (Manifest_cache true)
=======
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6fa625b (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 98beee2 (Manifest_cache true)
=======
=======
>>>>>>> 009401d (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
          
      2284. 
            1
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> ae409ca (Featire specs)
=======
=======
>>>>>>> c8cdb08 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 385b8df (Manifest_cache true)
=======
=======
>>>>>>> b832d45 (Featire specs)
<<<<<<< HEAD
>>>>>>> 379a979 (Featire specs)
=======
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 7bc7f9f (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 490b01d6 (Manifest_cache true)
=======
=======
>>>>>>> 7bc7f9f (Manifest_cache true)
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> adc21e0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 84d0df6 (Manifest_cache true)
=======
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 37e48018 (Featire specs)
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
=======
=======
=======
          
      2285. 
            1
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 4d90e3d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
=======
=======
          
      2286. 
            
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 00f8b58 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 450f4e3 (Manifest_cache true)
=======
=======
=======
          
      2287. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
>>>>>>> 11792758 (Rebased)
=======
=======
          
      2288. 
            
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> aa3618b (Rebased)
<<<<<<< HEAD
>>>>>>> 75fa7e1b (Rebased)
=======
=======
>>>>>>> aa3618b (Rebased)
>>>>>>> 31d15e66 (Fix)
=======
=======
          
      2289. 
            1
>>>>>>> a5d032d (Fix)
>>>>>>> 160fb15 (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 67ab5299 (Fix)
=======
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> b3f2049 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
>>>>>>> b3f2049 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
>>>>>>> b3f2049 (Featire specs)
=======
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> c8cdb08 (Manifest_cache true)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> fdab719f (Fix)
=======
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
          
      2290. 
            1
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 4367ccb1 (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 8cbdfeb (Manifest_cache true)
>>>>>>> 4367ccb1 (Manifest_cache true)
>>>>>>> 9c0d812 (Featire specs)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
<<<<<<< HEAD
=======
>>>>>>> 9c0d812 (Featire specs)
=======
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> 4367ccb1 (Manifest_cache true)
          
      2291. 
            
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4367ccb1 (Manifest_cache true)
=======
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
>>>>>>> 00f8b58 (Manifest_cache true)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
      2292. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
>>>>>>> b904d7ae (Featire specs)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
=======
          
      2293. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fdab719f (Fix)
=======
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 49e8a6c (Rebased)
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      2294. 
            
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 872e675 (Fix)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fdab719f (Fix)
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
=======
>>>>>>> 872e675 (Fix)
>>>>>>> 8288136d (Fix)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fd3f47ab (Featire specs)
          
      2295. 
            1
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8288136d (Fix)
=======
>>>>>>> d34a0770 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> 5a2009f1 (Fix)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e5890c2 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 251144b4 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> 13fca83d (Rebased)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> ae884b47 (Fix)
=======
=======
=======
=======
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b719333 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0341d6de (Manifest_cache true)
=======
=======
=======
=======
=======
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 02a399d (Manifest_cache true)
=======
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> bf137e4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 21793167 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0ea (Featire specs)
=======
=======
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a304bcf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d245196f (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888bf (Featire specs)
=======
=======
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
>>>>>>> 35d17b9 (Manifest_cache true)
>>>>>>> 255dd8d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 304cd28a (Manifest_cache true)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      2296. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 74240509 (Fix book_spec decrease quantity and price)
=======
=======
<<<<<<< HEAD
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
=======
          
      2297. 
            1
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e59c273d (Manifest_cache true)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a1a479e2 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
      2298. 
            1
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 393eff3b (Featire specs)
=======
=======
=======
=======
          
      2299. 
            
>>>>>>> 998f08d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 64dceec (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 7afa007b (Manifest_cache true)
=======
=======
=======
=======
          
      2300. 
            1
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
      2301. 
            1
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
>>>>>>> d9d85ca6 (Fix)
=======
          
      2302. 
            1
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 9bfbd88 (Featire specs)
>>>>>>> ebcdce06 (Featire specs)
=======
>>>>>>> 7bc7f9f (Manifest_cache true)
>>>>>>> c59d1a99 (Manifest_cache true)
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> bc757df (Fix book_spec decrease quantity and price)
>>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 65eb296 (Fix book_spec decrease quantity and price)
>>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
=======
>>>>>>> aa3618b (Rebased)
>>>>>>> 11792758 (Rebased)
=======
>>>>>>> 31d15e66 (Fix)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> b3f2049 (Featire specs)
>>>>>>> 009401d (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> c8da2e3 (Fix)
<<<<<<< HEAD
>>>>>>> fdab719f (Fix)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e5890c2 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> bc6bc8d2 (Rebased)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 557c1b8 (Fix)
<<<<<<< HEAD
>>>>>>> 8288136d (Fix)
=======
=======
=======
=======
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b719333 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d34a0770 (Manifest_cache true)
=======
=======
=======
=======
=======
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 845dac1 (Manifest_cache true)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 02a399d (Manifest_cache true)
=======
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> bf137e4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 824ea7c9 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a304bcf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> bd30d038 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> c12b71de (Featire specs)
=======
=======
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
>>>>>>> 35d17b9 (Manifest_cache true)
>>>>>>> 255dd8d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d4235040 (Manifest_cache true)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      2303. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> 49df518 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
=======
=======
<<<<<<< HEAD
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
=======
=======
          
      2304. 
            1
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4367ccb1 (Manifest_cache true)
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 28bae8e (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 04426412 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
      2305. 
            1
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b904d7ae (Featire specs)
=======
=======
=======
=======
          
      2306. 
            
>>>>>>> 998f08d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 64dceec (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4fac471d (Manifest_cache true)
=======
=======
=======
=======
          
      2307. 
            1
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
=======
=======
=======
          
      2308. 
            1
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
>>>>>>> ef483b6d (Fix)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
>>>>>>> 6fa625b (Manifest_cache true)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
=======
          
      2309. 
            1
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
=======
>>>>>>> c8cdb08 (Manifest_cache true)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
          
      2310. 
            1
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
          
      2311. 
            
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 00f8b58 (Manifest_cache true)
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
=======
          
      2312. 
            1
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 49e8a6c (Rebased)
=======
          
      2313. 
            
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 872e675 (Fix)
=======
          
      2314. 
            1
>>>>>>> a5d032d (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b28889f (Fix)
<<<<<<< HEAD
>>>>>>> e18eb87 (Fix)
<<<<<<< HEAD
>>>>>>> 99dad91f (Fix)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0e864a5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> cc390719 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
>>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0ce402d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> fe36fb9e (Fix book_spec decrease quantity and price)
=======
=======
=======
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
=======
>>>>>>> 872e675 (Fix)
<<<<<<< HEAD
>>>>>>> 0c57e4e (Fix)
<<<<<<< HEAD
>>>>>>> 8887ba5b (Fix)
=======
=======
=======
=======
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 3be4d14 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1b8f36d8 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 02a399d (Manifest_cache true)
=======
>>>>>>> ae2a012 (Manifest_cache true)
>>>>>>> 7375d4b (Manifest_cache true)
>>>>>>> 1c3ace6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 307f31f (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a71befd (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8a3779d4 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 551c6ab (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 56531f25 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 35d17b9 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> fd310ed (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 86229876 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> add330c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 42e9c2e (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 16ebb0ff (Manifest_cache true)
=======
=======
=======
=======
=======
          
      2315. 
            1
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 495b04d (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 0f24a043 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
=======
          
      2316. 
            1
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 15bff2e (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> c0159bf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1d0f5cbf (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 4b921fb (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 572a8e3 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> b8c2784f (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
=======
          
      2317. 
            1
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 392646b5 (Featire specs)
=======
=======
=======
=======
=======
          
      2318. 
            
>>>>>>> 998f08d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 6c71f00 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> ca274ec (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a56ba36d (Manifest_cache true)
=======
=======
=======
=======
=======
          
      2319. 
            1
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
>>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> bc08537 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> f85cfd9 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD
>>>>>>> 1c575fd1 (Fix book_spec decrease quantity and price)
=======
=======
=======
=======
          
      2320. 
            1
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 715fac2 (Featire specs)
<<<<<<< HEAD
>>>>>>> fb61c5a (Featire specs)
<<<<<<< HEAD
>>>>>>> 73f364d8 (Featire specs)
=======
=======
=======
>>>>>>> 6fa625b (Manifest_cache true)
=======
=======
          
      2321. 
            1
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
=======
>>>>>>> c8cdb08 (Manifest_cache true)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0b43b18 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1cce66c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d365be68 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
=======
=======
          
      2322. 
            1
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            

            

              Capybara::Selenium::Driver.new(
          
        2323. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 490b01d6 (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 6e923b9d (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
=======
>>>>>>> c51bf93 (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> e5890c2 (Manifest_cache true)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
>>>>>>> f92a45b (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> 0e864a5 (Manifest_cache true)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> fb61c5a (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> 1cce66c (Manifest_cache true)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5890c2 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 251144b4 (Manifest_cache true)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e59c273d (Manifest_cache true)
=======
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 393eff3b (Featire specs)
=======
=======
=======
>>>>>>> b15044a (Manifest_cache true)
>>>>>>> 64dceec (Manifest_cache true)
>>>>>>> 7afa007b (Manifest_cache true)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
=======
>>>>>>> c51bf93 (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> e5890c2 (Manifest_cache true)
=======
>>>>>>> 9440753 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e5890c2 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4367ccb1 (Manifest_cache true)
=======
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b904d7ae (Featire specs)
=======
=======
=======
>>>>>>> b15044a (Manifest_cache true)
>>>>>>> 64dceec (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4fac471d (Manifest_cache true)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> df37394 (Featire specs)
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 86d584a (Manifest_cache true)
>>>>>>> 0e864a5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> cc390719 (Manifest_cache true)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> add330c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 42e9c2e (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 16ebb0ff (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 15bff2e (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> c0159bf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1d0f5cbf (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 392646b5 (Featire specs)
=======
=======
=======
=======
>>>>>>> b15044a (Manifest_cache true)
>>>>>>> 6c71f00 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> ca274ec (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a56ba36d (Manifest_cache true)
=======
=======
=======
>>>>>>> 715fac2 (Featire specs)
<<<<<<< HEAD
>>>>>>> fb61c5a (Featire specs)
<<<<<<< HEAD
>>>>>>> 73f364d8 (Featire specs)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 0b43b18 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1cce66c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d365be68 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      2323. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> bd8bda4 (Manifest_cache true)
          
      2324. 
=======
          
      2325. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      2326. 
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
      2327. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
>>>>>>> fb61c5a (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
=======
>>>>>>> add330c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 42e9c2e (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 16ebb0ff (Manifest_cache true)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
>>>>>>> afa56d1 (Featire specs)
>>>>>>> e1ecabbe (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 4f4ea3f9 (Featire specs)
=======
>>>>>>> e6fc67c7 (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> f92a45b (Featire specs)
=======
          
      2328. 
>>>>>>> c033601 (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> c8cdb08 (Manifest_cache true)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
=======
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
>>>>>>> b3f2049 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e5890c2 (Manifest_cache true)
=======
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b719333 (Manifest_cache true)
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
=======
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a304bcf (Manifest_cache true)
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> bf05825 (Featire specs)
=======
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
>>>>>>> 35d17b9 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 255dd8d (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> b3f2049 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
=======
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0e864a5 (Manifest_cache true)
=======
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 3be4d14 (Manifest_cache true)
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 51bc18c (Featire specs)
=======
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 551c6ab (Manifest_cache true)
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 973ba8c (Featire specs)
=======
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
>>>>>>> 35d17b9 (Manifest_cache true)
>>>>>>> fd310ed (Manifest_cache true)
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
=======
=======
>>>>>>> 0b43b18 (Manifest_cache true)
>>>>>>> 1cce66c (Manifest_cache true)
          
      2329. 
=======
          
      2330. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 216fe41 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
>>>>>>> a636fda (Featire specs)
>>>>>>> 3be4d14 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
>>>>>>> b719333 (Manifest_cache true)
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
=======
          
      2331. 
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
=======
>>>>>>> 3e9f99d (Featire specs)
>>>>>>> 3cf8dd4 (Featire specs)
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
=======
          
      2332. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
>>>>>>> 551c6ab (Manifest_cache true)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
          
      2333. 
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> c8cdb08 (Manifest_cache true)
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> df37394 (Featire specs)
>>>>>>> 973ba8c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> c8cdb08 (Manifest_cache true)
=======
=======
          
      2334. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> fd310ed (Manifest_cache true)
>>>>>>> b832d45 (Featire specs)
=======
=======
          
      2335. 
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 490b01d6 (Manifest_cache true)
=======
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
=======
          
      2336. 
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 24b58e6 (Manifest_cache true)
=======
=======
          
      2337. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e59c273d (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 4367ccb1 (Manifest_cache true)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
=======
          
      2338. 
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 00f8b58 (Manifest_cache true)
=======
          
      2339. 
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
>>>>>>> 75fa7e1b (Rebased)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
>>>>>>> a304bcf (Manifest_cache true)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> c8cdb08 (Manifest_cache true)
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
<<<<<<< HEAD
=======
=======
>>>>>>> 0e864a5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 0e864a5 (Manifest_cache true)
=======
          
      2340. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0e864a5 (Manifest_cache true)
>>>>>>> b832d45 (Featire specs)
=======
=======
          
      2341. 
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
=======
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e5890c2 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 251144b4 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
=======
          
      2342. 
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 24b58e6 (Manifest_cache true)
=======
=======
          
      2343. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 15bff2e (Manifest_cache true)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
=======
=======
          
      2344. 
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 00f8b58 (Manifest_cache true)
=======
          
      2345. 
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> 13fca83d (Rebased)
=======
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
          
      2346. 
=======
          
      2347. 
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376a (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      2348. 
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b719333 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0341d6de (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      2349. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0ea (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      2350. 
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a304bcf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d245196f (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      2351. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888bf (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      2352. 
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 35d17b9 (Manifest_cache true)
>>>>>>> 255dd8d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 304cd28a (Manifest_cache true)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
=======
          
      2353. 
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
=======
=======
          
      2354. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
=======
          
      2355. 
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e59c273d (Manifest_cache true)
=======
=======
=======
=======
          
      2356. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 393eff3b (Featire specs)
=======
=======
=======
=======
          
      2357. 
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 64dceec (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 7afa007b (Manifest_cache true)
=======
=======
=======
          
      2358. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
>>>>>>> d9d85ca6 (Fix)
=======
=======
>>>>>>> ebcdce06 (Featire specs)
=======
>>>>>>> c59d1a99 (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 610b6138 (Featire specs)
          
      2359. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> bd8bda4 (Manifest_cache true)
          
      2360. 
=======
          
      2361. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      2362. 
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
      2363. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
=======
=======
>>>>>>> 7a08014b (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
          
      2364. 
>>>>>>> c033601 (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> c8cdb08 (Manifest_cache true)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e5890c2 (Manifest_cache true)
=======
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b719333 (Manifest_cache true)
=======
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
=======
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a304bcf (Manifest_cache true)
=======
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> bf05825 (Featire specs)
=======
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
>>>>>>> 35d17b9 (Manifest_cache true)
>>>>>>> 255dd8d (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
          
      2365. 
=======
          
      2366. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
>>>>>>> b719333 (Manifest_cache true)
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      2367. 
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
=======
          
      2368. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> d2e6b3c (Featire specs)
=======
=======
          
      2369. 
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> c8cdb08 (Manifest_cache true)
=======
=======
          
      2370. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> b832d45 (Featire specs)
=======
=======
          
      2371. 
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> c59d1a99 (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 610b6138 (Featire specs)
=======
=======
=======
          
      2372. 
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 24b58e6 (Manifest_cache true)
=======
=======
          
      2373. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 37e48018 (Featire specs)
=======
=======
=======
          
      2374. 
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 00f8b58 (Manifest_cache true)
=======
          
      2375. 
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
>>>>>>> 11792758 (Rebased)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> a636fda (Featire specs)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
>>>>>>> a304bcf (Manifest_cache true)
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> c8cdb08 (Manifest_cache true)
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
          
      2376. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
=======
          
      2377. 
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e5890c2 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
=======
          
      2378. 
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 24b58e6 (Manifest_cache true)
=======
=======
          
      2379. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
=======
          
      2380. 
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 00f8b58 (Manifest_cache true)
=======
          
      2381. 
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> bc6bc8d2 (Rebased)
=======
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
          
      2382. 
=======
          
      2383. 
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> d52f9efe (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      2384. 
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b719333 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d34a0770 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      2385. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      2386. 
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a304bcf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> bd30d038 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      2387. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> c12b71de (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      2388. 
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 35d17b9 (Manifest_cache true)
>>>>>>> 255dd8d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d4235040 (Manifest_cache true)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
=======
          
      2389. 
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
=======
=======
          
      2390. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
=======
          
      2391. 
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4367ccb1 (Manifest_cache true)
=======
=======
=======
=======
          
      2392. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b904d7ae (Featire specs)
=======
=======
=======
=======
          
      2393. 
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 64dceec (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4fac471d (Manifest_cache true)
=======
=======
=======
          
      2394. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
>>>>>>> ef483b6d (Fix)
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> b3f2049 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> df37394 (Featire specs)
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
>>>>>>> 0e864a5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> cc390719 (Manifest_cache true)
=======
=======
<<<<<<< HEAD
>>>>>>> 86d584a (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
=======
=======
          
      2395. 
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 24b58e6 (Manifest_cache true)
=======
=======
          
      2396. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
=======
=======
          
      2397. 
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 00f8b58 (Manifest_cache true)
=======
          
      2398. 
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
=======
=======
          
      2399. 
=======
          
      2400. 
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5e31aeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 53db2224 (Featire specs)
=======
=======
=======
=======
=======
          
      2401. 
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 3be4d14 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1b8f36d8 (Manifest_cache true)
=======
=======
=======
=======
=======
          
      2402. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
=======
=======
          
      2403. 
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 551c6ab (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 56531f25 (Manifest_cache true)
=======
=======
=======
=======
=======
          
      2404. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
=======
=======
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
>>>>>>> 0b43b18 (Manifest_cache true)
=======
=======
          
      2405. 
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 35d17b9 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> fd310ed (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 86229876 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
=======
=======
=======
          
      2406. 
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> add330c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 42e9c2e (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 16ebb0ff (Manifest_cache true)
=======
=======
=======
=======
=======
          
      2407. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
=======
=======
=======
          
      2408. 
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 15bff2e (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> c0159bf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1d0f5cbf (Manifest_cache true)
=======
=======
=======
=======
=======
          
      2409. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 392646b5 (Featire specs)
=======
=======
=======
=======
=======
          
      2410. 
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 6c71f00 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> ca274ec (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a56ba36d (Manifest_cache true)
=======
=======
=======
=======
          
      2411. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 715fac2 (Featire specs)
<<<<<<< HEAD
>>>>>>> fb61c5a (Featire specs)
<<<<<<< HEAD
>>>>>>> 73f364d8 (Featire specs)
=======
=======
=======
>>>>>>> a636fda (Featire specs)
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> d2e6b3c (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
>>>>>>> 0b43b18 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1cce66c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d365be68 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            
            

            

                app,
          
        2412. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c59d1a99 (Manifest_cache true)
=======
>>>>>>> 610b6138 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 37e48018 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 11792758 (Rebased)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> 7a08014b (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> c51bf93 (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> e5890c2 (Manifest_cache true)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> fb61c5a (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> 1cce66c (Manifest_cache true)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 49e8a6c (Rebased)
=======
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 35d17b9 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
=======
=======
>>>>>>> f92a45b (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> 0e864a5 (Manifest_cache true)
=======
>>>>>>> 416166f (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
=======
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 49e8a6c (Rebased)
=======
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 35d17b9 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> add330c (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 15bff2e (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 6c71f00 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> 715fac2 (Featire specs)
=======
>>>>>>> 2a25e4c (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 0b43b18 (Manifest_cache true)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      2412. 
>>>>>>> c7a726c5 (Rebased)
=======
=======
>>>>>>> 7a08014b (Featire specs)
=======
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> e6fc67c7 (Featire specs)
=======
>>>>>>> 73f364d8 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> f92a45b (Featire specs)
=======
>>>>>>> fb61c5a (Featire specs)
=======
>>>>>>> c033601 (Rebased)
=======
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> c8cdb08 (Manifest_cache true)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
          
      2413. 
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
=======
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
>>>>>>> b3f2049 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
=======
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e5890c2 (Manifest_cache true)
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> b3f2049 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
=======
=======
>>>>>>> df37394 (Featire specs)
>>>>>>> f92a45b (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
=======
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0e864a5 (Manifest_cache true)
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
=======
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> 715fac2 (Featire specs)
<<<<<<< HEAD
>>>>>>> fb61c5a (Featire specs)
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
=======
=======
>>>>>>> 0b43b18 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1cce66c (Manifest_cache true)
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
          
      2414. 
=======
          
      2415. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
=======
          
      2416. 
>>>>>>> 02a399d (Manifest_cache true)
=======
          
      2417. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 3cf8dd4 (Featire specs)
>>>>>>> b3f2049 (Featire specs)
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
          
      2418. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
      2419. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      2420. 
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e5890c2 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
=======
=======
=======
          
      2421. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
          
      2422. 
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
      2423. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
>>>>>>> e055dd0 (Rebased)
=======
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 64dceec (Manifest_cache true)
=======
>>>>>>> 3be4d14 (Manifest_cache true)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 551c6ab (Manifest_cache true)
=======
=======
>>>>>>> c4adab0 (Featire specs)
>>>>>>> 973ba8c (Featire specs)
=======
>>>>>>> fd310ed (Manifest_cache true)
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> 8181d13 (Featire specs)
=======
>>>>>>> 42e9c2e (Manifest_cache true)
=======
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> 72b9cab (Featire specs)
=======
>>>>>>> c0159bf (Manifest_cache true)
=======
=======
>>>>>>> 94841b5 (Featire specs)
>>>>>>> 15c51b7 (Featire specs)
=======
=======
>>>>>>> b15044a (Manifest_cache true)
>>>>>>> ca274ec (Manifest_cache true)
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 9e081dc (Fix)
          
      2424. 
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> bc6bc8d2 (Rebased)
=======
=======
=======
=======
          
      2425. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> d52f9efe (Featire specs)
=======
=======
=======
=======
          
      2426. 
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
>>>>>>> b719333 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d34a0770 (Manifest_cache true)
=======
=======
=======
          
      2427. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
      2428. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
      2429. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      2430. 
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
      2431. 
>>>>>>> 08edf50 (Featire specs)
=======
          
      2432. 
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
      2433. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
      2434. 
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4367ccb1 (Manifest_cache true)
=======
=======
=======
          
      2435. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b904d7ae (Featire specs)
=======
=======
=======
          
      2436. 
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> 64dceec (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4fac471d (Manifest_cache true)
=======
=======
=======
>>>>>>> 7c4ea7f (Fix)
          
      2437. 
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
>>>>>>> ef483b6d (Fix)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> b3f2049 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
>>>>>>> b3f2049 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
          
      2438. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
      2439. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      2440. 
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0e864a5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> cc390719 (Manifest_cache true)
=======
=======
=======
=======
          
      2441. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
=======
          
      2442. 
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
      2443. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
=======
>>>>>>> 9620751 (Featire specs)
>>>>>>> 5e31aeb (Featire specs)
          
      2444. 
<<<<<<< HEAD
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
=======
=======
          
      2445. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5e31aeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 53db2224 (Featire specs)
=======
=======
=======
=======
          
      2446. 
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 3be4d14 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1b8f36d8 (Manifest_cache true)
=======
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 0b43b18 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1cce66c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d365be68 (Manifest_cache true)
=======
=======
=======
=======
          
      2447. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            
            

            

<<<<<<< HEAD
                app,
=======
                browser: :chrome,
>>>>>>> c7a726c5 (Rebased)
          
        2448. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 490b01d6 (Manifest_cache true)
=======
>>>>>>> 6e923b9d (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 75fa7e1b (Rebased)
=======
=======
>>>>>>> d8dd3b4a (Featire specs)
=======
>>>>>>> 4f4ea3f9 (Featire specs)
=======
>>>>>>> 365d41ed (Featire specs)
=======
>>>>>>> c05ee511 (Featire specs)
=======
>>>>>>> 251144b4 (Manifest_cache true)
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> c51bf93 (Featire specs)
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> e5890c2 (Manifest_cache true)
=======
>>>>>>> 9440753 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
>>>>>>> 009401d (Featire specs)
=======
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 49e8a6c (Rebased)
=======
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 35d17b9 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      2448. 
=======
=======
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> c033601 (Rebased)
=======
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> c8cdb08 (Manifest_cache true)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
>>>>>>> c59d1a99 (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 610b6138 (Featire specs)
          
      2449. 
=======
          
      2450. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      2451. 
>>>>>>> 02a399d (Manifest_cache true)
=======
          
      2452. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
      2453. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
      2454. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      2455. 
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 490b01d6 (Manifest_cache true)
=======
=======
          
      2456. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
          
      2457. 
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
      2458. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
          
      2459. 
<<<<<<< HEAD
>>>>>>> 75fa7e1b (Rebased)
=======
=======
=======
=======
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
=======
=======
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e5890c2 (Manifest_cache true)
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
>>>>>>> ed32b84 (Featire specs)
          
      2460. 
=======
          
      2461. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
<<<<<<< HEAD
=======
=======
          
      2462. 
>>>>>>> 02a399d (Manifest_cache true)
=======
          
      2463. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
          
      2464. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
      2465. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      2466. 
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e5890c2 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 251144b4 (Manifest_cache true)
=======
=======
=======
=======
          
      2467. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
          
      2468. 
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
      2469. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> bf554f4 (Rebased)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 64dceec (Manifest_cache true)
          
      2470. 
<<<<<<< HEAD
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> 13fca83d (Rebased)
=======
=======
=======
=======
          
      2471. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376a (Featire specs)
=======
=======
=======
=======
          
      2472. 
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
>>>>>>> b719333 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0341d6de (Manifest_cache true)
=======
=======
=======
          
      2473. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
      2474. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
      2475. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      2476. 
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
      2477. 
>>>>>>> 08edf50 (Featire specs)
=======
          
      2478. 
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
      2479. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
      2480. 
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e59c273d (Manifest_cache true)
=======
=======
=======
          
      2481. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 393eff3b (Featire specs)
=======
=======
=======
          
      2482. 
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> 64dceec (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 7afa007b (Manifest_cache true)
=======
=======
=======
>>>>>>> 7c4ea7f (Fix)
          
      2483. 
>>>>>>> 5b7749a (Fix)
>>>>>>> d9d85ca6 (Fix)
=======
          
      2484. 
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> c59d1a99 (Manifest_cache true)
=======
=======
          
      2485. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 610b6138 (Featire specs)
            
            

            

<<<<<<< HEAD
                browser: :chrome,
=======
                http_client: client,
>>>>>>> c7a726c5 (Rebased)
          
        2486. 
        
        
      
        
        
<<<<<<< HEAD
=======
>>>>>>> 08edf50 (Featire specs)
          
      2486. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> c51bf93 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> c51bf93 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> 9d98d9ab (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
>>>>>>> 009401d (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 563720e (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b904d7ae (Featire specs)
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4fac471d (Manifest_cache true)
=======
>>>>>>> ef483b6d (Fix)
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 64dceec (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5b7749a (Fix)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
>>>>>>> 4367ccb1 (Manifest_cache true)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> b904d7ae (Featire specs)
=======
>>>>>>> 4fac471d (Manifest_cache true)
=======
>>>>>>> 5b7749a (Fix)
=======
>>>>>>> ef483b6d (Fix)
=======
>>>>>>> 6da9530 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> f92a45b (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> fb61c5a (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> 1cce66c (Manifest_cache true)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c033601 (Rebased)
=======
>>>>>>> a636fda (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> c8cdb08 (Manifest_cache true)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
          
      2487. 
=======
          
      2488. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      2489. 
>>>>>>> 02a399d (Manifest_cache true)
=======
          
      2490. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
      2491. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
      2492. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      2493. 
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 490b01d6 (Manifest_cache true)
=======
=======
          
      2494. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
          
      2495. 
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
      2496. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
          
      2497. 
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 75fa7e1b (Rebased)
=======
=======
=======
=======
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
>>>>>>> 009401d (Featire specs)
          
      2498. 
=======
=======
=======
>>>>>>> 08edf50 (Featire specs)
=======
          
      2499. 
=======
>>>>>>> 93bdda9 (Featire specs)
          
      2500. 
>>>>>>> d0dc1f1 (Featire specs)
=======
=======
          
      2501. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
          
      2502. 
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
=======
=======
          
      2503. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
          
      2504. 
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 35d17b9 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
=======
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 37e48018 (Featire specs)
          
      2505. 
=======
          
      2506. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      2507. 
>>>>>>> 02a399d (Manifest_cache true)
=======
          
      2508. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
      2509. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
      2510. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      2511. 
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
      2512. 
>>>>>>> 08edf50 (Featire specs)
=======
          
      2513. 
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      2514. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      2515. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 37e48018 (Featire specs)
=======
          
      2516. 
>>>>>>> 11792758 (Rebased)
=======
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
=======
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0676508 (Featire specs)
>>>>>>> b3f2049 (Featire specs)
>>>>>>> 009401d (Featire specs)
          
      2517. 
=======
=======
=======
>>>>>>> 08edf50 (Featire specs)
=======
          
      2518. 
=======
>>>>>>> 93bdda9 (Featire specs)
          
      2519. 
>>>>>>> d0dc1f1 (Featire specs)
=======
=======
          
      2520. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
          
      2521. 
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
=======
=======
          
      2522. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
          
      2523. 
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 35d17b9 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
=======
=======
>>>>>>> 3b03895 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
          
      2524. 
=======
          
      2525. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      2526. 
>>>>>>> 02a399d (Manifest_cache true)
=======
          
      2527. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
      2528. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
      2529. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      2530. 
>>>>>>> aa7b40c (Manifest_cache true)
=======
          
      2531. 
>>>>>>> 08edf50 (Featire specs)
=======
          
      2532. 
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
          
      2533. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
            
            

            

                browser: :chrome,
          
        2534. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> d782a28 (Manifest_cache true)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 35d17b9 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c033601 (Rebased)
=======
>>>>>>> a636fda (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 563720e (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> c8cdb08 (Manifest_cache true)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 86d584a (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> bf554f4 (Rebased)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
>>>>>>> 35d17b9 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 64dceec (Manifest_cache true)
=======
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> b3f2049 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
          
      2534. 
=======
=======
=======
>>>>>>> 08edf50 (Featire specs)
=======
          
      2535. 
=======
>>>>>>> 93bdda9 (Featire specs)
          
      2536. 
>>>>>>> d0dc1f1 (Featire specs)
=======
=======
          
      2537. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
          
      2538. 
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
=======
=======
          
      2539. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
          
      2540. 
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 35d17b9 (Manifest_cache true)
=======
=======
          
      2541. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
          
      2542. 
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> add330c (Manifest_cache true)
=======
=======
          
      2543. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
          
      2544. 
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 15bff2e (Manifest_cache true)
=======
=======
          
      2545. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
          
      2546. 
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> 6c71f00 (Manifest_cache true)
=======
>>>>>>> 1d59aaa (Fix)
            
            

            

                browser: :chrome,
          
        2547. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> d782a28 (Manifest_cache true)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 35d17b9 (Manifest_cache true)
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> add330c (Manifest_cache true)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 15bff2e (Manifest_cache true)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> 6c71f00 (Manifest_cache true)
=======
>>>>>>> 1d59aaa (Fix)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 0b43b18 (Manifest_cache true)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c033601 (Rebased)
=======
>>>>>>> a636fda (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 563720e (Featire specs)
=======
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> c8cdb08 (Manifest_cache true)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 86d584a (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> bf554f4 (Rebased)
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 35d17b9 (Manifest_cache true)
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> add330c (Manifest_cache true)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 15bff2e (Manifest_cache true)
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 6c71f00 (Manifest_cache true)
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 715fac2 (Featire specs)
=======
          
      2547. 
=======
>>>>>>> 2a25e4c (Featire specs)
          
      2548. 
>>>>>>> d0dc1f1 (Featire specs)
            
            

            

                browser: :chrome,
          
        2549. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c033601 (Rebased)
=======
>>>>>>> a636fda (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 0b43b18 (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
          
      2549. 
=======
          
      2550. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
=======
=======
          
      2551. 
>>>>>>> 02a399d (Manifest_cache true)
=======
          
      2552. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
            
            

            

<<<<<<< HEAD
                http_client: client,
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              )
=======
<<<<<<< HEAD
                options: options
>>>>>>> 752f0c0 (Featire specs)
=======
                http_client: client,
>>>>>>> 4e81ea2 (Featire specs)
=======
                browser: :chrome,
=======
                options: options
>>>>>>> 752f0c0 (Featire specs)
=======
                http_client: client,
>>>>>>> 4e81ea2 (Featire specs)
=======
                browser: :chrome,
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
          
        2553. 
        
        
      
        
        
<<<<<<< HEAD
          
      2553. 
=======
          
      2554. 
>>>>>>> d0dc1f1 (Featire specs)
            
            

            

<<<<<<< HEAD
                options: options
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
              )
=======
                options: options
>>>>>>> 4e81ea2 (Featire specs)
=======
                http_client: client,
>>>>>>> 715fac2 (Featire specs)
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
          
        2555. 
        
        
      
        
        
>>>>>>> df37394 (Featire specs)
          
      2555. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
          
      2556. 
>>>>>>> 02a399d (Manifest_cache true)
=======
          
      2557. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      2558. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
      2559. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      2560. 
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> b3f2049 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
=======
>>>>>>> b3f2049 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
=======
=======
          
      2561. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
      2562. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      2563. 
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0e864a5 (Manifest_cache true)
=======
=======
=======
          
      2564. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
=======
=======
=======
          
      2565. 
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
      2566. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
=======
=======
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> bf554f4 (Rebased)
=======
>>>>>>> 9620751 (Featire specs)
          
      2567. 
<<<<<<< HEAD
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> e055dd0 (Rebased)
=======
=======
=======
          
      2568. 
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5e31aeb (Featire specs)
=======
=======
>>>>>>> 0b43b18 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1cce66c (Manifest_cache true)
=======
=======
=======
          
      2569. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 6da9530 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f92a45b (Featire specs)
                http_client: client,
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              )
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              )
=======
=======
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 0b43b18 (Manifest_cache true)
<<<<<<< HEAD
=======
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
<<<<<<< HEAD
=======
          
        2570. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bf554f4 (Rebased)
=======
<<<<<<< HEAD
>>>>>>> 9620751 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 845dac1 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 59d75f9 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 96aecde (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 2722d07 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> e54deeb (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 3b03895 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 2c640cf (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> b15044a (Manifest_cache true)
=======
>>>>>>> 7c4ea7f (Fix)
=======
>>>>>>> 3e9f99d (Featire specs)
          
      2570. 
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      2571. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      2572. 
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      2573. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
      2574. 
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      2575. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      2576. 
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      2577. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
          
      2578. 
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
      2579. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 49e8a6c (Rebased)
=======
=======
          
      2580. 
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
=======
>>>>>>> e9f3851 (Manifest_cache true)
=======
=======
          
      2581. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> d782a28 (Manifest_cache true)
=======
=======
          
      2582. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 35d17b9 (Manifest_cache true)
=======
=======
          
      2583. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> ee5242b (Featire specs)
=======
=======
          
      2584. 
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> add330c (Manifest_cache true)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
=======
          
      2585. 
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 15bff2e (Manifest_cache true)
=======
=======
          
      2586. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
          
      2587. 
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> 6c71f00 (Manifest_cache true)
=======
>>>>>>> 1d59aaa (Fix)
=======
=======
          
      2588. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
=======
>>>>>>> 0b43b18 (Manifest_cache true)
=======
=======
          
      2589. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
            
            

            

<<<<<<< HEAD
>>>>>>> c8cdb08 (Manifest_cache true)
>>>>>>> 86d584a (Manifest_cache true)
                options: options
>>>>>>> 752f0c0 (Featire specs)
=======
                http_client: client,
>>>>>>> 4e81ea2 (Featire specs)
=======
                browser: :chrome,
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
          
        2590. 
        
        
      
        
        
>>>>>>> df37394 (Featire specs)
          
      2590. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
<<<<<<< HEAD
=======
=======
          
      2591. 
>>>>>>> 02a399d (Manifest_cache true)
=======
          
      2592. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
          
      2593. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
      2594. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      2595. 
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e5890c2 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
=======
=======
=======
          
      2596. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
=======
          
      2597. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
          
      2598. 
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
      2599. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> bf554f4 (Rebased)
=======
>>>>>>> 9620751 (Featire specs)
          
      2600. 
<<<<<<< HEAD
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> bc6bc8d2 (Rebased)
=======
=======
=======
=======
          
      2601. 
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> d52f9efe (Featire specs)
=======
=======
=======
          
      2602. 
>>>>>>> 08edf50 (Featire specs)
=======
          
      2603. 
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
          
      2604. 
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4367ccb1 (Manifest_cache true)
=======
=======
=======
          
      2605. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b904d7ae (Featire specs)
=======
=======
=======
          
      2606. 
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> 64dceec (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4fac471d (Manifest_cache true)
=======
=======
=======
>>>>>>> 7c4ea7f (Fix)
          
      2607. 
>>>>>>> 5b7749a (Fix)
>>>>>>> ef483b6d (Fix)
            
            

            

<<<<<<< HEAD
                browser: :chrome,
          
        2608. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> d782a28 (Manifest_cache true)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 35d17b9 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> c59d1a99 (Manifest_cache true)
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 11792758 (Rebased)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> c033601 (Rebased)
=======
>>>>>>> a636fda (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 563720e (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> b9cc4e9 (Manifest_cache true)
=======
>>>>>>> d2e6b3c (Featire specs)
=======
>>>>>>> c8cdb08 (Manifest_cache true)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 86d584a (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
=======
=======
>>>>>>> 59d75f9 (Featire specs)
<<<<<<< HEAD
>>>>>>> af057e3 (Featire specs)
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
>>>>>>> 35d17b9 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 59d75f9 (Featire specs)
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 64dceec (Manifest_cache true)
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> ebcdce06 (Featire specs)
=======
>>>>>>> c59d1a99 (Manifest_cache true)
=======
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> 37e48018 (Featire specs)
          
      2608. 
=======
          
      2609. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      2610. 
>>>>>>> 02a399d (Manifest_cache true)
=======
          
      2611. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
      2612. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
      2613. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      2614. 
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
=======
=======
          
      2615. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
=======
=======
          
      2616. 
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
      2617. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 37e48018 (Featire specs)
=======
          
      2618. 
>>>>>>> 11792758 (Rebased)
            
            

            

>>>>>>> 610b6138 (Featire specs)
<<<<<<< HEAD
=======
            
            

            

>>>>>>> c59d1a99 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                http_client: client,
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 311e9fa (Rebased)
=======
>>>>>>> 824bb2b (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
                http_client: client,
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
                http_client: client,
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              )
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              )
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              )
=======
=======
>>>>>>> e5890c2 (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
=======
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 37e48018 (Featire specs)
=======
<<<<<<< HEAD
=======
=======
>>>>>>> fd3f47ab (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 00f8b58 (Manifest_cache true)
>>>>>>> 4d4cf6b4 (Featire specs)
<<<<<<< HEAD
=======
=======
>>>>>>> c033601 (Rebased)
=======
                options: options
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
              )
=======
                options: options
>>>>>>> 4e81ea2 (Featire specs)
=======
                http_client: client,
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
>>>>>>> f92a45b (Featire specs)
          
        2619. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bf554f4 (Rebased)
          
      2619. 
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
=======
          
        2620. 
        
        
      
        
        
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bf554f4 (Rebased)
=======
<<<<<<< HEAD
>>>>>>> 9620751 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 845dac1 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 59d75f9 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 96aecde (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
          
      2620. 
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> bc6bc8d2 (Rebased)
=======
<<<<<<< HEAD
>>>>>>> d52f9efe (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> e54deeb (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
          
      2621. 
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
<<<<<<< HEAD
>>>>>>> 3b03895 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 2c640cf (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> b15044a (Manifest_cache true)
=======
>>>>>>> 7c4ea7f (Fix)
          
      2622. 
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
          
      2623. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      2624. 
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      2625. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
      2626. 
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      2627. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      2628. 
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      2629. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
=======
=======
          
      2630. 
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
      2631. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 11792758 (Rebased)
=======
>>>>>>> e5890c2 (Manifest_cache true)
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
=======
>>>>>>> d4235040 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> e5890c2 (Manifest_cache true)
=======
=======
>>>>>>> 255dd8d (Manifest_cache true)
=======
          
      2632. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
<<<<<<< HEAD
=======
=======
=======
          
      2633. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
          
      2634. 
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
      2635. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> bc6bc8d2 (Rebased)
=======
=======
=======
=======
          
      2636. 
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> d52f9efe (Featire specs)
=======
=======
=======
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b719333 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d34a0770 (Manifest_cache true)
=======
=======
=======
=======
          
      2637. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
=======
>>>>>>> d782a28 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a304bcf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> bd30d038 (Manifest_cache true)
=======
=======
=======
=======
          
      2638. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> c12b71de (Featire specs)
=======
=======
=======
>>>>>>> 35d17b9 (Manifest_cache true)
>>>>>>> 255dd8d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d4235040 (Manifest_cache true)
=======
=======
=======
          
      2639. 
>>>>>>> 08edf50 (Featire specs)
=======
          
      2640. 
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
          
      2641. 
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4367ccb1 (Manifest_cache true)
=======
=======
=======
          
      2642. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b904d7ae (Featire specs)
=======
=======
=======
          
      2643. 
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> 64dceec (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4fac471d (Manifest_cache true)
=======
=======
>>>>>>> 5b7749a (Fix)
>>>>>>> ef483b6d (Fix)
            
            

            

>>>>>>> c8cdb08 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c59d1a99 (Manifest_cache true)
=======
=======
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
              )
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
>>>>>>> e5890c2 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
                options: options
>>>>>>> 752f0c0 (Featire specs)
=======
                http_client: client,
>>>>>>> 4e81ea2 (Featire specs)
=======
                browser: :chrome,
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
          
        2644. 
        
        
      
        
        
>>>>>>> df37394 (Featire specs)
          
      2644. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
<<<<<<< HEAD
=======
=======
          
      2645. 
>>>>>>> 02a399d (Manifest_cache true)
=======
          
      2646. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
          
      2647. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
      2648. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      2649. 
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e5890c2 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 251144b4 (Manifest_cache true)
=======
=======
=======
=======
          
      2650. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
=======
          
      2651. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
          
      2652. 
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
      2653. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
=======
>>>>>>> 00f8b58 (Manifest_cache true)
=======
>>>>>>> bf554f4 (Rebased)
=======
>>>>>>> 9620751 (Featire specs)
          
      2654. 
<<<<<<< HEAD
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> 13fca83d (Rebased)
=======
=======
=======
=======
          
      2655. 
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376a (Featire specs)
=======
=======
=======
          
      2656. 
>>>>>>> 08edf50 (Featire specs)
=======
          
      2657. 
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
          
      2658. 
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e59c273d (Manifest_cache true)
=======
=======
=======
          
      2659. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 393eff3b (Featire specs)
=======
=======
=======
          
      2660. 
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> 64dceec (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 7afa007b (Manifest_cache true)
=======
=======
=======
>>>>>>> 7c4ea7f (Fix)
          
      2661. 
>>>>>>> 5b7749a (Fix)
>>>>>>> d9d85ca6 (Fix)
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
                http_client: client,
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 311e9fa (Rebased)
=======
>>>>>>> 824bb2b (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
                http_client: client,
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
                http_client: client,
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              )
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              )
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
              )
=======
=======
>>>>>>> e5890c2 (Manifest_cache true)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
=======
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 24b58e6 (Manifest_cache true)
=======
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
<<<<<<< HEAD
=======
=======
>>>>>>> f0e2e12a (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 00f8b58 (Manifest_cache true)
>>>>>>> d8abfed3 (Featire specs)
<<<<<<< HEAD
=======
=======
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
=======
                options: options
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
              )
=======
                options: options
>>>>>>> 4e81ea2 (Featire specs)
=======
                http_client: client,
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
                http_client: client,
>>>>>>> c033601 (Rebased)
>>>>>>> 6da9530 (Featire specs)
>>>>>>> 0f8241bb (Featire specs)
          
        2662. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bf554f4 (Rebased)
          
      2662. 
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
=======
          
        2663. 
        
        
      
        
        
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> bf554f4 (Rebased)
=======
<<<<<<< HEAD
>>>>>>> 9620751 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 845dac1 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 59d75f9 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 96aecde (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> c4adab0 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
          
      2663. 
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 251144b4 (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 13fca83d (Rebased)
=======
<<<<<<< HEAD
>>>>>>> f136376a (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> e54deeb (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
          
      2664. 
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
<<<<<<< HEAD
>>>>>>> 3b03895 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 2c640cf (Manifest_cache true)
=======
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> b15044a (Manifest_cache true)
=======
>>>>>>> 7c4ea7f (Fix)
          
      2665. 
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
          
      2666. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
=======
>>>>>>> 009401d (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
          
      2667. 
>>>>>>> 02a399d (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      2668. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
          
      2669. 
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      2670. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      2671. 
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      2672. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
=======
=======
          
      2673. 
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
      2674. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 34509eee (Featire specs)
=======
>>>>>>> 75fa7e1b (Rebased)
=======
>>>>>>> e5890c2 (Manifest_cache true)
>>>>>>> 251144b4 (Manifest_cache true)
=======
=======
>>>>>>> 304cd28a (Manifest_cache true)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
>>>>>>> e5890c2 (Manifest_cache true)
=======
=======
>>>>>>> 255dd8d (Manifest_cache true)
=======
          
      2675. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
<<<<<<< HEAD
=======
=======
=======
          
      2676. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
          
      2677. 
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
      2678. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> 13fca83d (Rebased)
=======
=======
=======
=======
          
      2679. 
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376a (Featire specs)
=======
=======
=======
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b719333 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0341d6de (Manifest_cache true)
=======
=======
=======
=======
          
      2680. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0ea (Featire specs)
=======
=======
=======
>>>>>>> d782a28 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a304bcf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d245196f (Manifest_cache true)
=======
=======
=======
=======
          
      2681. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888bf (Featire specs)
=======
=======
=======
>>>>>>> 35d17b9 (Manifest_cache true)
>>>>>>> 255dd8d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 304cd28a (Manifest_cache true)
=======
=======
=======
          
      2682. 
>>>>>>> 08edf50 (Featire specs)
=======
          
      2683. 
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
          
      2684. 
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e59c273d (Manifest_cache true)
=======
=======
=======
          
      2685. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 393eff3b (Featire specs)
=======
=======
=======
          
      2686. 
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> 64dceec (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 7afa007b (Manifest_cache true)
=======
=======
>>>>>>> 5b7749a (Fix)
>>>>>>> d9d85ca6 (Fix)
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
>>>>>>> b3f2049 (Featire specs)
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
            
            

            

>>>>>>> c8cdb08 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 490b01d6 (Manifest_cache true)
=======
=======
>>>>>>> 251144b4 (Manifest_cache true)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
              )
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
>>>>>>> e5890c2 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 251144b4 (Manifest_cache true)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
                options: options
>>>>>>> 752f0c0 (Featire specs)
=======
                http_client: client,
>>>>>>> 4e81ea2 (Featire specs)
=======
                browser: :chrome,
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
=======
=======
                http_client: client,
>>>>>>> c033601 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 7a08014b (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
                options: options
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
              )
=======
                options: options
>>>>>>> 4e81ea2 (Featire specs)
=======
                http_client: client,
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
          
        2687. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      2687. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> d34a0770 (Manifest_cache true)
=======
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> bd30d038 (Manifest_cache true)
=======
>>>>>>> c12b71de (Featire specs)
=======
>>>>>>> d4235040 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
          
      2688. 
=======
          
      2689. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> 659083f (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
          
      2690. 
>>>>>>> 02a399d (Manifest_cache true)
=======
          
      2691. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
>>>>>>> b3f2049 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> efd6af09 (Featire specs)
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> d52f9efe (Featire specs)
=======
=======
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d34a0770 (Manifest_cache true)
=======
=======
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
>>>>>>> d782a28 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> bd30d038 (Manifest_cache true)
=======
=======
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c12b71de (Featire specs)
=======
=======
>>>>>>> 35d17b9 (Manifest_cache true)
>>>>>>> d4235040 (Manifest_cache true)
          
      2692. 
=======
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
          
      2693. 
=======
          
      2694. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> b719333 (Manifest_cache true)
<<<<<<< HEAD
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
          
      2695. 
>>>>>>> 02a399d (Manifest_cache true)
=======
          
      2696. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
          
      2697. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      2698. 
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e5890c2 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
=======
=======
=======
          
      2699. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> d52f9efe (Featire specs)
=======
=======
=======
=======
          
      2700. 
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b719333 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d34a0770 (Manifest_cache true)
=======
=======
=======
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
=======
=======
          
      2701. 
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> d782a28 (Manifest_cache true)
>>>>>>> a304bcf (Manifest_cache true)
>>>>>>> bd30d038 (Manifest_cache true)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> b3f2049 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
>>>>>>> 448bef30 (Featire specs)
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> df37394 (Featire specs)
=======
          
      2702. 
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
      2703. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
      2704. 
>>>>>>> 49e8a6c (Rebased)
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> e6fc67c7 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> f92a45b (Featire specs)
>>>>>>> e6fc67c7 (Featire specs)
                options: options
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
              )
=======
                options: options
>>>>>>> 4e81ea2 (Featire specs)
=======
                http_client: client,
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
          
        2705. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> 4367ccb1 (Manifest_cache true)
=======
>>>>>>> b904d7ae (Featire specs)
=======
>>>>>>> 4fac471d (Manifest_cache true)
=======
>>>>>>> ef483b6d (Fix)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
=======
=======
=======
=======
=======
=======
=======
=======
=======
=======
=======
=======
=======
=======
=======
=======
=======
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 1cce66c (Manifest_cache true)
>>>>>>> d365be68 (Manifest_cache true)
=======
>>>>>>> 3cf8dd4 (Featire specs)
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> 9e081dc (Fix)
>>>>>>> 1049b80c (Fix)
=======
>>>>>>> ca274ec (Manifest_cache true)
>>>>>>> a56ba36d (Manifest_cache true)
=======
>>>>>>> 15c51b7 (Featire specs)
>>>>>>> 392646b5 (Featire specs)
=======
>>>>>>> c0159bf (Manifest_cache true)
>>>>>>> 1d0f5cbf (Manifest_cache true)
=======
>>>>>>> 72b9cab (Featire specs)
>>>>>>> 21873de0 (Featire specs)
=======
>>>>>>> 42e9c2e (Manifest_cache true)
>>>>>>> 16ebb0ff (Manifest_cache true)
=======
>>>>>>> 8181d13 (Featire specs)
>>>>>>> 4a2f2ad8 (Featire specs)
=======
>>>>>>> fd310ed (Manifest_cache true)
>>>>>>> 86229876 (Manifest_cache true)
=======
>>>>>>> 973ba8c (Featire specs)
>>>>>>> b97bb382 (Featire specs)
=======
>>>>>>> 551c6ab (Manifest_cache true)
>>>>>>> 56531f25 (Manifest_cache true)
=======
>>>>>>> 51bc18c (Featire specs)
>>>>>>> 7b22ad7e (Featire specs)
=======
>>>>>>> 3be4d14 (Manifest_cache true)
>>>>>>> 1b8f36d8 (Manifest_cache true)
=======
>>>>>>> 5e31aeb (Featire specs)
>>>>>>> 53db2224 (Featire specs)
=======
>>>>>>> e055dd0 (Rebased)
>>>>>>> bdc24a1a (Rebased)
=======
>>>>>>> 0676508 (Featire specs)
>>>>>>> 448bef30 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> cc390719 (Manifest_cache true)
=======
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 251144b4 (Manifest_cache true)
=======
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f136376a (Featire specs)
=======
=======
>>>>>>> 53db2224 (Featire specs)
=======
>>>>>>> 1b8f36d8 (Manifest_cache true)
=======
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0341d6de (Manifest_cache true)
=======
=======
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1ca9c0ea (Featire specs)
=======
=======
>>>>>>> 7b22ad7e (Featire specs)
=======
>>>>>>> 56531f25 (Manifest_cache true)
=======
>>>>>>> d782a28 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d245196f (Manifest_cache true)
=======
=======
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4bf888bf (Featire specs)
=======
=======
>>>>>>> b97bb382 (Featire specs)
=======
>>>>>>> 86229876 (Manifest_cache true)
=======
>>>>>>> 35d17b9 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 304cd28a (Manifest_cache true)
=======
=======
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
>>>>>>> add330c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 16ebb0ff (Manifest_cache true)
=======
=======
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
>>>>>>> 15bff2e (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1d0f5cbf (Manifest_cache true)
=======
=======
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 392646b5 (Featire specs)
=======
=======
>>>>>>> 6c71f00 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a56ba36d (Manifest_cache true)
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
>>>>>>> 0b43b18 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d365be68 (Manifest_cache true)
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      2705. 
=======
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 8cbdfeb (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 64dceec (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4367ccb1 (Manifest_cache true)
=======
=======
>>>>>>> 36356d3 (Featire specs)
>>>>>>> b904d7ae (Featire specs)
=======
>>>>>>> 4fac471d (Manifest_cache true)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
>>>>>>> 659083f (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 86d584a (Manifest_cache true)
>>>>>>> 0e864a5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> cc390719 (Manifest_cache true)
=======
=======
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 5e31aeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 53db2224 (Featire specs)
=======
=======
=======
>>>>>>> e9f3851 (Manifest_cache true)
>>>>>>> 3be4d14 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1b8f36d8 (Manifest_cache true)
=======
=======
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
>>>>>>> d782a28 (Manifest_cache true)
>>>>>>> 551c6ab (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 56531f25 (Manifest_cache true)
=======
=======
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
=======
>>>>>>> 35d17b9 (Manifest_cache true)
>>>>>>> fd310ed (Manifest_cache true)
>>>>>>> 86229876 (Manifest_cache true)
          
      2706. 
=======
          
      2707. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> 3be4d14 (Manifest_cache true)
=======
>>>>>>> 216fe41 (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> b719333 (Manifest_cache true)
<<<<<<< HEAD
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
          
      2708. 
>>>>>>> 02a399d (Manifest_cache true)
=======
          
      2709. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 551c6ab (Manifest_cache true)
=======
>>>>>>> 3cf8dd4 (Featire specs)
>>>>>>> b3f2049 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
=======
=======
          
      2710. 
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
          
      2711. 
>>>>>>> bd8bda4 (Manifest_cache true)
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
          
      2712. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      2713. 
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d4235040 (Manifest_cache true)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e5890c2 (Manifest_cache true)
=======
=======
=======
          
      2714. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
=======
=======
=======
          
      2715. 
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b719333 (Manifest_cache true)
=======
=======
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
=======
=======
=======
          
      2716. 
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a304bcf (Manifest_cache true)
=======
=======
=======
          
      2717. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d4235040 (Manifest_cache true)
>>>>>>> bf05825 (Featire specs)
=======
=======
>>>>>>> 35d17b9 (Manifest_cache true)
>>>>>>> 255dd8d (Manifest_cache true)
<<<<<<< HEAD
=======
=======
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> b3f2049 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
=======
=======
          
      2718. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      2719. 
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0e864a5 (Manifest_cache true)
=======
=======
=======
          
      2720. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5e31aeb (Featire specs)
=======
=======
=======
          
      2721. 
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 3be4d14 (Manifest_cache true)
=======
=======
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 51bc18c (Featire specs)
=======
=======
=======
          
      2722. 
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 551c6ab (Manifest_cache true)
=======
=======
=======
          
      2723. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 973ba8c (Featire specs)
=======
=======
>>>>>>> 35d17b9 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> fd310ed (Manifest_cache true)
=======
=======
=======
          
      2724. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
=======
=======
=======
          
      2725. 
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> add330c (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 42e9c2e (Manifest_cache true)
=======
=======
=======
          
      2726. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
=======
=======
>>>>>>> 0b43b18 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1cce66c (Manifest_cache true)
=======
=======
=======
          
      2727. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
=======
=======
=======
          
      2728. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
            
            

            

>>>>>>> 0f8241bb (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> bf05825 (Featire specs)
>>>>>>> c12b71de (Featire specs)
=======
>>>>>>> d4235040 (Manifest_cache true)
            
            

            

>>>>>>> 84809242 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
          
      2729. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
          
      2730. 
=======
          
      2731. 
>>>>>>> d0dc1f1 (Featire specs)
=======
          
      2732. 
>>>>>>> 02a399d (Manifest_cache true)
=======
          
      2733. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
      2734. 
>>>>>>> bd8bda4 (Manifest_cache true)
=======
          
      2735. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      2736. 
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 490b01d6 (Manifest_cache true)
=======
=======
          
      2737. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
=======
          
      2738. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
          
      2739. 
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
      2740. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
          
      2741. 
>>>>>>> 75fa7e1b (Rebased)
            
            

            

<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> df37394 (Featire specs)
=======
          
      2742. 
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
      2743. 
>>>>>>> 7a02bbe (Featire specs)
=======
          
      2744. 
<<<<<<< HEAD
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 15bff2e (Manifest_cache true)
=======
=======
          
      2745. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
          
      2746. 
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> 6c71f00 (Manifest_cache true)
=======
          
      2747. 
>>>>>>> 1d59aaa (Fix)
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 715fac2 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> df37394 (Featire specs)
=======
=======
          
      2748. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
          
      2749. 
>>>>>>> 183b6c5 (Manifest_cache true)
=======
          
      2750. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
<<<<<<< HEAD
=======
          
      2751. 
>>>>>>> 49e8a6c (Rebased)
=======
=======
          
      2752. 
>>>>>>> 08edf50 (Featire specs)
=======
          
      2753. 
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4367ccb1 (Manifest_cache true)
=======
=======
          
      2754. 
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b904d7ae (Featire specs)
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
=======
          
      2755. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4fac471d (Manifest_cache true)
>>>>>>> 36356d3 (Featire specs)
=======
=======
          
      2756. 
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> 64dceec (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      2757. 
>>>>>>> 5b7749a (Fix)
=======
>>>>>>> c59d1a99 (Manifest_cache true)
=======
=======
          
      2758. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 610b6138 (Featire specs)
=======
=======
          
      2759. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 37e48018 (Featire specs)
=======
          
      2760. 
>>>>>>> 11792758 (Rebased)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 8cbdfeb (Manifest_cache true)
>>>>>>> 4367ccb1 (Manifest_cache true)
=======
>>>>>>> 36356d3 (Featire specs)
>>>>>>> b904d7ae (Featire specs)
=======
>>>>>>> 4fac471d (Manifest_cache true)
=======
=======
          
      2761. 
>>>>>>> 5b7749a (Fix)
>>>>>>> ef483b6d (Fix)
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> e5752db (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
<<<<<<< HEAD
=======
=======
>>>>>>> 6da9530 (Featire specs)
>>>>>>> 0f8241bb (Featire specs)
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 7a08014b (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> e6fc67c7 (Featire specs)
=======
>>>>>>> 73f364d8 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> f92a45b (Featire specs)
=======
>>>>>>> fb61c5a (Featire specs)
=======
>>>>>>> c033601 (Rebased)
>>>>>>> 4f4ea3f9 (Featire specs)
              )
=======
=======
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> ebcdce06 (Featire specs)
                options: options
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
              )
=======
                options: options
>>>>>>> 4e81ea2 (Featire specs)
=======
                http_client: client,
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
          
        2762. 
        
        
      
        
        
<<<<<<< HEAD
          
      2762. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
=======
=======
>>>>>>> 3e9f99d (Featire specs)
>>>>>>> 3cf8dd4 (Featire specs)
          
      2763. 
=======
          
      2764. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> 659083f (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
=======
>>>>>>> 009401d (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
          
      2765. 
>>>>>>> 02a399d (Manifest_cache true)
=======
          
      2766. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
>>>>>>> b3f2049 (Featire specs)
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 4e81ea2 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
              )
=======
                options: options
>>>>>>> 08edf50 (Featire specs)
          
        2767. 
        
        
      
        
        
          
      2767. 
            
            

            

<<<<<<< HEAD
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
>>>>>>> c033601 (Rebased)
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 4e81ea2 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> c7a726c5 (Rebased)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> ebcdce06 (Featire specs)
              )
=======
                options: options
>>>>>>> 08edf50 (Featire specs)
          
        2768. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
=======
=======
=======
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
          
      2768. 
>>>>>>> 35d17b9 (Manifest_cache true)
>>>>>>> 255dd8d (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
          
      2769. 
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
          
      2770. 
>>>>>>> d782a28 (Manifest_cache true)
>>>>>>> a304bcf (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
          
      2771. 
>>>>>>> e9f3851 (Manifest_cache true)
>>>>>>> b719333 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
          
      2772. 
>>>>>>> 5507b42 (Featire specs)
>>>>>>> 932dbec (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 49e8a6c (Rebased)
>>>>>>> 311e9fa (Rebased)
>>>>>>> 13fca83d (Rebased)
          
      2773. 
<<<<<<< HEAD
>>>>>>> 251144b4 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
          
      2774. 
>>>>>>> 84809242 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 75fa7e1b (Rebased)
          
      2775. 
<<<<<<< HEAD
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
=======
>>>>>>> e5890c2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 64dceec (Manifest_cache true)
=======
>>>>>>> 5b7749a (Fix)
          
      2776. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> b15044a (Manifest_cache true)
>>>>>>> 64dceec (Manifest_cache true)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b3f2049 (Featire specs)
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 6cdb2e1 (Featire specs)
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
          
      2777. 
=======
          
      2778. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
=======
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
>>>>>>> ecb02dbf (Featire specs)
          
      2779. 
>>>>>>> 02a399d (Manifest_cache true)
=======
          
      2780. 
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
>>>>>>> b3f2049 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> b3f2049 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
=======
=======
>>>>>>> 3e9f99d (Featire specs)
>>>>>>> 3cf8dd4 (Featire specs)
            
            

            

>>>>>>> 84003439 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 4e81ea2 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
=======
=======
>>>>>>> df37394 (Featire specs)
              )
=======
                options: options
>>>>>>> 08edf50 (Featire specs)
          
        2781. 
        
        
      
        
        
          
      2781. 
            
            

            

<<<<<<< HEAD
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
=======
>>>>>>> c033601 (Rebased)
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 4e81ea2 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> f92a45b (Featire specs)
=======
=======
>>>>>>> 715fac2 (Featire specs)
>>>>>>> fb61c5a (Featire specs)
              )
=======
                options: options
>>>>>>> 08edf50 (Featire specs)
          
        2782. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
          
      2782. 
>>>>>>> 1d59aaa (Fix)
=======
<<<<<<< HEAD
<<<<<<< HEAD
          
      2783. 
>>>>>>> 6c71f00 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
          
      2784. 
>>>>>>> 6fba6be (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
          
      2785. 
>>>>>>> 15bff2e (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
          
      2786. 
>>>>>>> a9e66e9 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
          
      2787. 
>>>>>>> add330c (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
          
      2788. 
>>>>>>> ee5242b (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
          
      2789. 
>>>>>>> 35d17b9 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
          
      2790. 
>>>>>>> 96394f1 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
          
      2791. 
>>>>>>> d782a28 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
          
      2792. 
>>>>>>> e9f3851 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
          
      2793. 
>>>>>>> 5507b42 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 49e8a6c (Rebased)
          
      2794. 
<<<<<<< HEAD
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 9620751 (Featire specs)
=======
>>>>>>> 845dac1 (Manifest_cache true)
=======
>>>>>>> 96aecde (Manifest_cache true)
=======
>>>>>>> c4adab0 (Featire specs)
=======
>>>>>>> 2722d07 (Manifest_cache true)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> 2c640cf (Manifest_cache true)
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> b15044a (Manifest_cache true)
=======
>>>>>>> 0b43b18 (Manifest_cache true)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
          
      2795. 
=======
          
      2796. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      2797. 
>>>>>>> 02a399d (Manifest_cache true)
=======
          
      2798. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
      2799. 
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c8cdb08 (Manifest_cache true)
=======
=======
          
      2800. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0b43b18 (Manifest_cache true)
>>>>>>> b832d45 (Featire specs)
=======
=======
          
      2801. 
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 86d584a (Manifest_cache true)
=======
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
>>>>>>> 2ee03d3 (Featire specs)
=======
=======
          
      2802. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> add330c (Manifest_cache true)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
=======
=======
          
      2803. 
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 24b58e6 (Manifest_cache true)
=======
=======
          
      2804. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 15bff2e (Manifest_cache true)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
=======
=======
=======
          
      2805. 
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 00f8b58 (Manifest_cache true)
=======
          
      2806. 
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
>>>>>>> 49e8a6c (Rebased)
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
=======
=======
=======
          
      2807. 
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
=======
=======
=======
          
      2808. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
=======
=======
=======
          
      2809. 
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 35d17b9 (Manifest_cache true)
=======
=======
=======
          
      2810. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
=======
=======
=======
          
      2811. 
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> add330c (Manifest_cache true)
=======
=======
=======
          
      2812. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
=======
=======
=======
          
      2813. 
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 15bff2e (Manifest_cache true)
=======
=======
=======
          
      2814. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
=======
=======
=======
          
      2815. 
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 6c71f00 (Manifest_cache true)
=======
=======
          
      2816. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
            
            

            

<<<<<<< HEAD
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> c033601 (Rebased)
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 4e81ea2 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
              )
          
        2817. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
=======
=======
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
          
      2817. 
>>>>>>> 35d17b9 (Manifest_cache true)
>>>>>>> 255dd8d (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
          
      2818. 
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
          
      2819. 
>>>>>>> d782a28 (Manifest_cache true)
>>>>>>> a304bcf (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
          
      2820. 
>>>>>>> e9f3851 (Manifest_cache true)
>>>>>>> b719333 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
          
      2821. 
>>>>>>> 5507b42 (Featire specs)
>>>>>>> 932dbec (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 49e8a6c (Rebased)
>>>>>>> 311e9fa (Rebased)
          
      2822. 
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
=======
>>>>>>> e5890c2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 8cbdfeb (Manifest_cache true)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 64dceec (Manifest_cache true)
=======
>>>>>>> 5b7749a (Fix)
          
      2823. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 37e48018 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> d52f9efe (Featire specs)
=======
=======
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d34a0770 (Manifest_cache true)
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> bd30d038 (Manifest_cache true)
=======
=======
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> c12b71de (Featire specs)
=======
=======
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d4235040 (Manifest_cache true)
=======
=======
>>>>>>> fd3f47ab (Featire specs)
<<<<<<< HEAD
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
=======
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4367ccb1 (Manifest_cache true)
=======
=======
=======
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b904d7ae (Featire specs)
=======
=======
=======
>>>>>>> b15044a (Manifest_cache true)
>>>>>>> 64dceec (Manifest_cache true)
>>>>>>> 4fac471d (Manifest_cache true)
          
      2824. 
=======
          
      2825. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c59d1a99 (Manifest_cache true)
          
      2826. 
>>>>>>> 02a399d (Manifest_cache true)
=======
          
      2827. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
      2828. 
>>>>>>> bd8bda4 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> bd30d038 (Manifest_cache true)
=======
>>>>>>> c12b71de (Featire specs)
>>>>>>> c8cdb08 (Manifest_cache true)
=======
=======
          
      2829. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c59d1a99 (Manifest_cache true)
=======
>>>>>>> d4235040 (Manifest_cache true)
>>>>>>> b832d45 (Featire specs)
=======
=======
          
      2830. 
>>>>>>> aa7b40c (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 490b01d6 (Manifest_cache true)
=======
=======
=======
          
      2831. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
=======
          
      2832. 
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 24b58e6 (Manifest_cache true)
=======
=======
          
      2833. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e59c273d (Manifest_cache true)
=======
>>>>>>> 4367ccb1 (Manifest_cache true)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
=======
          
      2834. 
>>>>>>> fd6db03 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 00f8b58 (Manifest_cache true)
=======
          
      2835. 
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
>>>>>>> 75fa7e1b (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
<<<<<<< HEAD
          
      2836. 
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e5890c2 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 251144b4 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
>>>>>>> 610b6138 (Featire specs)
=======
=======
          
      2837. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
=======
          
      2838. 
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 24b58e6 (Manifest_cache true)
=======
=======
          
      2839. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
=======
=======
          
      2840. 
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 00f8b58 (Manifest_cache true)
=======
          
      2841. 
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> 13fca83d (Rebased)
=======
=======
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376a (Featire specs)
=======
=======
=======
=======
>>>>>>> 9620751 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 9620751 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      2842. 
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b719333 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0341d6de (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a304bcf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d245196f (Manifest_cache true)
=======
=======
=======
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      2843. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888bf (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      2844. 
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 35d17b9 (Manifest_cache true)
>>>>>>> 255dd8d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 304cd28a (Manifest_cache true)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      2845. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54deeb (Featire specs)
=======
=======
          
      2846. 
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
=======
=======
          
      2847. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
=======
          
      2848. 
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e59c273d (Manifest_cache true)
=======
=======
=======
=======
          
      2849. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 393eff3b (Featire specs)
=======
=======
=======
=======
          
      2850. 
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 64dceec (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 7afa007b (Manifest_cache true)
=======
=======
=======
          
      2851. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
>>>>>>> d9d85ca6 (Fix)
            
            

            

<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> df37394 (Featire specs)
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
>>>>>>> f0e2e12a (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
=======
>>>>>>> c033601 (Rebased)
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
=======
>>>>>>> c033601 (Rebased)
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> c7a726c5 (Rebased)
=======
=======
<<<<<<< HEAD
>>>>>>> 4e81ea2 (Featire specs)
=======
              )
          
        2852. 
        
        
      
        
        
          
      2852. 
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
>>>>>>> c59d1a99 (Manifest_cache true)
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 11792758 (Rebased)
=======
=======
          
      2853. 
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
=======
>>>>>>> 9440753 (Featire specs)
>>>>>>> 4a0e3b6 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 86d584a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> e5890c2 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1d6a89b5 (Manifest_cache true)
=======
=======
=======
=======
=======
          
      2854. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
=======
          
      2855. 
>>>>>>> 183b6c5 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 24b58e6 (Manifest_cache true)
=======
=======
          
      2856. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
=======
          
      2857. 
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 00f8b58 (Manifest_cache true)
=======
          
      2858. 
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> bc6bc8d2 (Rebased)
=======
=======
=======
=======
>>>>>>> 9620751 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> d52f9efe (Featire specs)
=======
=======
=======
=======
>>>>>>> 9620751 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> 9620751 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      2859. 
>>>>>>> 02a399d (Manifest_cache true)
>>>>>>> 845dac1 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e9f3851 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> b719333 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d34a0770 (Manifest_cache true)
=======
=======
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d782a28 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> a304bcf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> bd30d038 (Manifest_cache true)
=======
=======
=======
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 96aecde (Manifest_cache true)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      2860. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> c12b71de (Featire specs)
=======
=======
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      2861. 
>>>>>>> aa7b40c (Manifest_cache true)
>>>>>>> 2722d07 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 35d17b9 (Manifest_cache true)
>>>>>>> 255dd8d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> d4235040 (Manifest_cache true)
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
=======
          
      2862. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> e54deeb (Featire specs)
=======
=======
          
      2863. 
>>>>>>> 183b6c5 (Manifest_cache true)
>>>>>>> 5b6aeb7 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
=======
=======
          
      2864. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
=======
          
      2865. 
>>>>>>> fd6db03 (Manifest_cache true)
>>>>>>> 2c640cf (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 8cbdfeb (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4367ccb1 (Manifest_cache true)
=======
=======
=======
=======
          
      2866. 
>>>>>>> 4552227 (Featire specs)
<<<<<<< HEAD
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b904d7ae (Featire specs)
=======
=======
=======
=======
          
      2867. 
>>>>>>> 998f08d (Manifest_cache true)
>>>>>>> b15044a (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 64dceec (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 4fac471d (Manifest_cache true)
=======
=======
=======
          
      2868. 
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 5b7749a (Fix)
>>>>>>> ef483b6d (Fix)
=======
=======
          
      2869. 
>>>>>>> 6da9530 (Featire specs)
>>>>>>> 0f8241bb (Featire specs)
            
            

            

>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ebcdce06 (Featire specs)
=======
>>>>>>> df37394 (Featire specs)
>>>>>>> 7a08014b (Featire specs)
=======
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
>>>>>>> df37394 (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> c033601 (Rebased)
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
=======
>>>>>>> c033601 (Rebased)
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
>>>>>>> c033601 (Rebased)
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> df37394 (Featire specs)
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 4e81ea2 (Featire specs)
=======
              )
          
        2870. 
        
        
      
        
        
          
      2870. 
=======
>>>>>>> 4a0e3b6 (Manifest_cache true)
>>>>>>> 0b43b18 (Manifest_cache true)
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
            
            

            

>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 715fac2 (Featire specs)
>>>>>>> fb61c5a (Featire specs)
>>>>>>> 73f364d8 (Featire specs)
            end
          
        2871. 
        
        
      
    
      
  
      

      

      
        
      
  
      
    
      spec/support/configs/shoulda_matcher.rb
      
    
      
      
  100.0%


      lines covered
    
      

    

    
      
      5 relevant lines.
      5 lines covered and
      0 lines missed.
    
      

    

  
      

  
          
        
      
        
        
          
      1. 
            1
            

            

            Shoulda::Matchers.configure do |config|
          
        2. 
        
        
      
        
        
          
      2. 
            1
            

            

              config.integrate do |with|
          
        3. 
        
        
      
        
        
          
      3. 
            1
            

            

                with.test_framework :rspec
          
        4. 
        
        
      
        
        
          
      4. 
            
            

            

            
          
        5. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84809242 (Featire specs)
=======
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 365d41ed (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
>>>>>>> 13fca83d (Rebased)
=======
>>>>>>> f136376a (Featire specs)
=======
>>>>>>> 1ca9c0ea (Featire specs)
=======
>>>>>>> 4bf888bf (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 393eff3b (Featire specs)
=======
>>>>>>> d9d85ca6 (Fix)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> c12b71de (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> b904d7ae (Featire specs)
=======
>>>>>>> ef483b6d (Fix)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> bdc24a1a (Rebased)
=======
>>>>>>> 53db2224 (Featire specs)
=======
>>>>>>> 7b22ad7e (Featire specs)
=======
>>>>>>> b97bb382 (Featire specs)
=======
>>>>>>> 4a2f2ad8 (Featire specs)
=======
>>>>>>> 21873de0 (Featire specs)
=======
>>>>>>> 392646b5 (Featire specs)
=======
>>>>>>> 1049b80c (Fix)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> e055dd0 (Rebased)
=======
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 973ba8c (Featire specs)
=======
>>>>>>> 8181d13 (Featire specs)
=======
>>>>>>> 72b9cab (Featire specs)
=======
>>>>>>> 15c51b7 (Featire specs)
=======
>>>>>>> 9e081dc (Fix)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> 53db2224 (Featire specs)
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f136376a (Featire specs)
=======
=======
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1ca9c0ea (Featire specs)
=======
=======
>>>>>>> 7b22ad7e (Featire specs)
=======
>>>>>>> b97bb382 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888bf (Featire specs)
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> efd6af09 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 5507b42 (Featire specs)
>>>>>>> d52f9efe (Featire specs)
=======
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> ae07231a (Featire specs)
=======
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> c12b71de (Featire specs)
=======
=======
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 392646b5 (Featire specs)
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      5. 
            1
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 393eff3b (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 36356d3 (Featire specs)
>>>>>>> b904d7ae (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
>>>>>>> 5507b42 (Featire specs)
>>>>>>> 5e31aeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 53db2224 (Featire specs)
=======
=======
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> 973ba8c (Featire specs)
>>>>>>> b97bb382 (Featire specs)
          
      6. 
            1
=======
          
      7. 
            
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      8. 
            
>>>>>>> 752f0c0 (Featire specs)
=======
          
      9. 
            
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      10. 
            
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> 37e48018 (Featire specs)
=======
          
      11. 
            
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
          
      12. 
            1
>>>>>>> 75fa7e1b (Rebased)
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 365d41ed (Featire specs)
=======
>>>>>>> c05ee511 (Featire specs)
=======
>>>>>>> f136376a (Featire specs)
=======
>>>>>>> 1ca9c0ea (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 53db2224 (Featire specs)
=======
>>>>>>> 7b22ad7e (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
>>>>>>> 659083f (Featire specs)
=======
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 3e9f99d (Featire specs)
=======
          
      13. 
            
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> bf05825 (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 973ba8c (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      14. 
            
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      15. 
            
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      16. 
            
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
          
      17. 
            1
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> 13fca83d (Rebased)
=======
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376a (Featire specs)
=======
=======
=======
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0ea (Featire specs)
=======
=======
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888bf (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
          
      18. 
            
>>>>>>> 4552227 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 393eff3b (Featire specs)
=======
=======
>>>>>>> ef483b6d (Fix)
=======
          
      19. 
            1
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d9d85ca6 (Fix)
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> 37e48018 (Featire specs)
=======
          
      20. 
            1
>>>>>>> 11792758 (Rebased)
=======
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> 8f42922 (Featire specs)
=======
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> af057e3 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      21. 
            
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> bf05825 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      22. 
            
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      23. 
            
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      24. 
            
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
          
      25. 
            1
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> bc6bc8d2 (Rebased)
=======
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> d52f9efe (Featire specs)
=======
=======
=======
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> c12b71de (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
          
      26. 
            
>>>>>>> 4552227 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
>>>>>>> b904d7ae (Featire specs)
=======
>>>>>>> ef483b6d (Fix)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 365d41ed (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
>>>>>>> 13fca83d (Rebased)
=======
>>>>>>> f136376a (Featire specs)
=======
>>>>>>> 1ca9c0ea (Featire specs)
=======
>>>>>>> 4bf888bf (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 393eff3b (Featire specs)
=======
>>>>>>> d9d85ca6 (Fix)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> c12b71de (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> b904d7ae (Featire specs)
=======
>>>>>>> ef483b6d (Fix)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
=======
>>>>>>> 448bef30 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> a2206025 (Featire specs)
>>>>>>> 0676508 (Featire specs)
=======
=======
>>>>>>> 96394f1 (Featire specs)
=======
          
      27. 
            
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ee5242b (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
          
      28. 
            
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
=======
=======
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
          
      29. 
            
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
=======
=======
          
      30. 
            1
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> e055dd0 (Rebased)
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5e31aeb (Featire specs)
=======
=======
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 51bc18c (Featire specs)
=======
=======
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 973ba8c (Featire specs)
=======
=======
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
=======
=======
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
=======
=======
=======
          
      31. 
            
>>>>>>> 4552227 (Featire specs)
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
=======
=======
          
      32. 
            1
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> e055dd0 (Rebased)
=======
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 973ba8c (Featire specs)
=======
>>>>>>> 8181d13 (Featire specs)
=======
>>>>>>> 72b9cab (Featire specs)
=======
>>>>>>> 15c51b7 (Featire specs)
=======
>>>>>>> 9e081dc (Fix)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> 53db2224 (Featire specs)
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f136376a (Featire specs)
=======
=======
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1ca9c0ea (Featire specs)
=======
=======
>>>>>>> 7b22ad7e (Featire specs)
=======
>>>>>>> b97bb382 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888bf (Featire specs)
                with.library :active_record
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
                with.library :active_record
=======
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
>>>>>>> 36356d3 (Featire specs)
>>>>>>> 393eff3b (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> 37e48018 (Featire specs)
                with.library :active_record
=======
                # Keep as many of these lines as are necessary:
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
                # Keep as many of these lines as are necessary:
>>>>>>> 752f0c0 (Featire specs)
=======
                # Keep as many of these lines as are necessary:
>>>>>>> 4e81ea2 (Featire specs)
=======
                # Keep as many of these lines as are necessary:
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
                # Keep as many of these lines as are necessary:
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 34509eee (Featire specs)
=======
                with.library :active_record
>>>>>>> 75fa7e1b (Rebased)
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 365d41ed (Featire specs)
=======
>>>>>>> c05ee511 (Featire specs)
=======
>>>>>>> f136376a (Featire specs)
=======
>>>>>>> 1ca9c0ea (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
>>>>>>> 824bb2b (Featire specs)
=======
=======
                # Keep as many of these lines as are necessary:
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
                # Keep as many of these lines as are necessary:
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
=======
                # Keep as many of these lines as are necessary:
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
=======
                # Keep as many of these lines as are necessary:
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
                # Keep as many of these lines as are necessary:
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 4e81ea2 (Featire specs)
=======
                # Keep as many of these lines as are necessary:
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
                # Keep as many of these lines as are necessary:
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
                with.library :active_record
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> 13fca83d (Rebased)
=======
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376a (Featire specs)
=======
=======
=======
=======
                # Keep as many of these lines as are necessary:
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0ea (Featire specs)
=======
=======
=======
                # Keep as many of these lines as are necessary:
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888bf (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
=======
                # Keep as many of these lines as are necessary:
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
                # Keep as many of these lines as are necessary:
>>>>>>> 4552227 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 393eff3b (Featire specs)
=======
=======
                with.library :active_record
>>>>>>> 5b7749a (Fix)
>>>>>>> d9d85ca6 (Fix)
          
        33. 
        
        
      
        
        
          
      33. 
=======
          
      34. 
>>>>>>> c7a726c5 (Rebased)
            1
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> 84809242 (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> 365d41ed (Featire specs)
=======
>>>>>>> c05ee511 (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
>>>>>>> 13fca83d (Rebased)
=======
>>>>>>> f136376a (Featire specs)
=======
>>>>>>> 1ca9c0ea (Featire specs)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 393eff3b (Featire specs)
=======
>>>>>>> d9d85ca6 (Fix)
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> 4bf888bf (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376a (Featire specs)
=======
=======
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0ea (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888bf (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
>>>>>>> 4552227 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
>>>>>>> 393eff3b (Featire specs)
                with.library :active_record
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
                # Keep as many of these lines as are necessary:
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 37e48018 (Featire specs)
=======
                with.library :active_record
>>>>>>> 11792758 (Rebased)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> efd6af09 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 5507b42 (Featire specs)
>>>>>>> d52f9efe (Featire specs)
=======
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> ae07231a (Featire specs)
=======
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> c12b71de (Featire specs)
=======
=======
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 392646b5 (Featire specs)
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
                with.library :active_record
=======
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 36356d3 (Featire specs)
=======
>>>>>>> 6da9530 (Featire specs)
=======
>>>>>>> 0ed7f7c (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
=======
>>>>>>> 5507b42 (Featire specs)
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> 973ba8c (Featire specs)
                with.library :active_record
=======
                # Keep as many of these lines as are necessary:
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
=======
                # Keep as many of these lines as are necessary:
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
                # Keep as many of these lines as are necessary:
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 973ba8c (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
=======
                # Keep as many of these lines as are necessary:
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
=======
                # Keep as many of these lines as are necessary:
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
                # Keep as many of these lines as are necessary:
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 4e81ea2 (Featire specs)
=======
                # Keep as many of these lines as are necessary:
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
                # Keep as many of these lines as are necessary:
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
                with.library :active_record
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> bc6bc8d2 (Rebased)
=======
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> d52f9efe (Featire specs)
=======
=======
=======
=======
                # Keep as many of these lines as are necessary:
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
=======
                # Keep as many of these lines as are necessary:
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> c12b71de (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
=======
                # Keep as many of these lines as are necessary:
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
                # Keep as many of these lines as are necessary:
>>>>>>> 4552227 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b904d7ae (Featire specs)
=======
=======
                with.library :active_record
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
>>>>>>> ef483b6d (Fix)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
                # Keep as many of these lines as are necessary:
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 0676508 (Featire specs)
=======
                # Keep as many of these lines as are necessary:
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
=======
                # Keep as many of these lines as are necessary:
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
                # Keep as many of these lines as are necessary:
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
=======
                # Keep as many of these lines as are necessary:
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
                with.library :active_record
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5e31aeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 53db2224 (Featire specs)
=======
=======
=======
=======
                # Keep as many of these lines as are necessary:
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
                # Keep as many of these lines as are necessary:
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
=======
=======
                # Keep as many of these lines as are necessary:
>>>>>>> 08edf50 (Featire specs)
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
=======
=======
                # Keep as many of these lines as are necessary:
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
=======
=======
                # Keep as many of these lines as are necessary:
>>>>>>> 4552227 (Featire specs)
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 392646b5 (Featire specs)
=======
=======
=======
                with.library :active_record
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
                # Keep as many of these lines as are necessary:
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
=======
                # Keep as many of these lines as are necessary:
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
=======
                # Keep as many of these lines as are necessary:
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
        35. 
        
        
      
        
        
          
      35. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
=======
>>>>>>> 7a02bbe (Featire specs)
=======
=======
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
=======
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> b904d7ae (Featire specs)
=======
>>>>>>> ef483b6d (Fix)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> bdc24a1a (Rebased)
=======
>>>>>>> 53db2224 (Featire specs)
=======
>>>>>>> 7b22ad7e (Featire specs)
=======
>>>>>>> b97bb382 (Featire specs)
=======
>>>>>>> 4a2f2ad8 (Featire specs)
=======
>>>>>>> 21873de0 (Featire specs)
=======
>>>>>>> 392646b5 (Featire specs)
=======
>>>>>>> 1049b80c (Fix)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> c12b71de (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 36356d3 (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> d52f9efe (Featire specs)
=======
=======
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> c12b71de (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
>>>>>>> 4552227 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b904d7ae (Featire specs)
=======
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> e055dd0 (Rebased)
=======
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> 973ba8c (Featire specs)
=======
=======
>>>>>>> 72b9cab (Featire specs)
=======
>>>>>>> 15c51b7 (Featire specs)
=======
>>>>>>> 9e081dc (Fix)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
>>>>>>> 8181d13 (Featire specs)
=======
>>>>>>> a9e66e9 (Featire specs)
=======
>>>>>>> 6fba6be (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
=======
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5e31aeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 53db2224 (Featire specs)
=======
=======
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
=======
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
=======
=======
>>>>>>> 4552227 (Featire specs)
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 392646b5 (Featire specs)
=======
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
                with.library :active_record
          
        36. 
        
        
      
        
        
          
      36. 
            1
            

            

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 610b6138 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 34509eee (Featire specs)
=======
>>>>>>> 75fa7e1b (Rebased)
=======
=======
>>>>>>> d8dd3b4a (Featire specs)
=======
>>>>>>> 365d41ed (Featire specs)
=======
>>>>>>> c05ee511 (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
>>>>>>> f136376a (Featire specs)
=======
>>>>>>> 1ca9c0ea (Featire specs)
=======
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 393eff3b (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> b904d7ae (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> 53db2224 (Featire specs)
=======
>>>>>>> 7b22ad7e (Featire specs)
=======
>>>>>>> b97bb382 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> 4bf888bf (Featire specs)
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
=======
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> c12b71de (Featire specs)
=======
=======
>>>>>>> 21873de0 (Featire specs)
=======
>>>>>>> 392646b5 (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
=======
>>>>>>> 8181d13 (Featire specs)
=======
>>>>>>> 72b9cab (Featire specs)
=======
>>>>>>> 15c51b7 (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 392646b5 (Featire specs)
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
<<<<<<< HEAD
=======
=======
>>>>>>> b904d7ae (Featire specs)
>>>>>>> 36356d3 (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> 13fca83d (Rebased)
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376a (Featire specs)
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0ea (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888bf (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
>>>>>>> b904d7ae (Featire specs)
=======
=======
>>>>>>> 4552227 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 393eff3b (Featire specs)
=======
=======
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
>>>>>>> d9d85ca6 (Fix)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 11792758 (Rebased)
=======
=======
>>>>>>> 9d98d9ab (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
=======
>>>>>>> 752f0c0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> bc6bc8d2 (Rebased)
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> d52f9efe (Featire specs)
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> c12b71de (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> b904d7ae (Featire specs)
=======
=======
>>>>>>> 5b7749a (Fix)
>>>>>>> ef483b6d (Fix)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 0676508 (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> 973ba8c (Featire specs)
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5e31aeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 53db2224 (Featire specs)
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
=======
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
=======
=======
>>>>>>> 4552227 (Featire specs)
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 392646b5 (Featire specs)
=======
=======
=======
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
>>>>>>> d0dc1f1 (Featire specs)
=======
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
                with.library :active_model
          
        37. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 365d41ed (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
>>>>>>> 13fca83d (Rebased)
=======
>>>>>>> f136376a (Featire specs)
=======
>>>>>>> 1ca9c0ea (Featire specs)
=======
>>>>>>> 4bf888bf (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 393eff3b (Featire specs)
=======
>>>>>>> d9d85ca6 (Fix)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> c12b71de (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> b904d7ae (Featire specs)
=======
>>>>>>> ef483b6d (Fix)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> bdc24a1a (Rebased)
=======
>>>>>>> 53db2224 (Featire specs)
=======
>>>>>>> 7b22ad7e (Featire specs)
=======
>>>>>>> b97bb382 (Featire specs)
=======
>>>>>>> 4a2f2ad8 (Featire specs)
=======
>>>>>>> 21873de0 (Featire specs)
=======
>>>>>>> 392646b5 (Featire specs)
=======
>>>>>>> 1049b80c (Fix)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> e055dd0 (Rebased)
=======
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 973ba8c (Featire specs)
=======
>>>>>>> 8181d13 (Featire specs)
=======
>>>>>>> 72b9cab (Featire specs)
=======
>>>>>>> 15c51b7 (Featire specs)
=======
>>>>>>> 9e081dc (Fix)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> 53db2224 (Featire specs)
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f136376a (Featire specs)
=======
=======
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1ca9c0ea (Featire specs)
=======
=======
>>>>>>> 7b22ad7e (Featire specs)
=======
>>>>>>> b97bb382 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888bf (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> efd6af09 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 5507b42 (Featire specs)
>>>>>>> d52f9efe (Featire specs)
=======
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> ae07231a (Featire specs)
=======
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> c12b71de (Featire specs)
=======
=======
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 392646b5 (Featire specs)
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      37. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      38. 
=======
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 393eff3b (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> 37e48018 (Featire specs)
=======
          
      39. 
=======
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 36356d3 (Featire specs)
>>>>>>> b904d7ae (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
>>>>>>> 5507b42 (Featire specs)
>>>>>>> 5e31aeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 53db2224 (Featire specs)
=======
=======
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> 973ba8c (Featire specs)
>>>>>>> b97bb382 (Featire specs)
          
      40. 
=======
          
      41. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      42. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
      43. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      44. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
          
      45. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 34509eee (Featire specs)
=======
          
      46. 
>>>>>>> 75fa7e1b (Rebased)
=======
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 53db2224 (Featire specs)
=======
>>>>>>> 7b22ad7e (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 365d41ed (Featire specs)
=======
>>>>>>> c05ee511 (Featire specs)
=======
>>>>>>> f136376a (Featire specs)
=======
>>>>>>> 1ca9c0ea (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
          
      47. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
          
      48. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 973ba8c (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
=======
          
      49. 
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
=======
          
      50. 
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
          
      51. 
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      52. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
          
      53. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
          
      54. 
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> 13fca83d (Rebased)
=======
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376a (Featire specs)
=======
=======
=======
=======
          
      55. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0ea (Featire specs)
=======
=======
=======
          
      56. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888bf (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
=======
          
      57. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
>>>>>>> b904d7ae (Featire specs)
=======
=======
          
      58. 
>>>>>>> 4552227 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 393eff3b (Featire specs)
=======
=======
          
      59. 
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
>>>>>>> d9d85ca6 (Fix)
=======
          
      60. 
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
          
      61. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 37e48018 (Featire specs)
=======
          
      62. 
>>>>>>> 11792758 (Rebased)
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      63. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
=======
          
      64. 
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
=======
          
      65. 
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
          
      66. 
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      67. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
          
      68. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
          
      69. 
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> bc6bc8d2 (Rebased)
=======
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> d52f9efe (Featire specs)
=======
=======
=======
=======
          
      70. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
=======
          
      71. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> c12b71de (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
=======
          
      72. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> b904d7ae (Featire specs)
=======
=======
          
      73. 
>>>>>>> 5b7749a (Fix)
>>>>>>> ef483b6d (Fix)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
          
      74. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 0676508 (Featire specs)
=======
          
      75. 
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
=======
          
      76. 
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      77. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
=======
          
      78. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
          
      79. 
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5e31aeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 53db2224 (Featire specs)
=======
=======
=======
=======
          
      80. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
          
      81. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
=======
=======
          
      82. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
=======
=======
          
      83. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
=======
=======
          
      84. 
>>>>>>> 4552227 (Featire specs)
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 392646b5 (Featire specs)
=======
=======
=======
          
      85. 
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
          
      86. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
=======
          
      87. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
=======
          
      88. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            
            

            

              end
          
        89. 
        
        
      
        
        
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 365d41ed (Featire specs)
=======
=======
>>>>>>> fc3774fd (Featire specs)
=======
>>>>>>> d8abfed3 (Featire specs)
=======
>>>>>>> 13fca83d (Rebased)
=======
>>>>>>> f136376a (Featire specs)
=======
>>>>>>> 1ca9c0ea (Featire specs)
=======
>>>>>>> 4bf888bf (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> 393eff3b (Featire specs)
=======
>>>>>>> d9d85ca6 (Fix)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> c12b71de (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> b904d7ae (Featire specs)
=======
>>>>>>> ef483b6d (Fix)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> bdc24a1a (Rebased)
=======
>>>>>>> 53db2224 (Featire specs)
=======
>>>>>>> 7b22ad7e (Featire specs)
=======
>>>>>>> b97bb382 (Featire specs)
=======
>>>>>>> 4a2f2ad8 (Featire specs)
=======
>>>>>>> 21873de0 (Featire specs)
=======
>>>>>>> 392646b5 (Featire specs)
=======
>>>>>>> 1049b80c (Fix)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
=======
>>>>>>> 0676508 (Featire specs)
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> e055dd0 (Rebased)
=======
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 973ba8c (Featire specs)
=======
>>>>>>> 8181d13 (Featire specs)
=======
>>>>>>> 72b9cab (Featire specs)
=======
>>>>>>> 15c51b7 (Featire specs)
=======
>>>>>>> 9e081dc (Fix)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> 53db2224 (Featire specs)
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f136376a (Featire specs)
=======
=======
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 1ca9c0ea (Featire specs)
=======
=======
>>>>>>> 7b22ad7e (Featire specs)
=======
>>>>>>> b97bb382 (Featire specs)
=======
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888bf (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> f8e5c9db (Featire specs)
=======
=======
>>>>>>> 93bdda9 (Featire specs)
=======
>>>>>>> 563720e (Featire specs)
>>>>>>> efd6af09 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 5507b42 (Featire specs)
>>>>>>> d52f9efe (Featire specs)
=======
=======
>>>>>>> af057e3 (Featire specs)
>>>>>>> ae07231a (Featire specs)
=======
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> c12b71de (Featire specs)
=======
=======
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 392646b5 (Featire specs)
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
          
      89. 
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      90. 
=======
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 393eff3b (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> 37e48018 (Featire specs)
=======
          
      91. 
=======
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 36356d3 (Featire specs)
>>>>>>> b904d7ae (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 93bdda9 (Featire specs)
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
>>>>>>> 5507b42 (Featire specs)
>>>>>>> 5e31aeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 53db2224 (Featire specs)
=======
=======
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
>>>>>>> 96394f1 (Featire specs)
>>>>>>> 973ba8c (Featire specs)
>>>>>>> b97bb382 (Featire specs)
          
      92. 
=======
          
      93. 
>>>>>>> d0dc1f1 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
          
      94. 
>>>>>>> 752f0c0 (Featire specs)
=======
          
      95. 
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      96. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
          
      97. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 34509eee (Featire specs)
=======
          
      98. 
>>>>>>> 75fa7e1b (Rebased)
=======
=======
>>>>>>> f8e5c9db (Featire specs)
=======
>>>>>>> efd6af09 (Featire specs)
=======
>>>>>>> d52f9efe (Featire specs)
=======
>>>>>>> ae07231a (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> ecb02dbf (Featire specs)
=======
>>>>>>> 2274daf2 (Featire specs)
=======
>>>>>>> 448bef30 (Featire specs)
=======
>>>>>>> 53db2224 (Featire specs)
=======
>>>>>>> 7b22ad7e (Featire specs)
=======
>>>>>>> f3d746cb (Featire specs)
=======
>>>>>>> aa4361fd (Featire specs)
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> 365d41ed (Featire specs)
=======
>>>>>>> c05ee511 (Featire specs)
=======
>>>>>>> f136376a (Featire specs)
=======
>>>>>>> 1ca9c0ea (Featire specs)
=======
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
>>>>>>> f0e2e12a (Featire specs)
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
          
      99. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 009401d (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> d8dd3b4a (Featire specs)
=======
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 5e31aeb (Featire specs)
=======
>>>>>>> 51bc18c (Featire specs)
=======
>>>>>>> 216fe41 (Featire specs)
=======
>>>>>>> 3cf8dd4 (Featire specs)
=======
          
      100. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 973ba8c (Featire specs)
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> 365d41ed (Featire specs)
=======
=======
=======
=======
          
      101. 
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> c05ee511 (Featire specs)
=======
=======
=======
=======
          
      102. 
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
          
      103. 
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      104. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
=======
=======
          
      105. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
          
      106. 
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> 13fca83d (Rebased)
=======
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> f136376a (Featire specs)
=======
=======
=======
=======
          
      107. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> 1ca9c0ea (Featire specs)
=======
=======
=======
          
      108. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888bf (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
=======
          
      109. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
>>>>>>> b904d7ae (Featire specs)
=======
=======
          
      110. 
>>>>>>> 4552227 (Featire specs)
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 393eff3b (Featire specs)
=======
=======
          
      111. 
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
>>>>>>> d9d85ca6 (Fix)
=======
          
      112. 
>>>>>>> c7a726c5 (Rebased)
=======
>>>>>>> 610b6138 (Featire specs)
=======
=======
          
      113. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 37e48018 (Featire specs)
=======
          
      114. 
>>>>>>> 11792758 (Rebased)
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 9d98d9ab (Featire specs)
=======
=======
=======
>>>>>>> 6cdb2e1 (Featire specs)
=======
>>>>>>> 932dbec (Featire specs)
=======
>>>>>>> 77d62af (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
          
      115. 
>>>>>>> 752f0c0 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 8f42922 (Featire specs)
<<<<<<< HEAD
>>>>>>> f8e5c9db (Featire specs)
=======
=======
=======
=======
          
      116. 
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 6cdb2e1 (Featire specs)
<<<<<<< HEAD
>>>>>>> efd6af09 (Featire specs)
=======
=======
=======
=======
          
      117. 
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
          
      118. 
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      119. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
          
      120. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
          
      121. 
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> bc6bc8d2 (Rebased)
=======
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 932dbec (Featire specs)
<<<<<<< HEAD
>>>>>>> d52f9efe (Featire specs)
=======
=======
=======
=======
          
      122. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 77d62af (Featire specs)
<<<<<<< HEAD
>>>>>>> ae07231a (Featire specs)
=======
=======
=======
          
      123. 
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> c12b71de (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
=======
          
      124. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> b904d7ae (Featire specs)
=======
=======
          
      125. 
>>>>>>> 5b7749a (Fix)
>>>>>>> ef483b6d (Fix)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
=======
          
      126. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 0ed7f7c (Featire specs)
<<<<<<< HEAD
>>>>>>> ecb02dbf (Featire specs)
=======
=======
=======
>>>>>>> 0676508 (Featire specs)
=======
          
      127. 
>>>>>>> 752f0c0 (Featire specs)
=======
>>>>>>> 93bdda9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 659083f (Featire specs)
<<<<<<< HEAD
>>>>>>> 2274daf2 (Featire specs)
=======
=======
=======
=======
          
      128. 
<<<<<<< HEAD
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 563720e (Featire specs)
<<<<<<< HEAD
>>>>>>> 0676508 (Featire specs)
<<<<<<< HEAD
>>>>>>> 448bef30 (Featire specs)
=======
=======
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
          
      129. 
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
=======
=======
          
      130. 
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
=======
          
      131. 
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
=======
>>>>>>> 5507b42 (Featire specs)
<<<<<<< HEAD
>>>>>>> 5e31aeb (Featire specs)
<<<<<<< HEAD
>>>>>>> 53db2224 (Featire specs)
=======
=======
=======
=======
          
      132. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> af057e3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 51bc18c (Featire specs)
<<<<<<< HEAD
>>>>>>> 7b22ad7e (Featire specs)
=======
=======
=======
          
      133. 
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
=======
=======
          
      134. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
=======
=======
          
      135. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
=======
=======
          
      136. 
>>>>>>> 4552227 (Featire specs)
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 392646b5 (Featire specs)
=======
=======
=======
          
      137. 
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
=======
>>>>>>> 2a25e4c (Featire specs)
<<<<<<< HEAD
>>>>>>> 216fe41 (Featire specs)
<<<<<<< HEAD
>>>>>>> f3d746cb (Featire specs)
=======
=======
=======
=======
          
      138. 
>>>>>>> 752f0c0 (Featire specs)
>>>>>>> 3e9f99d (Featire specs)
<<<<<<< HEAD
>>>>>>> 3cf8dd4 (Featire specs)
<<<<<<< HEAD
>>>>>>> aa4361fd (Featire specs)
=======
=======
=======
=======
          
      139. 
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
=======
          
      140. 
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
            
            

            

            end
          
        141. 
        
        
      
    
      
  
      

      

      
      
      
    
      
  

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> 416166f (Featire specs)
=======
>>>>>>> fb61c5a (Featire specs)
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
=======
>>>>>>> df37394 (Featire specs)
>>>>>>> f92a45b (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 824bb2b (Featire specs)
=======
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> 7a08014b (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> df37394 (Featire specs)
>>>>>>> c51bf93 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> da3a9a3 (Featire specs)
=======
>>>>>>> e055dd0 (Rebased)
=======
>>>>>>> 08e21b3 (Manifest_cache true)
=======
>>>>>>> 973ba8c (Featire specs)
=======
>>>>>>> 8181d13 (Featire specs)
=======
>>>>>>> 72b9cab (Featire specs)
=======
>>>>>>> 15c51b7 (Featire specs)
=======
>>>>>>> 9e081dc (Fix)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> f506ffd0 (Manifest_cache true)
=======
>>>>>>> c12b71de (Featire specs)
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> e5752db (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> bdc24a1a (Rebased)
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> f0a057d (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 7cf77f7b (Manifest_cache true)
=======
>>>>>>> b97bb382 (Featire specs)
>>>>>>> 96394f1 (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
<<<<<<< HEAD
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 7a08014b (Featire specs)
=======
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> bc6bc8d2 (Rebased)
=======
>>>>>>> f506ffd0 (Manifest_cache true)
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> c12b71de (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 49e8a6c (Rebased)
=======
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
>>>>>>> 08e21b3 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 7cf77f7b (Manifest_cache true)
=======
=======
>>>>>>> 96394f1 (Featire specs)
=======
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
>>>>>>> ee5242b (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
>>>>>>> a9e66e9 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
>>>>>>> 6fba6be (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 392646b5 (Featire specs)
=======
=======
>>>>>>> 1d59aaa (Fix)
=======
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
>>>>>>> 715fac2 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> fb61c5a (Featire specs)
<<<<<<< HEAD
>>>>>>> 73f364d8 (Featire specs)
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
>>>>>>> 5506bd0 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> 379e583 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> 73f364d8 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> 0d6dd12 (Manifest_cache true)
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> fb61c5a (Featire specs)
<<<<<<< HEAD
>>>>>>> 73f364d8 (Featire specs)
=======
=======
>>>>>>> afa56d1 (Featire specs)
>>>>>>> e1ecabbe (Featire specs)
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 9c0d812 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> 4a2f2ad8 (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
=======
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> ed32b84 (Featire specs)
=======
>>>>>>> e54deeb (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> fd3f47ab (Featire specs)
=======
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 3b03895 (Featire specs)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b904d7ae (Featire specs)
=======
>>>>>>> 392646b5 (Featire specs)
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 94841b5 (Featire specs)
=======
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
>>>>>>> 824bb2b (Featire specs)
>>>>>>> 84003439 (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
>>>>>>> ed32b84 (Featire specs)
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> b904d7ae (Featire specs)
=======
=======
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
>>>>>>> 3b03895 (Featire specs)
=======
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
>>>>>>> 94841b5 (Featire specs)
=======
>>>>>>> 15c51b7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 392646b5 (Featire specs)
=======
=======
=======
>>>>>>> 715fac2 (Featire specs)
<<<<<<< HEAD
>>>>>>> fb61c5a (Featire specs)
<<<<<<< HEAD
>>>>>>> 73f364d8 (Featire specs)
=======
=======
=======
>>>>>>> 3723aad (Featire specs)
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> 379e583 (Manifest_cache true)
=======
>>>>>>> 4e81ea2 (Featire specs)
=======
>>>>>>> 08edf50 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
>>>>>>> f7852d17 (Manifest_cache true)
=======
>>>>>>> fd3f47ab (Featire specs)
=======
>>>>>>> 0f8241bb (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> 4a2f2ad8 (Featire specs)
=======
>>>>>>> 21873de0 (Featire specs)
=======
>>>>>>> 73f364d8 (Featire specs)
=======
>>>>>>> e1ecabbe (Featire specs)
=======
>>>>>>> 2612be03 (Featire specs)
=======
>>>>>>> 9440753 (Featire specs)
=======
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 58c2c0f1 (Featire specs)
=======
=======
>>>>>>> 4f4ea3f9 (Featire specs)
=======
>>>>>>> c033601 (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> 37e48018 (Featire specs)
=======
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> 9440753 (Featire specs)
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
>>>>>>> fb61c5a (Featire specs)
<<<<<<< HEAD
>>>>>>> 73f364d8 (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
=======
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> c033601 (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 379e583 (Manifest_cache true)
>>>>>>> 4d1f738 (Manifest_cache true)
=======
=======
=======
>>>>>>> 379e583 (Manifest_cache true)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ebcdce06 (Featire specs)
=======
>>>>>>> 379e583 (Manifest_cache true)
=======
>>>>>>> 4e81ea2 (Featire specs)
<<<<<<< HEAD
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 6e923b9d (Featire specs)
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> 34509eee (Featire specs)
=======
=======
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
>>>>>>> 75fa7e1b (Rebased)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
>>>>>>> c033601 (Rebased)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84809242 (Featire specs)
=======
=======
>>>>>>> df37394 (Featire specs)
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4f4ea3f9 (Featire specs)
=======
=======
>>>>>>> df37394 (Featire specs)
=======
=======
>>>>>>> 7a08014b (Featire specs)
=======
>>>>>>> 6b6d1c2d (Featire specs)
=======
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e3e66f3 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD
=======
>>>>>>> c033601 (Rebased)
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
>>>>>>> e3e66f3 (Featire specs)
=======
>>>>>>> 379e583 (Manifest_cache true)
>>>>>>> 4d1f738 (Manifest_cache true)
=======
=======
>>>>>>> 379e583 (Manifest_cache true)
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
=======
>>>>>>> bf554f4 (Rebased)
=======
>>>>>>> b904d7ae (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 5c33a07 (Featire specs)
=======
>>>>>>> c033601 (Rebased)
>>>>>>> 824bb2b (Featire specs)
=======
>>>>>>> df37394 (Featire specs)
>>>>>>> c51bf93 (Featire specs)
=======
>>>>>>> df37394 (Featire specs)
=======
>>>>>>> df37394 (Featire specs)
>>>>>>> 416166f (Featire specs)
=======
=======
>>>>>>> 379e583 (Manifest_cache true)
>>>>>>> 4d1f738 (Manifest_cache true)
=======
=======
>>>>>>> 379e583 (Manifest_cache true)
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
>>>>>>> a2206025 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> afa56d1 (Featire specs)
=======
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> fc3774fd (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
=======
=======
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
<<<<<<< HEAD
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b5ac3004 (Featire specs)
=======
>>>>>>> bdc24a1a (Rebased)
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> d8abfed3 (Featire specs)
=======
=======
=======
=======
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> 13fca83d (Rebased)
=======
=======
=======
=======
=======
>>>>>>> 379e583 (Manifest_cache true)
>>>>>>> 1772e92 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f0a057d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1622d61 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 9afd7e66 (Manifest_cache true)
=======
=======
=======
=======
=======
>>>>>>> 379e583 (Manifest_cache true)
>>>>>>> 1772e92 (Manifest_cache true)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 379e583 (Manifest_cache true)
>>>>>>> 1772e92 (Manifest_cache true)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 379e583 (Manifest_cache true)
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4bf888bf (Featire specs)
=======
=======
>>>>>>> a45f1ec (Add login registration pages)
<<<<<<< HEAD
>>>>>>> 3b954593 (Add login registration pages)
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> add330c (Manifest_cache true)
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 89d7dcd2 (Manifest_cache true)
=======
=======
>>>>>>> 5a7e688 (Add User and Review Decorators and Show Review)
<<<<<<< HEAD
>>>>>>> 4bf50361 (Add User and Review Decorators and Show Review)
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> f0e2e12a (Featire specs)
=======
=======
=======
=======
=======
>>>>>>> 4552227 (Featire specs)
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> 393eff3b (Featire specs)
=======
=======
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
>>>>>>> 5b7749a (Fix)
<<<<<<< HEAD
>>>>>>> d9d85ca6 (Fix)
=======
>>>>>>> c7a726c5 (Rebased)
=======
=======
>>>>>>> 08edf50 (Featire specs)
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> ebcdce06 (Featire specs)
=======
>>>>>>> 610b6138 (Featire specs)
=======
>>>>>>> 37e48018 (Featire specs)
=======
=======
>>>>>>> bf554f4 (Rebased)
>>>>>>> 11792758 (Rebased)
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5c33a07 (Featire specs)
=======
>>>>>>> c033601 (Rebased)
>>>>>>> 824bb2b (Featire specs)
<<<<<<< HEAD
>>>>>>> 84003439 (Featire specs)
=======
=======
>>>>>>> df37394 (Featire specs)
>>>>>>> c51bf93 (Featire specs)
<<<<<<< HEAD
>>>>>>> 7a08014b (Featire specs)
=======
=======
>>>>>>> df37394 (Featire specs)
=======
=======
>>>>>>> 379e583 (Manifest_cache true)
>>>>>>> 4d1f738 (Manifest_cache true)
=======
=======
>>>>>>> 379e583 (Manifest_cache true)
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> b832d45 (Featire specs)
=======
>>>>>>> 3723aad (Featire specs)
<<<<<<< HEAD
>>>>>>> 904663c (Featire specs)
<<<<<<< HEAD
>>>>>>> 9440753 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6b6d1c2d (Featire specs)
=======
=======
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
<<<<<<< HEAD
>>>>>>> e5752db (Featire specs)
<<<<<<< HEAD
>>>>>>> ed32b84 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4d4cf6b4 (Featire specs)
=======
=======
=======
=======
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> 311e9fa (Rebased)
<<<<<<< HEAD
>>>>>>> bc6bc8d2 (Rebased)
=======
=======
=======
=======
=======
>>>>>>> 379e583 (Manifest_cache true)
>>>>>>> 1772e92 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f0a057d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 1622d61 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f506ffd0 (Manifest_cache true)
=======
=======
=======
=======
=======
>>>>>>> 379e583 (Manifest_cache true)
>>>>>>> 1772e92 (Manifest_cache true)
>>>>>>> 0d6dd12 (Manifest_cache true)
=======
=======
>>>>>>> 379e583 (Manifest_cache true)
>>>>>>> 1772e92 (Manifest_cache true)
>>>>>>> e3e66f3 (Featire specs)
=======
=======
>>>>>>> 379e583 (Manifest_cache true)
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
>>>>>>> bf05825 (Featire specs)
<<<<<<< HEAD
>>>>>>> c12b71de (Featire specs)
=======
=======
>>>>>>> a45f1ec (Add login registration pages)
<<<<<<< HEAD
>>>>>>> b3f4cb6c (Add login registration pages)
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
>>>>>>> add330c (Manifest_cache true)
>>>>>>> 0d6dd12 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f7852d17 (Manifest_cache true)
=======
=======
>>>>>>> 5a7e688 (Add User and Review Decorators and Show Review)
<<<<<<< HEAD
>>>>>>> 835651a9 (Add User and Review Decorators and Show Review)
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> e3e66f3 (Featire specs)
<<<<<<< HEAD
>>>>>>> fd3f47ab (Featire specs)
=======
=======
=======
=======
=======
>>>>>>> 4552227 (Featire specs)
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 36356d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b904d7ae (Featire specs)
=======
=======
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
>>>>>>> 5b7749a (Fix)
>>>>>>> ef483b6d (Fix)
=======
=======
>>>>>>> 5c33a07 (Featire specs)
=======
>>>>>>> c033601 (Rebased)
>>>>>>> 6da9530 (Featire specs)
<<<<<<< HEAD
>>>>>>> 0f8241bb (Featire specs)
=======
=======
>>>>>>> df37394 (Featire specs)
>>>>>>> f92a45b (Featire specs)
<<<<<<< HEAD
>>>>>>> e6fc67c7 (Featire specs)
=======
=======
>>>>>>> 904663c (Featire specs)
>>>>>>> 416166f (Featire specs)
<<<<<<< HEAD
>>>>>>> a2206025 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
>>>>>>> da3a9a3 (Featire specs)
<<<<<<< HEAD
>>>>>>> b5ac3004 (Featire specs)
=======
=======
>>>>>>> e5752db (Featire specs)
=======
=======
>>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD
>>>>>>> 49e8a6c (Rebased)
<<<<<<< HEAD
>>>>>>> e055dd0 (Rebased)
<<<<<<< HEAD
>>>>>>> bdc24a1a (Rebased)
=======
=======
=======
=======
=======
>>>>>>> 379e583 (Manifest_cache true)
>>>>>>> 1772e92 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> f0a057d (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 08e21b3 (Manifest_cache true)
<<<<<<< HEAD
>>>>>>> 7cf77f7b (Manifest_cache true)
=======
=======
=======
=======
=======
>>>>>>> 379e583 (Manifest_cache true)
=======
>>>>>>> 4e81ea2 (Featire specs)
>>>>>>> c4adab0 (Featire specs)
<<<<<<< HEAD
>>>>>>> 96394f1 (Featire specs)
<<<<<<< HEAD
>>>>>>> 973ba8c (Featire specs)
<<<<<<< HEAD
>>>>>>> b97bb382 (Featire specs)
=======
=======
=======
=======
>>>>>>> e54deeb (Featire specs)
<<<<<<< HEAD
>>>>>>> ee5242b (Featire specs)
<<<<<<< HEAD
>>>>>>> 8181d13 (Featire specs)
<<<<<<< HEAD
>>>>>>> 4a2f2ad8 (Featire specs)
=======
=======
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 3b03895 (Featire specs)
<<<<<<< HEAD
>>>>>>> a9e66e9 (Featire specs)
<<<<<<< HEAD
>>>>>>> 72b9cab (Featire specs)
<<<<<<< HEAD
>>>>>>> 21873de0 (Featire specs)
=======
=======
=======
=======
=======
>>>>>>> 4552227 (Featire specs)
>>>>>>> 94841b5 (Featire specs)
<<<<<<< HEAD
>>>>>>> 6fba6be (Featire specs)
<<<<<<< HEAD
>>>>>>> 15c51b7 (Featire specs)
<<<<<<< HEAD
>>>>>>> 392646b5 (Featire specs)
=======
=======
=======
=======
>>>>>>> 7c4ea7f (Fix)
>>>>>>> 1d59aaa (Fix)
<<<<<<< HEAD
>>>>>>> 9e081dc (Fix)
<<<<<<< HEAD
>>>>>>> 1049b80c (Fix)
=======
=======
=======
>>>>>>> 5c33a07 (Featire specs)
>>>>>>> 715fac2 (Featire specs)
<<<<<<< HEAD
>>>>>>> fb61c5a (Featire specs)
<<<<<<< HEAD
>>>>>>> 73f364d8 (Featire specs)
=======
=======
=======
>>>>>>> 2ee03d3 (Featire specs)
<<<<<<< HEAD
>>>>>>> afa56d1 (Featire specs)
<<<<<<< HEAD
>>>>>>> e1ecabbe (Featire specs)
=======
=======
=======
=======
=======
>>>>>>> 7a02bbe (Featire specs)
>>>>>>> 9c0d812 (Featire specs)
>>>>>>> 5506bd0 (Featire specs)
>>>>>>> 49f2e24 (Featire specs)
>>>>>>> 2612be03 (Featire specs)